Changeset 5311

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

Location:

pjproject/trunk

Files:

• pjlib-util/src/pjlib-util/cli_telnet.c (modified) (1 diff)
• pjlib-util/src/pjlib-util/dns_dump.c (modified) (2 diffs)
• pjlib-util/src/pjlib-util/pcap.c (modified) (3 diffs)
• pjlib-util/src/pjlib-util/resolver.c (modified) (10 diffs)
• pjlib-util/src/pjlib-util/srv_resolver.c (modified) (5 diffs)
• pjlib-util/src/pjlib-util/stun_simple_client.c (modified) (1 diff)
• pjlib/src/pjlib-test/echo_clt.c (modified) (2 diffs)
• pjmedia/src/pjmedia/endpoint.c (modified) (2 diffs)
• pjmedia/src/pjmedia/sdp.c (modified) (2 diffs)
• pjnath/src/pjnath/nat_detect.c (modified) (4 diffs)
• pjnath/src/pjnath/stun_msg_dump.c (modified) (2 diffs)
• pjsip-apps/src/samples/proxy.h (modified) (2 diffs)
• pjsip-apps/src/samples/siprtp.c (modified) (2 diffs)
• pjsip-apps/src/samples/streamutil.c (modified) (3 diffs)
• pjsip-apps/src/samples/vid_streamutil.c (modified) (3 diffs)
• pjsip/src/pjsip/sip_resolve.c (modified) (2 diffs)
• pjsip/src/pjsip/sip_transport_udp.c (modified) (3 diffs)
• pjsip/src/pjsua-lib/pjsua_acc.c (modified) (1 diff)
• pjsip/src/pjsua-lib/pjsua_core.c (modified) (1 diff)
• pjsip/src/pjsua-lib/pjsua_media.c (modified) (2 diffs)
• pjsip/src/test/transport_tcp_test.c (modified) (2 diffs)
• pjsip/src/test/transport_test.c (modified) (1 diff)

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

@@ -1929 +1929 @@
         return status;
 
-    pj_strcpy2(&info->ip_address, pj_inet_ntoa(hostip.ipv4.sin_addr));
+    pj_sockaddr_print(&hostip, info->buf_, sizeof(info->buf_), 0);
+    pj_strset2(&info->ip_address, info->buf_);
 
     info->port = tfe->cfg.port;

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

@@ -91 +91 @@
     const pj_str_t *name = &rr->name;
     char ttl_words[32];
+    char addr[PJ_INET6_ADDRSTRLEN];
 
     if (name->slen == 0)
