Changeset 5311 for pjproject/trunk/pjlib-util/src/pjlib-util/srv_resolver.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/pjlib-util/src/pjlib-util/srv_resolver.c (modified) (5 diffs)

pjproject/trunk/pjlib-util/src/pjlib-util/srv_resolver.c

@@ -369 +369 @@
         }
 
-        if (pj_inet_aton(&query_job->srv[i].target_name, &addr) != 0) {
+        if (pj_inet_pton(pj_AF_INET(), &query_job->srv[i].target_name,
+                         &addr) == PJ_SUCCESS)
+        {
             query_job->srv[i].addr[query_job->srv[i].addr_cnt++] = addr;
             ++query_job->host_resolved;
@@ -386 +388 @@
 
     for (i=0; i<query_job->srv_cnt; ++i) {
-        const char *addr;
-
-        if (query_job->srv[i].addr_cnt != 0)
-            addr = pj_inet_ntoa(query_job->srv[i].addr[0]);
-        else
-            addr = "-";
+        char addr[PJ_INET_ADDRSTRLEN];
+
+        if (query_job->srv[i].addr_cnt != 0) {
+            pj_inet_ntop(pj_AF_INET(), &query_job->srv[i].addr[0],
+                         addr, sizeof(addr));
+        } else
+            pj_ansi_strcpy(addr, "-");
 
         PJ_LOG(5,(query_job->objname, 
@@ -548 +551 @@
         /* Check that we really have answer */
         if (status==PJ_SUCCESS && pkt->hdr.anscount != 0) {
+            char addr[PJ_INET_ADDRSTRLEN];
             pj_dns_a_record rec;
 
@@ -574 +578 @@
                           (int)srv->target_name.slen, 
                           srv->target_name.ptr,
-                          pj_inet_ntoa(rec.addr[0])));
+                          pj_inet_ntop2(pj_AF_INET(), &rec.addr[0],
+                                        addr, sizeof(addr))));
             }
 
@@ -586 +591 @@
                           (int)srv->target_name.slen, 
                           srv->target_name.ptr,
-                          pj_inet_ntoa(rec.addr[i])));
+                          pj_inet_ntop2(pj_AF_INET(), &rec.addr[i],
+                                        addr, sizeof(addr))));
             }