fix adding host when copying device

danielpaulus · Nov 11, 2024 · 621d509 · 621d509
1 parent 636a36f
commit 621d509
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/ios/tunnel/tunnel_api.go b/ios/tunnel/tunnel_api.go
@@ -177,11 +177,11 @@ func TunnelInfoForDevice(udid string, tunnelInfoHost string, tunnelInfoPort int)
 	return info, nil
 }
 
-func ListRunningTunnels(tunnelInfoPort int) ([]Tunnel, error) {
+func ListRunningTunnels(tunnelInfoHost string, tunnelInfoPort int) ([]Tunnel, error) {
 	c := http.Client{
 		Timeout: 5 * time.Second,
 	}
-	res, err := c.Get(fmt.Sprintf("http://127.0.0.1:%d/tunnels", tunnelInfoPort))
+	res, err := c.Get(fmt.Sprintf("http://%s:%d/tunnels", tunnelInfoHost, tunnelInfoPort))
 	if err != nil {
 		return nil, fmt.Errorf("TunnelInfoForDevice: failed to get tunnel info: %w", err)
 	}

diff --git a/main.go b/main.go
@@ -1118,7 +1118,7 @@ The commands work as following:
 			}
 			startTunnel(context.TODO(), pairRecordsPath, tunnelInfoPort, useUserspaceNetworking)
 		} else if listCommand {
-			tunnels, err := tunnel.ListRunningTunnels(tunnelInfoPort)
+			tunnels, err := tunnel.ListRunningTunnels(tunnelInfoHost, tunnelInfoPort)
 			if err != nil {
 				exitIfError("failed to get tunnel infos", err)
 			}
@@ -2276,6 +2276,7 @@ func deviceWithRsdProvider(device ios.DeviceEntry, udid string, address string,
 	rsdProvider, err := rsdService.Handshake()
 	device1, err := ios.GetDeviceWithAddress(udid, address, rsdProvider)
 	device1.UserspaceTUN = device.UserspaceTUN
+	device1.UserspaceTUNHost = device.UserspaceTUNHost
 	device1.UserspaceTUNPort = device.UserspaceTUNPort
 	exitIfError("error getting devicelist", err)