diff options
author | Liong Sauw Ming <ming@teluu.com> | 2016-05-20 04:17:00 +0000 |
---|---|---|
committer | Liong Sauw Ming <ming@teluu.com> | 2016-05-20 04:17:00 +0000 |
commit | 58d6c60c881d265cee8c5ca5dbaad545ff44e995 (patch) | |
tree | b2bb5a9c72e01491d8dd6bce70d3a4c6c1ab4750 /pjsip-apps/src | |
parent | 2e1173b56db0083559b4bc09e00d27d03dbad8bc (diff) |
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
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@5311 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjsip-apps/src')
-rw-r--r-- | pjsip-apps/src/samples/proxy.h | 16 | ||||
-rw-r--r-- | pjsip-apps/src/samples/siprtp.c | 6 | ||||
-rw-r--r-- | pjsip-apps/src/samples/streamutil.c | 7 | ||||
-rw-r--r-- | pjsip-apps/src/samples/vid_streamutil.c | 7 |
4 files changed, 24 insertions, 12 deletions
diff --git a/pjsip-apps/src/samples/proxy.h b/pjsip-apps/src/samples/proxy.h index 93be0a8e..cf963175 100644 --- a/pjsip-apps/src/samples/proxy.h +++ b/pjsip-apps/src/samples/proxy.h @@ -252,21 +252,27 @@ static pj_status_t init_proxy(void) * to be added in Record-Route. */ 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++; } /* 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++; } diff --git a/pjsip-apps/src/samples/siprtp.c b/pjsip-apps/src/samples/siprtp.c index 258d4765..a3b11f42 100644 --- a/pjsip-apps/src/samples/siprtp.c +++ b/pjsip-apps/src/samples/siprtp.c @@ -847,7 +847,7 @@ static int sip_worker_thread(void *arg) /* Init application options */ 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]; enum { OPT_START, @@ -892,8 +892,8 @@ static pj_status_t init_options(int argc, char *argv[]) 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)); } /* Init defaults */ diff --git a/pjsip-apps/src/samples/streamutil.c b/pjsip-apps/src/samples/streamutil.c index ee337eec..315f872a 100644 --- a/pjsip-apps/src/samples/streamutil.c +++ b/pjsip-apps/src/samples/streamutil.c @@ -230,6 +230,7 @@ int main(int argc, char *argv[]) pjmedia_stream *stream = NULL; pjmedia_port *stream_port; char tmp[10]; + char addr[PJ_INET_ADDRSTRLEN]; pj_status_t status; #if defined(PJMEDIA_HAS_SRTP) && (PJMEDIA_HAS_SRTP != 0) @@ -577,13 +578,15 @@ int main(int argc, char *argv[]) local_port); 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 printf("Stream is active, send/recv, local port is %d, " "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)); diff --git a/pjsip-apps/src/samples/vid_streamutil.c b/pjsip-apps/src/samples/vid_streamutil.c index 44c4f899..fd0ac3cc 100644 --- a/pjsip-apps/src/samples/vid_streamutil.c +++ b/pjsip-apps/src/samples/vid_streamutil.c @@ -347,6 +347,7 @@ int main(int argc, char *argv[]) pj_pool_t *pool; pjmedia_vid_stream *stream = NULL; pjmedia_port *enc_port, *dec_port; + char addr[PJ_INET_ADDRSTRLEN]; pj_status_t status; pjmedia_vid_port *capture=NULL, *renderer=NULL; @@ -859,13 +860,15 @@ int main(int argc, char *argv[]) local_port); 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 printf("Stream is active, send/recv, local port is %d, " "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)); if (dir & PJMEDIA_DIR_ENCODING) |