Merge pull request #43 from vearne/develop

fix bug:connection's direction

Makefile

@@ -1,4 +1,4 @@
-VERSION := v0.1.6
+VERSION := v0.1.7
 
 BIN_NAME = grpcr
 CONTAINER = grpcr

http2/net_pkg.go

@@ -55,10 +55,12 @@ func ProcessPacket(packet gopacket.Packet, ipSet *util.StringSet, port int) (*Ne
 		return nil, errors.New("invalid TCP package")
 	}
 	p.TCP = tcpLayer.(*layers.TCP)
-	if ipSet.Has(p.DstIP) && int(p.TCP.SrcPort) == port {
+	if ipSet.Has(p.SrcIP) && int(p.TCP.SrcPort) == port {
 		p.Direction = DirOutcoming
-	} else {
+	} else if ipSet.Has(p.DstIP) && int(p.TCP.DstPort) == port {
 		p.Direction = DirIncoming
+	} else {
+		p.Direction = DirUnknown
 	}
 	return &p, nil
 }

http2/processor.go

@@ -62,7 +62,7 @@ func (p *Processor) ProcessTCPPkg() {
 				continue
 			}
 
-			dc := pkg.DirectConn()
+			dc = pkg.DirectConn()
 			f.DirectConn = &dc
 			slog.Debug("Connection:%v, seq:%v, FrameType:%v, length:%v, len(payload):%v, streamID:%v",
 				f.DirectConn, pkg.TCP.Seq, GetFrameType(f.Type), f.Length, len(f.Payload), f.StreamID)

plugin/input_raw.go

@@ -67,7 +67,6 @@ func (l *DeviceListener) listen() error {
 			&conn, http2.GetDirection(netPkg.Direction))
 		if netPkg.Direction == http2.DirIncoming {
 			//l.rawInput.outputChan <- packet
-			conn := netPkg.DirectConn()
 			if l.rawInput.connSet.Has(conn) { // history connection
 				if netPkg.TCP.ACK {
 					slog.Debug("send RST, for connection:%v", &conn)

util/string_set.go

@@ -1,20 +1,20 @@
 package util
 
 type StringSet struct {
-	internal map[string]int
+	internal map[string]struct{}
 }
 
 func NewStringSet() *StringSet {
-	return &StringSet{internal: make(map[string]int)}
+	return &StringSet{internal: make(map[string]struct{})}
 }
 
 func (set *StringSet) Add(str string) {
-	set.internal[str] = 1
+	set.internal[str] = struct{}{}
 }
 
 func (set *StringSet) AddAll(itemSlice []string) {
 	for _, item := range itemSlice {
-		set.internal[item] = 1
+		set.internal[item] = struct{}{}
 	}
 }