clean up

cmd/link.go

@@ -40,11 +40,6 @@ func init() {
 	linkCmd.Flags().StringVarP(&serverAddr, "server", "s", "http://localhost:8080", "Conduit server address")
 }
 
-type TunnelConfig struct {
-	// The conduit server address, e.g. https://conduit.example.com
-	ServerAddress string `default:"http://localhost:8080"`
-}
-
 func NewTunnel(tunnelName, tunnelTarget, serverAddress string) (*Tunnel, error) {
 	// Parse Server URL
 	serverURL, err := url.Parse(serverAddress)
@@ -73,6 +68,7 @@ func NewTunnel(tunnelName, tunnelTarget, serverAddress string) (*Tunnel, error)
 	return &Tunnel{
 		name:       tunnelName,
 		target:     tunnelTarget,
+		serverURL:  serverURL,
 		serverConn: serverConn,
 		localConns: make(map[string]net.Conn),
 	}, nil
@@ -80,8 +76,9 @@ func NewTunnel(tunnelName, tunnelTarget, serverAddress string) (*Tunnel, error)
 }
 
 type Tunnel struct {
-	name   string
-	target string
+	name      string
+	target    string
+	serverURL *url.URL
 
 	serverConn *websocket.Conn
 	localConns map[string]net.Conn
@@ -89,7 +86,7 @@ type Tunnel struct {
 }
 
 func (t *Tunnel) Start() error {
-	log.Infof("TCP Tunnel active! %s.example.com -> %s\n", t.name, t.target)
+	log.Infof("TCP Tunnel active! %s.%s -> %s\n", t.name, t.serverURL.Hostname(), t.target)
 	defer t.serverConn.Close()
 
 	// Handle Messages
@@ -156,17 +153,17 @@ func (t *Tunnel) getLocalConn(streamID string) (net.Conn, error) {
 	return localConn, nil
 }
 
-func (t *Tunnel) startResponseRelay(streamID string, lConn net.Conn) {
+func (t *Tunnel) startResponseRelay(streamID string, localConn net.Conn) {
 	defer func() {
 		t.mu.Lock()
 		delete(t.localConns, streamID)
 		t.mu.Unlock()
-		lConn.Close()
+		localConn.Close()
 	}()
 
 	buffer := make([]byte, 4096)
 	for {
-		n, err := lConn.Read(buffer)
+		n, err := localConn.Read(buffer)
 		if err != nil {
 			break
 		}