fixup! Merge branch 'main' into dean/listening-ports

coder · deansheather · Oct 6, 2022 · Sep 29, 2022 · Sep 29, 2022 · Sep 29, 2022
commit b084277d37637e67bb99f406d9d0ba590123ecfe
diff --git a/agent/ports_supported.go b/agent/ports_supported.go
@@ -32,12 +32,16 @@ func (lp *listeningPortsHandler) getListeningPorts() ([]codersdk.ListeningPort,
 
 	ports := []codersdk.ListeningPort{}
 	for _, tab := range tabs {
-		if tab.LocalAddr.Port < uint16(codersdk.MinimumListeningPort) {
+		if tab.LocalAddr == nil || tab.LocalAddr.Port < uint16(codersdk.MinimumListeningPort) {
 			continue
 		}
 
+		procName := ""
+		if tab.Process != nil {
+			procName = tab.Process.Name
+		}
 		ports = append(ports, codersdk.ListeningPort{
-			ProcessName: tab.Process.Name,
+			ProcessName: procName,
 			Network:     codersdk.ListeningPortNetworkTCP,
 			Port:        tab.LocalAddr.Port,
 		})

diff --git a/codersdk/agentconn.go b/codersdk/agentconn.go
@@ -229,8 +229,8 @@ const (
 )
 
 type ListeningPort struct {
-	ProcessName string               `json:"process_name"`
-	Network     ListeningPortNetwork `json:"network"` // only "tcp" at the moment
+	ProcessName string               `json:"process_name"` // may be empty
+	Network     ListeningPortNetwork `json:"network"`      // only "tcp" at the moment
 	Port        uint16               `json:"port"`
 }