Switch connection state lookups to use the packet.Info struct

Also, rename the Direction attribute on packet.Info to Inbound

firewall/api.go

@@ -60,16 +60,17 @@ func apiAuthenticator(s *http.Server, r *http.Request) (grantAccess bool, err er
 	var procsChecked []string
 
 	// get process
-	proc, _, err := process.GetProcessByEndpoints(
+	proc, _, err := process.GetProcessByConnection(
 		r.Context(),
-		packet.IPv4,
-		packet.TCP,
-		// switch reverse/local to get remote process
-		remoteIP,
-		remotePort,
-		localIP,
-		localPort,
-		false,
+		&packet.Info{
+			Inbound:  false, // outbound as we are looking for the process of the source address
+			Version:  packet.IPv4,
+			Protocol: packet.TCP,
+			Src:      remoteIP,   // source as in the process we are looking for
+			SrcPort:  remotePort, // source as in the process we are looking for
+			Dst:      localIP,
+			DstPort:  localPort,
+		},
 	)
 	if err != nil {
 		return false, fmt.Errorf("failed to get process: %s", err)

firewall/interception/windowskext/handler.go

@@ -62,7 +62,7 @@ func Handler(packets chan packet.Packet) {
 		}
 
 		info := new.Info()
-		info.Direction = packetInfo.direction > 0
+		info.Inbound = packetInfo.direction > 0
 		info.InTunnel = false
 		info.Protocol = packet.IPProtocol(packetInfo.protocol)
 
@@ -76,7 +76,7 @@ func Handler(packets chan packet.Packet) {
 		// IPs
 		if info.Version == packet.IPv4 {
 			// IPv4
-			if info.Direction {
+			if info.Inbound {
 				// Inbound
 				info.Src = convertIPv4(packetInfo.remoteIP)
 				info.Dst = convertIPv4(packetInfo.localIP)
@@ -87,7 +87,7 @@ func Handler(packets chan packet.Packet) {
 			}
 		} else {
 			// IPv6
-			if info.Direction {
+			if info.Inbound {
 				// Inbound
 				info.Src = convertIPv6(packetInfo.remoteIP)
 				info.Dst = convertIPv6(packetInfo.localIP)
@@ -99,7 +99,7 @@ func Handler(packets chan packet.Packet) {
 		}
 
 		// Ports
-		if info.Direction {
+		if info.Inbound {
 			// Inbound
 			info.SrcPort = packetInfo.remotePort
 			info.DstPort = packetInfo.localPort

firewall/master.go

@@ -91,15 +91,15 @@ func checkSelfCommunication(conn *network.Connection, pkt packet.Packet) bool {
 		pktInfo := pkt.Info()
 		if conn.Process().Pid >= 0 && pktInfo.Src.Equal(pktInfo.Dst) {
 			// get PID
-			otherPid, _, err := state.Lookup(
-				pktInfo.Version,
-				pktInfo.Protocol,
-				pktInfo.RemoteIP(),
-				pktInfo.RemotePort(),
-				pktInfo.LocalIP(),
-				pktInfo.LocalPort(),
-				pktInfo.Direction,
-			)
+			otherPid, _, err := state.Lookup(&packet.Info{
+				Inbound:  !pktInfo.Inbound, // we want to know the process on the other end
+				Version:  pktInfo.Version,
+				Protocol: pktInfo.Protocol,
+				Src:      pktInfo.Src,
+				SrcPort:  pktInfo.SrcPort,
+				Dst:      pktInfo.Dst,
+				DstPort:  pktInfo.DstPort,
+			})
 			if err != nil {
 				log.Warningf("filter: failed to find local peer process PID: %s", err)
 			} else {