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 /pjmedia | |
| 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 'pjmedia')
| -rw-r--r-- | pjmedia/src/pjmedia/endpoint.c | 11 | ||||
| -rw-r--r-- | pjmedia/src/pjmedia/sdp.c | 7 |
2 files changed, 8 insertions, 10 deletions
diff --git a/pjmedia/src/pjmedia/endpoint.c b/pjmedia/src/pjmedia/endpoint.c index 82d7d568..f052b927 100644 --- a/pjmedia/src/pjmedia/endpoint.c +++ b/pjmedia/src/pjmedia/endpoint.c @@ -764,6 +764,7 @@ PJ_DEF(pj_status_t) pjmedia_endpt_create_base_sdp( pjmedia_endpt *endpt, const pj_sockaddr *origin, pjmedia_sdp_session **p_sdp) { + char tmp_addr[PJ_INET6_ADDRSTRLEN]; pj_time_val tv; pjmedia_sdp_session *sdp; @@ -779,20 +780,16 @@ PJ_DEF(pj_status_t) pjmedia_endpt_create_base_sdp( pjmedia_endpt *endpt, 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) pj_strdup(pool, &sdp->name, sess_name); else diff --git a/pjmedia/src/pjmedia/sdp.c b/pjmedia/src/pjmedia/sdp.c index 8bf7d805..a9afe19f 100644 --- a/pjmedia/src/pjmedia/sdp.c +++ b/pjmedia/src/pjmedia/sdp.c @@ -431,6 +431,7 @@ PJ_DEF(pjmedia_sdp_attr*) pjmedia_sdp_attr_create_rtcp(pj_pool_t *pool, enum { ATTR_LEN = PJ_INET6_ADDRSTRLEN+16 }; + char tmp_addr[PJ_INET6_ADDRSTRLEN]; pjmedia_sdp_attr *attr; attr = PJ_POOL_ALLOC_T(pool, pjmedia_sdp_attr); @@ -440,10 +441,10 @@ PJ_DEF(pjmedia_sdp_attr*) pjmedia_sdp_attr_create_rtcp(pj_pool_t *pool, attr->value.slen = 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, "%u IN IP6 %s", |