Merge remote-tracking branch 'upstream/Alpha' into Alpha

2022-03-17 23:40:51 +08:00
parent 92d169ca81 435bee0ca2
commit 68345b6a19
140 changed files with 5354 additions and 4136 deletions
--- a/component/process/process_linux.go
+++ b/component/process/process_linux.go
@ -110,7 +110,7 @@ func resolveSocketByNetlink(network string, ip net.IP, srcPort int) (int32, int3
 		return 0, 0, fmt.Errorf("invalid uid(%d) or inode(%d)", uid, inode)
 	}

-	return uid, inode, nil
+	return inode, uid, nil
 }

 func packSocketDiagRequest(family, protocol byte, source net.IP, sourcePort uint16) []byte {