diff options
Diffstat (limited to 'pjsip/src')
| -rw-r--r-- | pjsip/src/pjsua-lib/pjsua_core.c | 2 | ||||
| -rw-r--r-- | pjsip/src/pjsua-lib/pjsua_media.c | 28 |
2 files changed, 27 insertions, 3 deletions
diff --git a/pjsip/src/pjsua-lib/pjsua_core.c b/pjsip/src/pjsua-lib/pjsua_core.c index 41254c4c..55e7ef10 100644 --- a/pjsip/src/pjsua-lib/pjsua_core.c +++ b/pjsip/src/pjsua-lib/pjsua_core.c @@ -2052,7 +2052,7 @@ static pj_status_t create_sip_udp_sock(int af, pj_ntohs(pjsua_var.stun_srv.ipv4.sin_port); status = pjstun_get_mapped_addr2(&pjsua_var.cp.factory, &stun_opt, 1, &sock, &p_pub_addr->ipv4); - if (status != PJ_SUCCESS) { + if (status != PJ_SUCCESS && !pjsua_var.ua_cfg.stun_ignore_failure) { pjsua_perror(THIS_FILE, "Error contacting STUN server", status); pj_sock_close(sock); return status; diff --git a/pjsip/src/pjsua-lib/pjsua_media.c b/pjsip/src/pjsua-lib/pjsua_media.c index 5f948973..37f81572 100644 --- a/pjsip/src/pjsua-lib/pjsua_media.c +++ b/pjsip/src/pjsua-lib/pjsua_media.c @@ -390,8 +390,32 @@ static pj_status_t create_rtp_rtcp_sock(pjsua_call_media *call_med, else #endif if (status != PJ_SUCCESS) { - pjsua_perror(THIS_FILE, "STUN resolve error", status); - goto on_error; + if (!pjsua_var.ua_cfg.stun_ignore_failure) { + pjsua_perror(THIS_FILE, "STUN resolve error", status); + goto on_error; + } + + PJ_LOG(4,(THIS_FILE, "Ignoring STUN resolve error %d", + status)); + + if (!pj_sockaddr_has_addr(&bound_addr)) { + pj_sockaddr addr; + + /* Get local IP address. */ + status = pj_gethostip(af, &addr); + if (status != PJ_SUCCESS) + goto on_error; + + pj_sockaddr_copy_addr(&bound_addr, &addr); + } + + for (i=0; i<2; ++i) { + pj_sockaddr_init(af, &mapped_addr[i], NULL, 0); + pj_sockaddr_copy_addr(&mapped_addr[i], &bound_addr); + pj_sockaddr_set_port(&mapped_addr[i], + (pj_uint16_t)(acc->next_rtp_port+i)); + } + break; } pj_sockaddr_cp(&mapped_addr[0], &resolved_addr[0]); |