diff options
author | Benny Prijono <bennylp@teluu.com> | 2007-12-03 14:38:25 +0000 |
---|---|---|
committer | Benny Prijono <bennylp@teluu.com> | 2007-12-03 14:38:25 +0000 |
commit | 24e131e2488d5da39ee191413742ed57a3f8394d (patch) | |
tree | 526af62367a4a26370f1162c4006ab0023d6707c /pjsip/src/pjsua-lib | |
parent | b1ab3152928f1c17596bf169ca0692044da105c3 (diff) |
Ticket #420: updated pjmedia SDP and media UDP transport to support IPv6
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@1615 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjsip/src/pjsua-lib')
-rw-r--r-- | pjsip/src/pjsua-lib/pjsua_call.c | 10 | ||||
-rw-r--r-- | pjsip/src/pjsua-lib/pjsua_core.c | 7 | ||||
-rw-r--r-- | pjsip/src/pjsua-lib/pjsua_media.c | 10 |
3 files changed, 14 insertions, 13 deletions
diff --git a/pjsip/src/pjsua-lib/pjsua_call.c b/pjsip/src/pjsua-lib/pjsua_call.c index 86525ca5..7359faa3 100644 --- a/pjsip/src/pjsua-lib/pjsua_call.c +++ b/pjsip/src/pjsua-lib/pjsua_call.c @@ -1824,16 +1824,16 @@ static void dump_media_session(const char *indent, for (i=0; i<info.stream_cnt; ++i) { pjmedia_rtcp_stat stat; + char rem_addr_buf[80]; const char *rem_addr; - int rem_port; const char *dir; char last_update[64]; char packets[32], bytes[32], ipbytes[32], avg_bps[32], avg_ipbps[32]; pj_time_val media_duration, now; pjmedia_session_get_stream_stat(session, i, &stat); - rem_addr = pj_inet_ntoa(info.stream_info[i].rem_addr.sin_addr); - rem_port = pj_ntohs(info.stream_info[i].rem_addr.sin_port); + rem_addr = pj_sockaddr_print(&info.stream_info[i].rem_addr, + rem_addr_buf, sizeof(rem_addr_buf), 3); if (info.stream_info[i].dir == PJMEDIA_DIR_ENCODING) dir = "sendonly"; @@ -1846,13 +1846,13 @@ static void dump_media_session(const char *indent, len = pj_ansi_snprintf(buf, end-p, - "%s #%d %.*s @%dKHz, %s, peer=%s:%d", + "%s #%d %.*s @%dKHz, %s, peer=%s", indent, i, (int)info.stream_info[i].fmt.encoding_name.slen, info.stream_info[i].fmt.encoding_name.ptr, info.stream_info[i].fmt.clock_rate / 1000, dir, - rem_addr, rem_port); + rem_addr); if (len < 1 || len > end-p) { *p = '\0'; return; diff --git a/pjsip/src/pjsua-lib/pjsua_core.c b/pjsip/src/pjsua-lib/pjsua_core.c index 39a71f8e..ff9b36fa 100644 --- a/pjsip/src/pjsua-lib/pjsua_core.c +++ b/pjsip/src/pjsua-lib/pjsua_core.c @@ -2014,16 +2014,17 @@ PJ_DEF(void) pjsua_dump(pj_bool_t detail) for (i=0; i<pjsua_var.ua_cfg.max_calls; ++i) { pjsua_call *call = &pjsua_var.calls[i]; pjmedia_sock_info skinfo; + char addr_buf[80]; /* MSVC complains about skinfo not being initialized */ pj_bzero(&skinfo, sizeof(skinfo)); pjmedia_transport_get_info(call->med_tp, &skinfo); - PJ_LOG(3,(THIS_FILE, " %s: %s:%d", + PJ_LOG(3,(THIS_FILE, " %s: %s", (pjsua_var.media_cfg.enable_ice ? "ICE" : "UDP"), - pj_inet_ntoa(skinfo.rtp_addr_name.sin_addr), - (int)pj_ntohs(skinfo.rtp_addr_name.sin_port))); + pj_sockaddr_print(&skinfo.rtp_addr_name, addr_buf, + sizeof(addr_buf), 3))); } pjsip_tsx_layer_dump(detail); diff --git a/pjsip/src/pjsua-lib/pjsua_media.c b/pjsip/src/pjsua-lib/pjsua_media.c index 6738284a..da6e0cb4 100644 --- a/pjsip/src/pjsua-lib/pjsua_media.c +++ b/pjsip/src/pjsua-lib/pjsua_media.c @@ -220,6 +220,7 @@ static pj_status_t create_rtp_rtcp_sock(const pjsua_transport_config *cfg, pj_sockaddr_in bound_addr; pj_sockaddr_in mapped_addr[2]; pj_status_t status = PJ_SUCCESS; + char addr_buf[80]; pj_sock_t sock[2]; /* Make sure STUN server resolution has completed */ @@ -229,7 +230,6 @@ static pj_status_t create_rtp_rtcp_sock(const pjsua_transport_config *cfg, return status; } - if (next_rtp_port == 0) next_rtp_port = (pj_uint16_t)cfg->port; @@ -378,11 +378,11 @@ static pj_status_t create_rtp_rtcp_sock(const pjsua_transport_config *cfg, &mapped_addr[1], sizeof(pj_sockaddr_in)); PJ_LOG(4,(THIS_FILE, "RTP socket reachable at %s:%d", - pj_inet_ntoa(skinfo->rtp_addr_name.sin_addr), - pj_ntohs(skinfo->rtp_addr_name.sin_port))); + pj_sockaddr_print(&skinfo->rtp_addr_name, addr_buf, + sizeof(addr_buf), 3))); PJ_LOG(4,(THIS_FILE, "RTCP socket reachable at %s:%d", - pj_inet_ntoa(skinfo->rtcp_addr_name.sin_addr), - pj_ntohs(skinfo->rtcp_addr_name.sin_port))); + pj_sockaddr_print(&skinfo->rtcp_addr_name, addr_buf, + sizeof(addr_buf), 3))); next_rtp_port += 2; return PJ_SUCCESS; |