Changeset 5513 for pjproject/branches/projects/uwp/pjnath/src/pjnath/stun_msg_dump.c

Timestamp:

Dec 28, 2016 3:40:07 AM (7 years ago)

Author:

nanang

Message:

Re #1900: More merged from trunk (r5512 mistakenly contains merged changes in third-party dir only).

Location:

pjproject/branches/projects/uwp

Files:

• . (modified) (1 prop)
• pjnath/src/pjnath/stun_msg_dump.c (modified) (1 diff)

pjproject/branches/projects/uwp/pjnath/src/pjnath/stun_msg_dump.c

@@ -87 +87 @@
     case PJ_STUN_ATTR_ALTERNATE_SERVER:
         {
+            char addr[PJ_INET6_ADDRSTRLEN];
             const pj_stun_sockaddr_attr *attr;
+            pj_uint16_t af;
 
             attr = (const pj_stun_sockaddr_attr*)ahdr;
-
-            if (attr->sockaddr.addr.sa_family == pj_AF_INET()) {
+            af = attr->sockaddr.addr.sa_family;
+
+            if ((af == pj_AF_INET()) || (af == pj_AF_INET6())) {
                 len = pj_ansi_snprintf(p, end-p,
-                                       ", IPv4 addr=%s:%d\n",
-                                       pj_inet_ntoa(attr->sockaddr.ipv4.sin_addr),
-                                       pj_ntohs(attr->sockaddr.ipv4.sin_port));
-
-            } else if (attr->sockaddr.addr.sa_family == pj_AF_INET6()) {
-                len = pj_ansi_snprintf(p, end-p,
-                                       ", IPv6 addr present\n");
+                                       ", %s addr=%s\n",
+                                       (af == pj_AF_INET())?"IPv4":"IPv6",
+                                       pj_sockaddr_print(&attr->sockaddr,
+                                                        addr, sizeof(addr),3));
             } else {
                 len = pj_ansi_snprintf(p, end-p,