Changeset 5311 for pjproject/trunk/pjsip/src/pjsip/sip_transport_udp.c

Timestamp:

May 20, 2016 4:17:00 AM (8 years ago)

Author:

ming

Message:

Re #1922: Replace IPv4 specific APIs as per Apple's recommendations

​https://developer.apple.com/library/ios/documentation/NetworkingInternetWeb/Conceptual/NetworkingOverview/UnderstandingandPreparingfortheIPv6Transition/UnderstandingandPreparingfortheIPv6Transition.html#//apple_ref/doc/uid/TP40010220-CH213-SW27

File:

• pjproject/trunk/pjsip/src/pjsip/sip_transport_udp.c (modified) (3 diffs)

pjproject/trunk/pjsip/src/pjsip/sip_transport_udp.c

@@ -161 +161 @@
             rdata->pkt_info.zero = 0;
             pj_gettimeofday(&rdata->pkt_info.timestamp);
-            if (src_addr->addr.sa_family == pj_AF_INET()) {
-                pj_ansi_strcpy(rdata->pkt_info.src_name,
-                               pj_inet_ntoa(src_addr->ipv4.sin_addr));
-                rdata->pkt_info.src_port = pj_ntohs(src_addr->ipv4.sin_port);
-            } else {
-                pj_inet_ntop(pj_AF_INET6(), 
-                             pj_sockaddr_get_addr(&rdata->pkt_info.src_addr),
-                             rdata->pkt_info.src_name,
-                             sizeof(rdata->pkt_info.src_name));
-                rdata->pkt_info.src_port = pj_ntohs(src_addr->ipv6.sin6_port);
-            }
+            pj_sockaddr_print(src_addr, rdata->pkt_info.src_name,
+                              sizeof(rdata->pkt_info.src_name), 0);
+            rdata->pkt_info.src_port = pj_sockaddr_get_port(src_addr);
 
             size_eaten = 
@@ -518 +510 @@
                 return status;
 
-            pj_strcpy2(&bound_name->host, pj_inet_ntoa(hostip.ipv4.sin_addr));
+            status = pj_inet_ntop(pj_AF_INET(), &hostip.ipv4.sin_addr,
+                                  hostbuf, hostbufsz);
         } else {
             /* Otherwise use bound address. */
-            pj_strcpy2(&bound_name->host, 
-                       pj_inet_ntoa(tmp_addr.ipv4.sin_addr));
-            status = PJ_SUCCESS;
+            status = pj_inet_ntop(pj_AF_INET(), &tmp_addr.ipv4.sin_addr,
+                                  hostbuf, hostbufsz);
         }
 
@@ -543 +535 @@
                               pj_sockaddr_get_addr(&tmp_addr),
                               hostbuf, hostbufsz);
-        if (status == PJ_SUCCESS) {
-            bound_name->host.slen = pj_ansi_strlen(hostbuf);
-        }
+    }
+    if (status == PJ_SUCCESS) {
+        bound_name->host.slen = pj_ansi_strlen(hostbuf);
     }