@@ -118 +119 @@
     } else if (rr->type == PJ_DNS_TYPE_A) {
         PJ_LOG(3,(THIS_FILE, "    IP address: %s",
-                  pj_inet_ntoa(rr->rdata.a.ip_addr)));
+                  pj_inet_ntop2(pj_AF_INET(), &rr->rdata.a.ip_addr,
+                                addr, sizeof(addr))));
     } else if (rr->type == PJ_DNS_TYPE_AAAA) {
-        char addr[PJ_INET6_ADDRSTRLEN];
         PJ_LOG(3,(THIS_FILE, "    IPv6 address: %s",
                   pj_inet_ntop2(pj_AF_INET6(), &rr->rdata.aaaa.ip_addr,

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

@@ -230 +230 @@
         pj_ssize_t sz;
         pj_size_t sz_read = 0;
+        char addr[PJ_INET_ADDRSTRLEN];
         pj_status_t status;
 
         TRACE_((file->obj_name, "Reading packet.."));
+        pj_bzero(&addr, sizeof(addr));
 
         /* Read PCAP packet header */
@@ -283 +285 @@
         if (file->filter.ip_src && tmp.ip.ip_src != file->filter.ip_src) {
             TRACE_((file->obj_name, "IP source %s mismatch, skipping", 
-                    pj_inet_ntoa(*(pj_in_addr*)&tmp.ip.ip_src)));
+                    pj_inet_ntop2(pj_AF_INET(), (pj_in_addr*)&tmp.ip.ip_src,
+                                  addr, sizeof(addr))));
             SKIP_PKT();
             continue;
@@ -291 +294 @@
         if (file->filter.ip_dst && tmp.ip.ip_dst != file->filter.ip_dst) {
             TRACE_((file->obj_name, "IP detination %s mismatch, skipping", 
-                    pj_inet_ntoa(*(pj_in_addr*)&tmp.ip.ip_dst)));
+                    pj_inet_ntop2(pj_AF_INET(), (pj_in_addr*)&tmp.ip.ip_dst,
+                                  addr, sizeof(addr))));
             SKIP_PKT();
             continue;

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

@@ -639 +639 @@
     /* Send the packet to name servers */
     for (i=0; i<server_cnt; ++i) {
+        char addr[PJ_INET6_ADDRSTRLEN];
         pj_ssize_t sent  = (pj_ssize_t) pkt_size;
         struct nameserver *ns = &resolver->ns[servers[i]];
@@ -652 +653 @@
                   (q->transmit_cnt==0? "Transmitting":"Re-transmitting"),
                   (int)pkt_size, servers[i],
-                  pj_inet_ntoa(ns->addr.sin_addr), 
+                  pj_inet_ntop2(pj_AF_INET(), &ns->addr.sin_addr, addr,
+                                sizeof(addr)),
                   (int)pj_ntohs(ns->addr.sin_port),
                   pj_dns_get_type_name(q->key.qtype), 
@@ -1035 +1037 @@
     struct nameserver *ns = &resolver->ns[index];
     enum ns_state old_state = ns->state;
+    char addr[PJ_INET_ADDRSTRLEN];
 
     ns->state = state;
@@ -1048 +1051 @@
 
     PJ_LOG(5, (resolver->name.ptr, "Nameserver %s:%d state changed %s --> %s",
-               pj_inet_ntoa(ns->addr.sin_addr),
+               pj_inet_ntop2(pj_AF_INET(), &ns->addr.sin_addr, addr,
+                             sizeof(addr)),
                (int)pj_ntohs(ns->addr.sin_port),
                state_names[old_state], state_names[state]));
@@ -1391 +1395 @@
     pj_dns_parsed_packet *dns_pkt;
     pj_dns_async_query *q;
+    char addr[PJ_INET_ADDRSTRLEN];
     pj_status_t status;
     PJ_USE_EXCEPTION;
@@ -1407 +1412 @@
         PJ_LOG(4,(resolver->name.ptr, 
                   "DNS resolver read error from %s:%d: %s", 
-                  pj_inet_ntoa(resolver->udp_src_addr.sin_addr),
+                  pj_inet_ntop2(pj_AF_INET(), &resolver->udp_src_addr.sin_addr,
+                                addr, sizeof(addr)), 
                   pj_ntohs(resolver->udp_src_addr.sin_port),
                   errmsg));
@@ -1417 +1423 @@
               "Received %d bytes DNS response from %s:%d",
               (int)bytes_read, 
-              pj_inet_ntoa(resolver->udp_src_addr.sin_addr),
+              pj_inet_ntop2(pj_AF_INET(), &resolver->udp_src_addr.sin_addr,
+                            addr, sizeof(addr)), 
               pj_ntohs(resolver->udp_src_addr.sin_port)));
 
@@ -1451 +1458 @@
         PJ_LOG(3,(resolver->name.ptr, 
                   "Error parsing DNS response from %s:%d: %s", 
-                  pj_inet_ntoa(resolver->udp_src_addr.sin_addr), 
+                  pj_inet_ntop2(pj_AF_INET(), &resolver->udp_src_addr.sin_addr,
+                                addr, sizeof(addr)),
                   pj_ntohs(resolver->udp_src_addr.sin_port), 
                   errmsg));
@@ -1464 +1472 @@
         PJ_LOG(5,(resolver->name.ptr, 
                   "DNS response from %s:%d id=%d discarded",
-                  pj_inet_ntoa(resolver->udp_src_addr.sin_addr), 
+                  pj_inet_ntop2(pj_AF_INET(), &resolver->udp_src_addr.sin_addr,
+                                addr, sizeof(addr)), 
                   pj_ntohs(resolver->udp_src_addr.sin_port),
                   (unsigned)dns_pkt->hdr.id));
@@ -1634 +1643 @@
     PJ_LOG(3,(resolver->name.ptr, "  Name servers:"));
     for (i=0; i<resolver->ns_count; ++i) {
+        char addr[PJ_INET_ADDRSTRLEN];
         struct nameserver *ns = &resolver->ns[i];
 
         PJ_LOG(3,(resolver->name.ptr,
                   "   NS %d: %s:%d (state=%s until %ds, rtt=%d ms)",
-                  i, pj_inet_ntoa(ns->addr.sin_addr),
+                  i, pj_inet_ntop2(pj_AF_INET(), &ns->addr.sin_addr, addr,
+                                   sizeof(addr)),
                   pj_ntohs(ns->addr.sin_port),
                   state_names[ns->state],

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))));
             }
 

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

