Changeset 5833 for pjproject/trunk/pjsip/src/pjsip/sip_transport_tcp.c

Timestamp:

Jul 23, 2018 7:15:08 AM (2 years ago)

Author:

riza

Message:

Close #2070: Print IPv6 addresses with brackets.

File:

• pjproject/trunk/pjsip/src/pjsip/sip_transport_tcp.c (modified) (10 diffs)

pjproject/trunk/pjsip/src/pjsip/sip_transport_tcp.c

@@ -329 +329 @@
     enum { INFO_LEN = 100 };
     char local_addr[PJ_INET6_ADDRSTRLEN + 10];
+    char pub_addr[PJ_INET6_ADDRSTRLEN + 10];
     pj_sockaddr *listener_addr = &listener->factory.local_addr;
 
@@ -337 +338 @@
     }
     pj_sockaddr_print(listener_addr, local_addr, sizeof(local_addr), 3);
+    pj_addr_str_print(&listener->factory.addr_name.host, 
+                      listener->factory.addr_name.port, pub_addr, 
+                      sizeof(pub_addr), 1);
     pj_ansi_snprintf(
-            listener->factory.info, INFO_LEN, "tcp %s [published as %.*s:%d]",
-            local_addr,
-            (int)listener->factory.addr_name.host.slen,
-            listener->factory.addr_name.host.ptr,
-            listener->factory.addr_name.port);
-
-    if (listener->asock) {
+            listener->factory.info, INFO_LEN, "tcp %s [published as %s]",
+            local_addr, pub_addr);
+
+    if (listener->asock) {      
+        char addr[PJ_INET6_ADDRSTRLEN+10];
+
         PJ_LOG(4, (listener->factory.obj_name,
-               "SIP TCP listener ready for incoming connections at %.*s:%d",
-               (int)listener->factory.addr_name.host.slen,
-               listener->factory.addr_name.host.ptr,
-               listener->factory.addr_name.port));
+                   "SIP TCP listener ready for incoming connections at %s",
+                   pj_addr_str_print(&listener->factory.addr_name.host,
+                                     listener->factory.addr_name.port, addr,
+                                     sizeof(addr), 1)));
     } else {
         PJ_LOG(4, (listener->factory.obj_name, "SIP TCP is ready "
@@ -1030 +1033 @@
 
     if (tcp->has_pending_connect) {
+        char local_addr_buf[PJ_INET6_ADDRSTRLEN+10];
+        char remote_addr_buf[PJ_INET6_ADDRSTRLEN+10];
+
         /* Update (again) local address, just in case local address currently
          * set is different now that asynchronous connect() is started.
@@ -1051 +1057 @@
         
         PJ_LOG(4,(tcp->base.obj_name, 
-                  "TCP transport %.*s:%d is connecting to %.*s:%d...",
-                  (int)tcp->base.local_name.host.slen,
-                  tcp->base.local_name.host.ptr,
-                  tcp->base.local_name.port,
-                  (int)tcp->base.remote_name.host.slen,
-                  tcp->base.remote_name.host.ptr,
-                  tcp->base.remote_name.port));
+                  "TCP transport %s is connecting to %s...",
+                  pj_addr_str_print(&tcp->base.local_name.host, 
+                                    tcp->base.local_name.port, 
+                                    local_addr_buf, sizeof(local_addr_buf), 1),
+                  pj_addr_str_print(&tcp->base.remote_name.host, 
+                                tcp->base.remote_name.port, 
+                                remote_addr_buf, sizeof(remote_addr_buf), 1)));
     }
 
@@ -1083 +1089 @@
     int addr_len;
     pj_status_t status;
+    char addr_buf[PJ_INET6_ADDRSTRLEN+10];    
 
     PJ_UNUSED_ARG(src_addr_len);
@@ -1094 +1101 @@
 
     PJ_LOG(4,(listener->factory.obj_name, 
-              "TCP listener %.*s:%d: got incoming TCP connection "
+              "TCP listener %s: got incoming TCP connection "
               "from %s, sock=%d",
-              (int)listener->factory.addr_name.host.slen,
-              listener->factory.addr_name.host.ptr,
-              listener->factory.addr_name.port,
+              pj_addr_str_print(&listener->factory.addr_name.host, 
+                                listener->factory.addr_name.port, addr_buf, 
+                                sizeof(addr_buf), 1),
               pj_sockaddr_print(src_addr, addr, sizeof(addr), 3),
               sock));
@@ -1423 +1430 @@
     int addrlen;
     pjsip_tp_state_callback state_cb;
+    char local_addr_buf[PJ_INET6_ADDRSTRLEN+10];
+    char remote_addr_buf[PJ_INET6_ADDRSTRLEN+10];
 
     tcp = (struct tcp_transport*) pj_activesock_get_user_data(asock);
@@ -1463 +1472 @@
 
     PJ_LOG(4,(tcp->base.obj_name, 
-              "TCP transport %.*s:%d is connected to %.*s:%d",
-              (int)tcp->base.local_name.host.slen,
-              tcp->base.local_name.host.ptr,
-              tcp->base.local_name.port,
-              (int)tcp->base.remote_name.host.slen,
-              tcp->base.remote_name.host.ptr,
-              tcp->base.remote_name.port));
+              "TCP transport %s is connected to %s",
+              pj_addr_str_print(&tcp->base.local_name.host, 
+                                tcp->base.local_name.port, local_addr_buf, 
+                                sizeof(local_addr_buf), 1),
+              pj_addr_str_print(&tcp->base.remote_name.host, 
+                                tcp->base.remote_name.port, remote_addr_buf, 
+                                sizeof(remote_addr_buf), 1)));
 
 
@@ -1529 +1538 @@
     pj_ssize_t size;
     pj_status_t status;
+    char addr[PJ_INET6_ADDRSTRLEN+10];        
 
     PJ_UNUSED_ARG(th);
@@ -1548 +1558 @@
     }
 
-    PJ_LOG(5,(tcp->base.obj_name, "Sending %d byte(s) keep-alive to %.*s:%d", 
-              (int)tcp->ka_pkt.slen, (int)tcp->base.remote_name.host.slen,
-              tcp->base.remote_name.host.ptr,
-              tcp->base.remote_name.port));
+    PJ_LOG(5,(tcp->base.obj_name, "Sending %d byte(s) keep-alive to %s", 
+              (int)tcp->ka_pkt.slen, 
+              pj_addr_str_print(&tcp->base.remote_name.host, 
+                                tcp->base.remote_name.port, addr, 
+                                sizeof(addr), 1)));
 
     /* Send the data */