Changeset 5311 for pjproject/trunk/pjsip-apps/src/samples/proxy.h

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-apps/src/samples/proxy.h (modified) (2 diffs)

pjproject/trunk/pjsip-apps/src/samples/proxy.h

@@ -253 +253 @@
      */
     if (pj_gethostip(pj_AF_INET(), &pri_addr)==PJ_SUCCESS) {
-        pj_strdup2(global.pool, &global.name[global.name_cnt].host,
-                   pj_inet_ntoa(pri_addr.ipv4.sin_addr));
+        char addr[PJ_INET_ADDRSTRLEN];
+        pj_inet_ntop(pj_AF_INET(), &pri_addr.ipv4.sin_addr, addr,
+                     sizeof(addr));
+        pj_strdup2(global.pool, &global.name[global.name_cnt].host, addr);
         global.name[global.name_cnt].port = global.port;
         global.name_cnt++;
@@ -260 +262 @@
 
     /* Get the rest of IP interfaces */
-    if (pj_enum_ip_interface(pj_AF_INET(), &addr_cnt, addr_list) == PJ_SUCCESS) {
+    if (pj_enum_ip_interface(pj_AF_INET(), &addr_cnt, addr_list) == PJ_SUCCESS)
+    {
         for (i=0; i<addr_cnt; ++i) {
-
+            char addr[PJ_INET_ADDRSTRLEN];
+            
             if (addr_list[i].ipv4.sin_addr.s_addr == pri_addr.ipv4.sin_addr.s_addr)
                 continue;
 
+            pj_inet_ntop(pj_AF_INET(), &addr_list[i].ipv4.sin_addr, addr,
+                         sizeof(addr));
             pj_strdup2(global.pool, &global.name[global.name_cnt].host,
-                       pj_inet_ntoa(addr_list[i].ipv4.sin_addr));
+                       addr);
             global.name[global.name_cnt].port = global.port;
             global.name_cnt++;