@@ -34 +34 @@
 
 #define THIS_FILE       "stun_client.c"
-#define LOG_ADDR(addr)  pj_inet_ntoa(addr.sin_addr), pj_ntohs(addr.sin_port)
 
 #define TRACE_(x)       PJ_LOG(6,x)

pjproject/trunk/pjlib/src/pjlib-test/echo_clt.c

@@ -58 +58 @@
     char send_buf[BUF_SIZE];
     char recv_buf[BUF_SIZE];
+    char addr[PJ_INET_ADDRSTRLEN];
     pj_sockaddr_in addr;
     pj_str_t s;
@@ -88 +89 @@
 
     PJ_LOG(3,("", "...socket connected to %s:%d", 
-                  pj_inet_ntoa(addr.sin_addr),
+                  pj_inet_ntop2(pj_AF_INET(), &addr.sin_addr,
+                                addr, sizeof(addr)),
                   pj_ntohs(addr.sin_port)));
 

pjproject/trunk/pjmedia/src/pjmedia/endpoint.c

@@ -765 +765 @@
                                                    pjmedia_sdp_session **p_sdp)
 {
+    char tmp_addr[PJ_INET6_ADDRSTRLEN];
     pj_time_val tv;
     pjmedia_sdp_session *sdp;
@@ -780 +781 @@
     if (origin->addr.sa_family == pj_AF_INET()) {
         sdp->origin.addr_type = STR_IP4;
-        pj_strdup2(pool, &sdp->origin.addr,
-                   pj_inet_ntoa(origin->ipv4.sin_addr));
     } else if (origin->addr.sa_family == pj_AF_INET6()) {
-        char tmp_addr[PJ_INET6_ADDRSTRLEN];
-
         sdp->origin.addr_type = STR_IP6;
-        pj_strdup2(pool, &sdp->origin.addr,
-                   pj_sockaddr_print(origin, tmp_addr, sizeof(tmp_addr), 0));
-
     } else {
         pj_assert(!"Invalid address family");
         return PJ_EAFNOTSUP;
     }
+
+    pj_strdup2(pool, &sdp->origin.addr,
+               pj_sockaddr_print(origin, tmp_addr, sizeof(tmp_addr), 0));
 
     if (sess_name)

pjproject/trunk/pjmedia/src/pjmedia/sdp.c

@@ -432 +432 @@
         ATTR_LEN = PJ_INET6_ADDRSTRLEN+16
     };
+    char tmp_addr[PJ_INET6_ADDRSTRLEN];
     pjmedia_sdp_attr *attr;
 
