From 2c660fa2e5a47c499f74aeb7dc522349a5753d3a Mon Sep 17 00:00:00 2001
From: Alan Donovan <alan@alandonovan.net>
Date: Fri, 3 Sep 2021 12:55:40 -0400
Subject: [PATCH] avoid ListenTCP helper

---
 cmd/ghcs/logs.go              | 2 +-
 cmd/ghcs/ports.go             | 3 ++-
 cmd/ghcs/ssh.go               | 2 +-
 internal/codespaces/states.go | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/cmd/ghcs/logs.go b/cmd/ghcs/logs.go
index 5e7e8c0a5..f069a58ab 100644
--- a/cmd/ghcs/logs.go
+++ b/cmd/ghcs/logs.go
@@ -63,7 +63,7 @@ func logs(ctx context.Context, tail bool, codespaceName string) error {
 	}
 
 	// Ensure local port is listening before client (getPostCreateOutput) connects.
-	listen, err := liveshare.ListenTCP(0) // zero => arbitrary
+	listen, err := net.Listen("tcp", ":0") // arbitrary port
 	if err != nil {
 		return err
 	}
diff --git a/cmd/ghcs/ports.go b/cmd/ghcs/ports.go
index 958b25996..fb76022d7 100644
--- a/cmd/ghcs/ports.go
+++ b/cmd/ghcs/ports.go
@@ -6,6 +6,7 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
+	"net"
 	"os"
 	"strconv"
 	"strings"
@@ -277,7 +278,7 @@ func forwardPorts(log *output.Logger, codespaceName string, ports []string) erro
 	for _, pair := range portPairs {
 		pair := pair
 		group.Go(func() error {
-			listen, err := liveshare.ListenTCP(pair.local)
+			listen, err := net.Listen("tcp", fmt.Sprintf(":%d", pair.local))
 			if err != nil {
 				return nil
 			}
diff --git a/cmd/ghcs/ssh.go b/cmd/ghcs/ssh.go
index 55a406c94..6e2724e73 100644
--- a/cmd/ghcs/ssh.go
+++ b/cmd/ghcs/ssh.go
@@ -86,7 +86,7 @@ func ssh(ctx context.Context, sshProfile, codespaceName string, localSSHServerPo
 	usingCustomPort := localSSHServerPort != 0 // suppress log of command line in Shell
 
 	// Ensure local port is listening before client (Shell) connects.
-	listen, err := liveshare.ListenTCP(localSSHServerPort)
+	listen, err := net.Listen("tcp", fmt.Sprintf(":%d", localSSHServerPort))
 	if err != nil {
 		return err
 	}
diff --git a/internal/codespaces/states.go b/internal/codespaces/states.go
index 46d4f5ed5..492ce3964 100644
--- a/internal/codespaces/states.go
+++ b/internal/codespaces/states.go
@@ -48,7 +48,7 @@ func PollPostCreateStates(ctx context.Context, log logger, apiClient *api.API, u
 	}
 
 	// Ensure local port is listening before client (getPostCreateOutput) connects.
-	listen, err := liveshare.ListenTCP(0)
+	listen, err := net.Listen("tcp", ":0") // arbitrary port
 	if err != nil {
 		return err
 	}