From d753ca7225cbd3ef787e14ff89412dcda2757893 Mon Sep 17 00:00:00 2001
From: apevogoci <3817102+apevogoci@users.noreply.github.com>
Date: Fri, 1 Jul 2022 06:14:50 +0300
Subject: [PATCH] Improve: Try tcp6&udp6 files first when search UID for
 connection (#1514)

---
 .../src/main/golang/native/platform/procfs.go | 22 +++++++++++++------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/core/src/main/golang/native/platform/procfs.go b/core/src/main/golang/native/platform/procfs.go
index b1f8830d..1ee2a610 100644
--- a/core/src/main/golang/native/platform/procfs.go
+++ b/core/src/main/golang/native/platform/procfs.go
@@ -26,7 +26,7 @@ func QuerySocketUidFromProcFs(source, _ net.Addr) int {
 
 	network := source.Network()
 
-	if strings.HasSuffix(network, "4") {
+	if strings.HasSuffix(network, "4") || strings.HasSuffix(network, "6") {
 		network = network[:len(network)-1]
 	}
 
@@ -46,16 +46,24 @@ func QuerySocketUidFromProcFs(source, _ net.Addr) int {
 		return -1
 	}
 
-	if strings.HasSuffix(source.Network(), "6") {
-		sIP = sIP.To16()
-	} else {
-		sIP = sIP.To4()
-	}
-
+	sIP = sIP.To16()
 	if sIP == nil {
 		return -1
 	}
 
+	uid := doQuery(path+"6", sIP, sPort)
+	if uid == -1 {
+		sIP = sIP.To4()
+		if sIP == nil {
+			return -1
+		}
+		uid = doQuery(path, sIP, sPort)
+	}
+
+	return uid
+}
+
+func doQuery(path string, sIP net.IP, sPort int) int {
 	file, err := os.Open(path)
 	if err != nil {
 		return -1