@@ -441 +442 @@
             pj_ansi_snprintf(attr->value.ptr, ATTR_LEN,
                             "%u IN IP4 %s",
-                            pj_ntohs(a->ipv4.sin_port),
-                            pj_inet_ntoa(a->ipv4.sin_addr));
+                            pj_sockaddr_get_port(a),
+                            pj_sockaddr_print(a, tmp_addr, 
+                                              sizeof(tmp_addr), 0));
     } else if (a->addr.sa_family == pj_AF_INET6()) {
-        char tmp_addr[PJ_INET6_ADDRSTRLEN];
         attr->value.slen = 
             pj_ansi_snprintf(attr->value.ptr, ATTR_LEN,

pjproject/trunk/pjnath/src/pjnath/nat_detect.c

@@ -215 +215 @@
     pj_ioqueue_callback ioqueue_cb;
     int addr_len;
+    char addr[PJ_INET_ADDRSTRLEN];
     pj_status_t status;
 
@@ -287 +288 @@
 
     PJ_LOG(5,(sess->pool->obj_name, "Local address is %s:%d",
-              pj_inet_ntoa(sess->local_addr.sin_addr), 
+              pj_inet_ntop2(pj_AF_INET(), &sess->local_addr.sin_addr,
+                            addr, sizeof(addr)), 
               pj_ntohs(sess->local_addr.sin_port)));
 
     PJ_LOG(5,(sess->pool->obj_name, "Server set to %s:%d",
-              pj_inet_ntoa(server->sin_addr), 
+              pj_inet_ntop2(pj_AF_INET(), &server->sin_addr, addr,
+                            sizeof(addr)), 
               pj_ntohs(server->sin_port)));
 
@@ -815 +818 @@
 {
     pj_uint32_t magic, tsx_id[3];
+    char addr[PJ_INET_ADDRSTRLEN];
     pj_status_t status;
 
@@ -853 +857 @@
               "Performing %s to %s:%d", 
               test_names[test_id],
-              pj_inet_ntoa(sess->cur_server->sin_addr),
+              pj_inet_ntop2(pj_AF_INET(), &sess->cur_server->sin_addr,
+                            addr, sizeof(addr)),
               pj_ntohs(sess->cur_server->sin_port)));
 

pjproject/trunk/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;
 
@@ -94 +95 @@
                 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));
+                                       pj_sockaddr_print(&attr->sockaddr,
+                                                         addr, sizeof(addr),0),
+                                       pj_sockaddr_get_port(&attr->sockaddr));
 
             } else if (attr->sockaddr.addr.sa_family == pj_AF_INET6()) {

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++;

pjproject/trunk/pjsip-apps/src/samples/siprtp.c

@@ -848 +848 @@
 static pj_status_t init_options(int argc, char *argv[])
 {
-    static char ip_addr[32];
+    static char ip_addr[PJ_INET_ADDRSTRLEN];
     static char local_uri[64];
 
@@ -893 +893 @@
         hostname = pj_gethostname();
         pj_sockaddr_in_init(&tmp_addr, hostname, 0);
-        addr = pj_inet_ntoa(tmp_addr.sin_addr);
-        pj_ansi_strcpy(ip_addr, addr);
+        pj_inet_ntop(pj_AF_INET(), &tmp_addr.sin_addr, ip_addr,
+                     sizeof(ip_addr));
     }
 

pjproject/trunk/pjsip-apps/src/samples/streamutil.c

@@ -231 +231 @@
     pjmedia_port *stream_port;
     char tmp[10];
+    char addr[PJ_INET_ADDRSTRLEN];
     pj_status_t status; 
 
@@ -578 +579 @@
     else if (dir == PJMEDIA_DIR_ENCODING)
         printf("Stream is active, dir is send-only, sending to %s:%d\n",
-               pj_inet_ntoa(remote_addr.sin_addr),
+               pj_inet_ntop2(pj_AF_INET(), &remote_addr.sin_addr, addr,
+                             sizeof(addr)),
                pj_ntohs(remote_addr.sin_port));
     else
@@ -584 +586 @@
                "sending to %s:%d\n",
                local_port,
-               pj_inet_ntoa(remote_addr.sin_addr),
+               pj_inet_ntop2(pj_AF_INET(), &remote_addr.sin_addr, addr,
+                             sizeof(addr)),
                pj_ntohs(remote_addr.sin_port));
 

pjproject/trunk/pjsip-apps/src/samples/vid_streamutil.c

@@ -348 +348 @@
     pjmedia_vid_stream *stream = NULL;
     pjmedia_port *enc_port, *dec_port;
+    char addr[PJ_INET_ADDRSTRLEN];
     pj_status_t status; 
 
@@ -860 +861 @@
     else if (dir == PJMEDIA_DIR_ENCODING)
         printf("Stream is active, dir is send-only, sending to %s:%d\n",
-               pj_inet_ntoa(remote_addr.sin_addr),
+               pj_inet_ntop2(pj_AF_INET(), &remote_addr.sin_addr, addr,
+                             sizeof(addr)),
                pj_ntohs(remote_addr.sin_port));
     else
@@ -866 +868 @@
                "sending to %s:%d\n",
                local_port,
-               pj_inet_ntoa(remote_addr.sin_addr),
+               pj_inet_ntop2(pj_AF_INET(), &remote_addr.sin_addr, addr,
+                             sizeof(addr)),
                pj_ntohs(remote_addr.sin_port));
 

