Skip to content

Commit 768c5f9

Browse files
bugerbuger
committed
Apply FMT
1 parent 47bb312 commit 768c5f9

File tree

7 files changed

+56
-59
lines changed

7 files changed

+56
-59
lines changed

‎input_raw.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ func (i *RAWInput) listen(address string) {
8181
}
8282

8383
// Receiving TCPMessage object
84-
m := <- ch
84+
m := <-ch
8585

8686
i.data <- m
8787
}

‎input_raw_test.go‎

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -31,16 +31,15 @@ func TestRAWInput(t *testing.T) {
3131
t.Fatal(err)
3232
}
3333
origin := &http.Server{
34-
Handler: http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {}),
35-
ReadTimeout: 10 * time.Second,
36-
WriteTimeout: 10 * time.Second,
34+
Handler: http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {}),
35+
ReadTimeout: 10 * time.Second,
36+
WriteTimeout: 10 * time.Second,
3737
}
3838
go origin.Serve(listener)
3939
defer listener.Close()
4040

4141
originAddr := listener.Addr().String()
4242

43-
4443
var respCounter, reqCounter int64
4544

4645
input := NewRAWInput(originAddr, EnginePcap, testRawExpire)
@@ -63,7 +62,7 @@ func TestRAWInput(t *testing.T) {
6362
Plugins.Inputs = []io.Reader{input}
6463
Plugins.Outputs = []io.Writer{output}
6564

66-
client := NewHTTPClient("http://" + listener.Addr().String(), &HTTPClientConfig{})
65+
client := NewHTTPClient("http://"+listener.Addr().String(), &HTTPClientConfig{})
6766

6867
go Start(quit)
6968

@@ -87,16 +86,15 @@ func TestRAWInputIPv6(t *testing.T) {
8786
t.Fatal(err)
8887
}
8988
origin := &http.Server{
90-
Handler: http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {}),
91-
ReadTimeout: 10 * time.Second,
92-
WriteTimeout: 10 * time.Second,
89+
Handler: http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {}),
90+
ReadTimeout: 10 * time.Second,
91+
WriteTimeout: 10 * time.Second,
9392
}
9493
go origin.Serve(listener)
9594
defer listener.Close()
9695

9796
originAddr := listener.Addr().String()
9897

99-
10098
var respCounter, reqCounter int64
10199

