diff options
author | Benny Prijono <bennylp@teluu.com> | 2007-02-21 00:40:05 +0000 |
---|---|---|
committer | Benny Prijono <bennylp@teluu.com> | 2007-02-21 00:40:05 +0000 |
commit | 1a5b8c19989c4ab4e1eee7f712913f8f3e459e71 (patch) | |
tree | 94d7851e91849c6b60420150c8944db9bcf4b298 /pjsip | |
parent | b69a9ab56a1df4a41bfa9132d5aa5263fa80b38b (diff) |
Merged the ICE branch into the trunk
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@992 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjsip')
-rw-r--r-- | pjsip/src/pjsua-lib/pjsua_core.c | 2 | ||||
-rw-r--r-- | pjsip/src/pjsua-lib/pjsua_media.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pjsip/src/pjsua-lib/pjsua_core.c b/pjsip/src/pjsua-lib/pjsua_core.c index 8a681427..b6fb19e8 100644 --- a/pjsip/src/pjsua-lib/pjsua_core.c +++ b/pjsip/src/pjsua-lib/pjsua_core.c @@ -870,7 +870,7 @@ static pj_status_t create_sip_udp_sock(pj_in_addr bound_addr, /* * STUN is specified, resolve the address with STUN. */ - status = pj_stun_get_mapped_addr(&pjsua_var.cp.factory, 1, &sock, + status = pjstun_get_mapped_addr(&pjsua_var.cp.factory, 1, &sock, &stun.stun_srv1, stun.stun_port1, &stun.stun_srv2, diff --git a/pjsip/src/pjsua-lib/pjsua_media.c b/pjsip/src/pjsua-lib/pjsua_media.c index 8ad34c38..3dc27258 100644 --- a/pjsip/src/pjsua-lib/pjsua_media.c +++ b/pjsip/src/pjsua-lib/pjsua_media.c @@ -272,7 +272,7 @@ static pj_status_t create_rtp_rtcp_sock(const pjsua_transport_config *cfg, * and make sure that the mapped RTCP port is adjacent with the RTP. */ if (cfg->stun_config.stun_srv1.slen) { - status=pj_stun_get_mapped_addr(&pjsua_var.cp.factory, 2, sock, + status=pjstun_get_mapped_addr(&pjsua_var.cp.factory, 2, sock, &cfg->stun_config.stun_srv1, cfg->stun_config.stun_port1, &cfg->stun_config.stun_srv2, |