pjproject/trunk/pjsip/src/pjsip/sip_resolve.c

@@ -169 +169 @@
     pj_in6_addr dummy6;
 
-    /* First check with inet_aton() */
-    if (pj_inet_aton(host, &dummy) > 0)
+    /* First check if this is an IPv4 address */
+    if (pj_inet_pton(pj_AF_INET(), host, &dummy) == PJ_SUCCESS)
         return 4;
 
@@ -261 +261 @@
                 pj_sockaddr_init(pj_AF_INET(), &svr_addr.entry[0].addr, 
                                  NULL, 0);
-                pj_inet_aton(&target->addr.host,
+                pj_inet_pton(pj_AF_INET(), &target->addr.host,
                              &svr_addr.entry[0].addr.ipv4.sin_addr);
             } else {

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);
     }
 

pjproject/trunk/pjsip/src/pjsua-lib/pjsua_acc.c

@@ -3032 +3032 @@
     pj_in6_addr dummy6;
 
-    /* First check with inet_aton() */
-    if (pj_inet_aton(host, &dummy) > 0)
+    /* First check if this is an IPv4 address */
+    if (pj_inet_pton(pj_AF_INET(), host, &dummy) == PJ_SUCCESS)
         return 4;
 

pjproject/trunk/pjsip/src/pjsua-lib/pjsua_core.c

@@ -2057 +2057 @@
 
     if (pjsua_var.stun_srv.addr.sa_family != 0) {
-        pj_ansi_strcpy(stun_ip_addr,pj_inet_ntoa(pjsua_var.stun_srv.ipv4.sin_addr));
+        pj_sockaddr_print(&pjsua_var.stun_srv,
+                          stun_ip_addr, sizeof(stun_ip_addr), 0);
         stun_srv = pj_str(stun_ip_addr);
     } else {

pjproject/trunk/pjsip/src/pjsua-lib/pjsua_media.c

@@ -360 +360 @@
             pjstun_setting stun_opt;
 
-            pj_ansi_strcpy(ip_addr,
-                           pj_inet_ntoa(pjsua_var.stun_srv.ipv4.sin_addr));
+            pj_sockaddr_print(&pjsua_var.stun_srv, ip_addr,sizeof(ip_addr),0);
             stun_srv = pj_str(ip_addr);
 
@@ -427 +426 @@
                 if (status == PJ_SUCCESS) {
                     if (pjsua_var.stun_srv.addr.sa_family != 0) {
-                        pj_ansi_strcpy(ip_addr,
-                            pj_inet_ntoa(pjsua_var.stun_srv.ipv4.sin_addr));
+                        pj_sockaddr_print(&pjsua_var.stun_srv,
+                                          ip_addr, sizeof(ip_addr), 0);
                         stun_srv = pj_str(ip_addr);
                     } else {

pjproject/trunk/pjsip/src/test/transport_tcp_test.c

@@ -38 +38 @@
     pj_status_t status;
     char url[PJSIP_MAX_URL_SIZE];
+    char addr[PJ_INET_ADDRSTRLEN];
     int rtt[SEND_RECV_LOOP], min_rtt;
     int i, pkt_lost;
@@ -58 +59 @@
 
     pj_ansi_sprintf(url, "sip:alice@%s:%d;transport=tcp",
-                    pj_inet_ntoa(rem_addr.sin_addr),
+                    pj_inet_ntop2(pj_AF_INET(), &rem_addr.sin_addr, addr,
+                                  sizeof(addr)),
                     pj_ntohs(rem_addr.sin_port));
 

pjproject/trunk/pjsip/src/test/transport_test.c

@@ -38 +38 @@
         struct pj_in_addr addr;
 
-        /* Note: inet_aton() returns non-zero if addr is valid! */
-        if (pj_inet_aton(&tp->local_name.host, &addr) != 0) {
+        if (pj_inet_pton(pj_AF_INET(), &tp->local_name.host,
+                         &addr) == PJ_SUCCESS)
+        {
             if (addr.s_addr==PJ_INADDR_ANY || addr.s_addr==PJ_INADDR_NONE) {
                 PJ_LOG(3,(THIS_FILE, "   Error: invalid address name"));