102100
input := NewRAWInput(originAddr, EnginePcap, testRawExpire)
@@ -119,7 +117,7 @@ func TestRAWInputIPv6(t *testing.T) {
119117
Plugins.Inputs = []io.Reader{input}
120118
Plugins.Outputs = []io.Writer{output}
121119

122-
client := NewHTTPClient("http://" + listener.Addr().String(), &HTTPClientConfig{})
120+
client := NewHTTPClient("http://"+listener.Addr().String(), &HTTPClientConfig{})
123121

124122
go Start(quit)
125123

‎raw_socket_listener/listener.go‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,8 @@ type Listener struct {
6161

6262
messageExpire time.Duration
6363

64-
conn net.PacketConn
65-
quit chan bool
64+
conn net.PacketConn
65+
quit chan bool
6666
readyCh chan bool
6767
}
6868

@@ -130,10 +130,10 @@ func (t *Listener) listen() {
130130
t.conn.Close()
131131
}
132132
return
133-
case data := <- t.packetsChan:
133+
case data := <-t.packetsChan:
134134
packet := ParseTCPPacket(data[:16], data[16:])
135135
t.processTCPPacket(packet)
136-
case <- gcTicker:
136+
case <-gcTicker:
137137
now := time.Now()
138138

139139
// Dispatch requests before responses
@@ -175,13 +175,13 @@ func (t *Listener) dispatchMessage(message *TCPMessage) {
175175
if respID, ok := t.respWithoutReq[message.ResponseAck]; ok {
176176
if resp, rok := t.messages[respID]; rok {
177177
// if resp.AssocMessage == nil {
178-
// log.Println("FOUND RESPONSE")
179-
resp.AssocMessage = message
180-
message.AssocMessage = resp
178+
// log.Println("FOUND RESPONSE")
179+
resp.AssocMessage = message
180+
message.AssocMessage = resp
181181

182-
if resp.IsFinished() {
183-
defer t.dispatchMessage(resp)
184-
}
182+
if resp.IsFinished() {
183+
defer t.dispatchMessage(resp)
184+
}
185185
// }
186186
}
187187
}
@@ -333,7 +333,7 @@ func (t *Listener) readPcap() {
333333
// We need only packets with data inside
334334
// Check that the buffer is larger than the size of the TCP header
335335
if len(data) > int(dataOffset*4) {
336-
newBuf := make([]byte, len(data) + 16)
336+
newBuf := make([]byte, len(data)+16)
337337
copy(newBuf[:16], srcIP)
338338
copy(newBuf[16:], data)
339339

@@ -375,7 +375,7 @@ func (t *Listener) readRAWSocket() {
375375

376376
if n > 0 {
377377
if t.isValidPacket(buf[:n]) {
378-
newBuf := make([]byte, n + 4)
378+
newBuf := make([]byte, n+4)
379379
copy(newBuf[16:], buf[:n])
380380
copy(newBuf[:16], []byte(addr.(*net.IPAddr).IP))
381381

@@ -550,9 +550,9 @@ func (t *Listener) processTCPPacket(packet *TCPPacket) {
550550

551551
func (t *Listener) IsReady() bool {
552552
select {
553-
case <- t.readyCh:
553+
case <-t.readyCh:
554554
return true
555-
case <- time.After(5 * time.Second):
555+
case <-time.After(5 * time.Second):
556556
return false
557557
}
558558
}

‎raw_socket_listener/listener_test.go‎

Lines changed: 18 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ package rawSocket
33
import (
44
"bytes"
55
"log"
6-
"testing"
7-
"time"
86
"math/rand"
97
"sync/atomic"
8+
"testing"
9+
"time"
1010
)
1111

1212
func TestRawListenerInput(t *testing.T) {
@@ -262,7 +262,7 @@ func testChunkedSequence(t *testing.T, listener *Listener, packets ...*TCPPacket
262262
}
263263

264264
if len(listener.messagesChan) != 0 {
265-
t.Fatal("messagesChan non empty:", <- listener.messagesChan)
265+
t.Fatal("messagesChan non empty:", <-listener.messagesChan)
266266
}
267267

268268
if len(listener.messages) != 0 {
@@ -331,14 +331,13 @@ func TestRawListenerChunkedWrongOrder(t *testing.T) {
331331
}
332332
}
333333

334-
335334
func chunkedPostMessage() []*TCPPacket {
336335
ack := uint32(rand.Int63())
337336
seq := uint32(rand.Int63())
338337

339338
reqPacket1 := buildPacket(true, ack, seq, []byte("POST / HTTP/1.1\r\nTransfer-Encoding: chunked\r\n\r\n"))
340339
// Packet with data have different Seq
341-
reqPacket2 := buildPacket(true, ack, seq + 47, []byte("1\r\na\r\n"))
340+
reqPacket2 := buildPacket(true, ack, seq+47, []byte("1\r\na\r\n"))
342341
reqPacket3 := buildPacket(true, ack, reqPacket2.Seq+5, []byte("1\r\nb\r\n"))
343342
reqPacket4 := buildPacket(true, ack, reqPacket3.Seq+5, []byte("0\r\n\r\n"))
344343

@@ -359,13 +358,13 @@ func postMessage() []*TCPPacket {
359358
rand.Read(data)
360359

361360
head := []byte("POST / HTTP/1.1\r\nContent-Length: 9958\r\n\r\n")
362-
for i, _ := range head {
361+
for i := range head {
363362
data[i] = head[i]
364363
}
365364

366365
return []*TCPPacket{
367366
buildPacket(true, ack, seq, data),
368-
buildPacket(false, seq + uint32(len(data)), seq2, []byte("HTTP/1.1 200 OK\r\n")),
367+
buildPacket(false, seq+uint32(len(data)), seq2, []byte("HTTP/1.1 200 OK\r\n")),
369368
}
370369
}
371370

@@ -376,7 +375,7 @@ func getMessage() []*TCPPacket {
376375

377376
return []*TCPPacket{
378377
buildPacket(true, ack, seq, []byte("GET / HTTP/1.1\r\n\r\n")),
379-
buildPacket(false, seq + 18, seq2, []byte("HTTP/1.1 200 OK\r\n")),
378+
buildPacket(false, seq+18, seq2, []byte("HTTP/1.1 200 OK\r\n")),
380379
}
381380
}
382381

@@ -387,22 +386,22 @@ func TestRawListenerBench(t *testing.T) {
387386

388387
// Should re-construct message from all possible combinations
389388
for i := 0; i < 1000; i++ {
390-
go func(){
389+
go func() {
391390
for j := 0; j < 100; j++ {
392391
var packets []*TCPPacket
393392

394-
if j % 5 == 0 {
393+
if j%5 == 0 {
395394
packets = chunkedPostMessage()
396-
} else if j % 3 == 0 {
397-
packets = postMessage()
395+
} else if j%3 == 0 {
396+
packets = postMessage()
398397
} else {
399398
packets = getMessage()
400399
}
401400

402401
for _, p := range packets {
403402
// Randomly drop packets
404-
if (i + j) % 5 == 0 {
405-
if rand.Int63() % 3 == 0 {
403+
if (i+j)%5 == 0 {
404+
if rand.Int63()%3 == 0 {
406405
continue
407406
}
408407
}
@@ -422,11 +421,11 @@ func TestRawListenerBench(t *testing.T) {
422421

423422
for {
424423
select {
425-
case <- ch:
426-
atomic.AddInt32(&count, 1)
427-
case <-time.After(2000 * time.Millisecond):
428-
log.Println("Emitted 200000 messages, captured: ", count, len(l.ackAliases), len(l.seqWithData), len(l.respAliases), len(l.respWithoutReq), len(l.packetsChan))
429-
return
424+
case <-ch:
425+
atomic.AddInt32(&count, 1)
426+
case <-time.After(2000 * time.Millisecond):
427+
log.Println("Emitted 200000 messages, captured: ", count, len(l.ackAliases), len(l.seqWithData), len(l.respAliases), len(l.respWithoutReq), len(l.packetsChan))
428+
return
430429
}
431430
}
432431
}

‎raw_socket_listener/tcp_message.go‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ package rawSocket
33
import (
44
"bytes"
55
"crypto/sha1"
6-
"encoding/hex"
76
"encoding/binary"
7+
"encoding/hex"
88
"github.com/buger/gor/proto"
99
"log"
1010
"strconv"
@@ -20,12 +20,12 @@ var _ = log.Println
2020
// Message can be compiled from unique packets with same message_id which sorted by sequence
2121
// Message is received if we didn't receive any packets for 2000ms
2222
type TCPMessage struct {
23-
Seq uint32
24-
Ack uint32
25-
ResponseAck uint32
26-
ResponseID tcpID
27-
DataAck uint32
28-
DataSeq uint32
23+
Seq uint32
24+
Ack uint32
25+
ResponseAck uint32
26+
ResponseID tcpID
27+
DataAck uint32
28+
DataSeq uint32
2929

3030
AssocMessage *TCPMessage
3131
Start time.Time
@@ -210,11 +210,11 @@ func (t *TCPMessage) UpdateResponseAck() uint32 {
210210
copy(t.ResponseID[4:], lastPacket.Raw[2:4]) // Src port
211211
copy(t.ResponseID[6:], lastPacket.Raw[0:2]) // Dest port
212212
binary.BigEndian.PutUint32(t.ResponseID[8:12], t.ResponseAck)
213-
}
213+
}
214214

215215
return t.ResponseAck
216216
}
217217

218218
func (t *TCPMessage) ID() tcpID {
219219
return t.packets[0].ID
220-
}
220+
}

‎raw_socket_listener/tcp_message_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ package rawSocket
22

33
import (
44
"bytes"
5+
"encoding/binary"
56
_ "log"
67
"testing"
7-
"encoding/binary"
88
)
99

1010
func buildPacket(isIncoming bool, Ack, Seq uint32, Data []byte) (packet *TCPPacket) {

‎raw_socket_listener/tcp_packet.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,10 @@ type TCPPacket struct {
3131
OrigAck uint32
3232
DataOffset uint8
3333

34-
Raw []byte
34+
Raw []byte
3535
Data []byte
3636
Addr []byte
37-
ID tcpID
37+
ID tcpID
3838
}
3939

4040
// ParseTCPPacket takes address and tcp payload and returns parsed TCPPacket
@@ -49,8 +49,8 @@ func ParseTCPPacket(addr []byte, data []byte) (p *TCPPacket) {
4949

5050
func (p *TCPPacket) GenID() {
5151
copy(p.ID[:16], p.Addr)
52-
copy(p.ID[16:], p.Raw[0:2]) // Src port
53-
copy(p.ID[18:], p.Raw[2:4]) // Dest port
52+
copy(p.ID[16:], p.Raw[0:2]) // Src port
53+
copy(p.ID[18:], p.Raw[2:4]) // Dest port
5454
copy(p.ID[20:], p.Raw[8:12]) // Ack
5555
}
5656

@@ -73,7 +73,7 @@ func (t *TCPPacket) ParseBasic() {
7373
}
7474

7575
func (t *TCPPacket) Dump() []byte {
76-
buf := make([]byte, len(t.Data) + 16 + 16)
76+
buf := make([]byte, len(t.Data)+16+16)
7777
tcpBuf := buf[16:]
7878

7979
binary.BigEndian.PutUint16(tcpBuf[2:4], t.DestPort)

0 commit comments

Comments
 (0)