Merge pull request #4102 from ashwat287/SwitchToSockDiag

feat(guestagent/sockets): replace /proc/net parsing with NETLINK_INET_DIAG

Author: AkihiroSuda

go.mod

@@ -29,6 +29,7 @@ require (
 	github.com/lima-vm/sshocker v0.3.8 // gomodjail:unconfined
 	github.com/mattn/go-isatty v0.0.20
 	github.com/mattn/go-shellwords v1.0.12
+	github.com/mdlayher/netlink v1.8.0
 	github.com/mdlayher/vsock v1.2.1 // gomodjail:unconfined
 	github.com/miekg/dns v1.1.68 // gomodjail:unconfined
 	github.com/mikefarah/yq/v4 v4.47.2

go.sum

@@ -185,8 +185,8 @@ github.com/mattn/go-runewidth v0.0.16 h1:E5ScNMtiwvlvB5paMFdw9p4kSQzbXFikJ5SQO6T
 github.com/mattn/go-runewidth v0.0.16/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
 github.com/mattn/go-shellwords v1.0.12 h1:M2zGm7EW6UQJvDeQxo4T51eKPurbeFbe8WtebGE2xrk=
 github.com/mattn/go-shellwords v1.0.12/go.mod h1:EZzvwXDESEeg03EKmM+RmDnNOPKG4lLtQsUlTZDWQ8Y=
-github.com/mdlayher/netlink v1.7.2 h1:/UtM3ofJap7Vl4QWCPDGXY8d3GIY2UGSDbK+QWmY8/g=
-github.com/mdlayher/netlink v1.7.2/go.mod h1:xraEF7uJbxLhc5fpHL4cPe221LI2bdttWlU+ZGLfQSw=
+github.com/mdlayher/netlink v1.8.0 h1:e7XNIYJKD7hUct3Px04RuIGJbBxy1/c4nX7D5YyvvlM=
+github.com/mdlayher/netlink v1.8.0/go.mod h1:UhgKXUlDQhzb09DrCl2GuRNEglHmhYoWAHid9HK3594=
 github.com/mdlayher/packet v1.1.2 h1:3Up1NG6LZrsgDVn6X4L9Ge/iyRyxFEFD9o6Pr3Q1nQY=
 github.com/mdlayher/packet v1.1.2/go.mod h1:GEu1+n9sG5VtiRE4SydOmX5GTwyyYlteZiFU+x0kew4=
 github.com/mdlayher/socket v0.5.1 h1:VZaqt6RkGkt2OE9l3GcC6nZkqD3xKeQLyfleW/uBcos=

pkg/guestagent/guestagent_linux.go

@@ -20,7 +20,7 @@ import (
 	"github.com/lima-vm/lima/v2/pkg/guestagent/api"
 	"github.com/lima-vm/lima/v2/pkg/guestagent/iptables"
 	"github.com/lima-vm/lima/v2/pkg/guestagent/kubernetesservice"
-	"github.com/lima-vm/lima/v2/pkg/guestagent/procnettcp"
+	"github.com/lima-vm/lima/v2/pkg/guestagent/sockets"
 	"github.com/lima-vm/lima/v2/pkg/guestagent/ticker"
 	"github.com/lima-vm/lima/v2/pkg/guestagent/timesync"
 )
@@ -222,24 +222,24 @@ func (a *agent) Events(ctx context.Context, ch chan *api.Event) {
 
 func (a *agent) LocalPorts(ctx context.Context) ([]*api.IPPort, error) {
 	var res []*api.IPPort
-	tcpParsed, err := procnettcp.ParseFiles()
+	socketsList, err := sockets.List()
 	if err != nil {
 		return res, err
 	}
 
-	for _, f := range tcpParsed {
+	for _, f := range socketsList {
 		switch f.Kind {
-		case procnettcp.TCP, procnettcp.TCP6:
-			if f.State == procnettcp.TCPListen {
+		case sockets.TCP, sockets.TCP6:
+			if f.State == sockets.TCPListen {
 				res = append(res,
 					&api.IPPort{
 						Ip:       f.IP.String(),
 						Port:     int32(f.Port),
 						Protocol: "tcp",
 					})
 			}
-		case procnettcp.UDP, procnettcp.UDP6:
-			if f.State == procnettcp.UDPUnconnected {
+		case sockets.UDP, sockets.UDP6:
+			if f.State == sockets.UDPUnconnected {
 				res = append(res,
 					&api.IPPort{
 						Ip:       f.IP.String(),
@@ -274,7 +274,7 @@ func (a *agent) LocalPorts(ctx context.Context) ([]*api.IPPort, error) {
 
 	for _, ipt := range ipts {
 		port := int32(ipt.AddrPort.Port())
-		// Make sure the port isn't already listed from procnettcp
+		// Make sure the port isn't already listed from sockets
 		found := false
 		for _, re := range res {
 			if re.Port == port {