Changeset 5833 for pjproject/trunk/pjlib/src/pj/sock_common.c

Timestamp:

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

Author:

riza

Message:

Close #2070: Print IPv6 addresses with brackets.

File:

• pjproject/trunk/pjlib/src/pj/sock_common.c (modified) (5 diffs)

pjproject/trunk/pjlib/src/pj/sock_common.c

@@ -846 +846 @@
 
             TRACE_((THIS_FILE, "hostname IP is %s",
-                    pj_sockaddr_print(&ai.ai_addr, strip, sizeof(strip), 0)));
+                    pj_sockaddr_print(&ai.ai_addr, strip, sizeof(strip), 3)));
         }
     }
@@ -858 +858 @@
         if (status == PJ_SUCCESS) {
             TRACE_((THIS_FILE, "default IP is %s",
-                    pj_sockaddr_print(addr, strip, sizeof(strip), 0)));
+                    pj_sockaddr_print(addr, strip, sizeof(strip), 3)));
 
             pj_sockaddr_set_port(addr, 0);
@@ -970 +970 @@
     for (i=0; i<cand_cnt; ++i) {
         TRACE_((THIS_FILE, "Checking candidate IP %s, weight=%d",
-                pj_sockaddr_print(&cand_addr[i], strip, sizeof(strip), 0),
+                pj_sockaddr_print(&cand_addr[i], strip, sizeof(strip), 3),
                 cand_weight[i]));
 
@@ -995 +995 @@
         }
         TRACE_((THIS_FILE, "Loopback IP %s returned",
-                pj_sockaddr_print(addr, strip, sizeof(strip), 0)));
+                pj_sockaddr_print(addr, strip, sizeof(strip), 3)));
     } else {
         pj_sockaddr_copy_addr(addr, &cand_addr[selected_cand]);
         TRACE_((THIS_FILE, "Candidate %s selected",
-                pj_sockaddr_print(addr, strip, sizeof(strip), 0)));
+                pj_sockaddr_print(addr, strip, sizeof(strip), 3)));
     }
 
@@ -1190 +1190 @@
 
 
+PJ_DEF(char *) pj_addr_str_print( const pj_str_t *host_str, int port, 
+                                  char *buf, int size, unsigned flag)
+{
+    enum {
+        WITH_PORT = 1
+    };
+    char *bquote, *equote;
+    int af = pj_AF_UNSPEC();    
+    pj_in6_addr dummy6;
+
+    /* Check if this is an IPv6 address */
+    if (pj_inet_pton(pj_AF_INET6(), host_str, &dummy6) == PJ_SUCCESS)
+        af = pj_AF_INET6();
+
+    if (af == pj_AF_INET6()) {
+        bquote = "[";
+        equote = "]";    
+    } else {
+        bquote = "";
+        equote = "";    
+    } 
+
+    if (flag & WITH_PORT) {
+        pj_ansi_snprintf(buf, size, "%s%.*s%s:%d",
+                         bquote, (int)host_str->slen, host_str->ptr, equote, 
+                         port);
+    } else {
+        pj_ansi_snprintf(buf, size, "%s%.*s%s",
+                         bquote, (int)host_str->slen, host_str->ptr, equote);
+    }
+    return buf;
+}
+
+
 /* Only need to implement these in DLL build */
 #if defined(PJ_DLL)