1 files changed, 26 insertions, 6 deletions
diff --git a/cli/ops/tls.rs b/cli/ops/tls.rs
index fc2dec0d1..cb0ae2ecb 100644
--- a/cli/ops/tls.rs
+++ b/cli/ops/tls.rs
@@ -53,6 +53,7 @@ pub fn init(i: &mut Isolate, s: &ThreadSafeState) {
 #[derive(Deserialize)]
 #[serde(rename_all = "camelCase")]
 struct ConnectTLSArgs {
+  transport: String,
   hostname: String,
   port: u16,
   cert_file: Option<String>,
@@ -101,8 +102,16 @@ pub fn op_connect_tls(
     );
     Ok(json!({
         "rid": rid,
-        "localAddr": local_addr.to_string(),
-        "remoteAddr": remote_addr.to_string(),
+        "localAddr": {
+          "hostname": local_addr.ip().to_string(),
+          "port": local_addr.port(),
+          "transport": args.transport,
+        },
+        "remoteAddr": {
+          "hostname": remote_addr.ip().to_string(),
+          "port": remote_addr.port(),
+          "transport": args.transport,
+        }
     }))
   };
 
@@ -257,7 +266,6 @@ fn op_listen_tls(
     futures::executor::block_on(resolve_addr(&args.hostname, args.port))?;
   let listener = futures::executor::block_on(TcpListener::bind(&addr))?;
   let local_addr = listener.local_addr()?;
-  let local_addr_str = local_addr.to_string();
   let tls_listener_resource = TlsListenerResource {
     listener,
     tls_acceptor,
@@ -269,7 +277,11 @@ fn op_listen_tls(
 
   Ok(JsonOp::Sync(json!({
     "rid": rid,
-    "localAddr": local_addr_str
+    "localAddr": {
+      "hostname": local_addr.ip().to_string(),
+      "port": local_addr.port(),
+      "transport": args.transport,
+    },
   })))
 }
 
@@ -371,8 +383,16 @@ fn op_accept_tls(
     };
     Ok(json!({
       "rid": rid,
-      "localAddr": local_addr.to_string(),
-      "remoteAddr": remote_addr.to_string(),
+      "localAddr": {
+        "transport": "tcp",
+        "hostname": local_addr.ip().to_string(),
+        "port": local_addr.port()
+      },
+      "remoteAddr": {
+        "transport": "tcp",
+        "hostname": remote_addr.ip().to_string(),
+        "port": remote_addr.port()
+      }
     }))
   };