diff options
author | zuul <zuul@gerrit.asterisk.org> | 2017-02-28 13:32:22 -0600 |
---|---|---|
committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2017-02-28 13:32:22 -0600 |
commit | 59a00786e87b675ab6320915b297e98ce52754b5 (patch) | |
tree | 931a4acadf68b57588ce4364dc121e169c5cf52c | |
parent | bf3cb76452d968a73414748c62c96645c0115abb (diff) | |
parent | d49af061bc689c1b9d9539c05619fa02380c060d (diff) |
Merge "config: Improve documentation and behavior of outbound_proxy option." into 13
-rw-r--r-- | configs/samples/pjsip.conf.sample | 10 | ||||
-rw-r--r-- | res/res_pjsip.c | 2 | ||||
-rw-r--r-- | res/res_pjsip_outbound_publish.c | 2 | ||||
-rw-r--r-- | res/res_pjsip_outbound_registration.c | 13 |
4 files changed, 19 insertions, 8 deletions
diff --git a/configs/samples/pjsip.conf.sample b/configs/samples/pjsip.conf.sample index 23c6eef53..f66161329 100644 --- a/configs/samples/pjsip.conf.sample +++ b/configs/samples/pjsip.conf.sample @@ -640,7 +640,7 @@ ;moh_suggest=default ; Default Music On Hold class (default: "default") ;outbound_auth= ; Authentication object used for outbound requests (default: ; "") -;outbound_proxy= ; Proxy through which to send requests a full SIP URI +;outbound_proxy= ; Proxy through which to send requests, a full SIP URI ; must be provided (default: "") ;rewrite_contact=no ; Allow Contact header to be rewritten with the source ; IP address port (default: "no") @@ -865,8 +865,8 @@ ;qualify_timeout=3.0 ; Qualify timeout in fractional seconds (default: "3.0") ;authenticate_qualify=no ; Authenticates a qualify request if needed ; (default: "no") -;outbound_proxy= ; Outbound proxy used when sending OPTIONS request - ; (default: "") +;outbound_proxy= ; Proxy through which to send OPTIONS requests, a full SIP URI + ; must be provided (default: "") ;==========================SYSTEM SECTION OPTIONS========================= @@ -1032,8 +1032,8 @@ ;max_retries=10 ; Maximum number of registration attempts (default: "10") ;outbound_auth= ; Authentication object to be used for outbound registrations ; (default: "") -;outbound_proxy= ; Outbound Proxy used to send registrations (default: - ; "") +;outbound_proxy= ; Proxy through which to send registrations, a full SIP URI + ; must be provided (default: "") ;retry_interval=60 ; Interval in seconds between retries if outbound ; registration is unsuccessful (default: "60") ;forbidden_retry_interval=0 ; Interval used when receiving a 403 Forbidden diff --git a/res/res_pjsip.c b/res/res_pjsip.c index 92dca7fb8..54a0a5f39 100644 --- a/res/res_pjsip.c +++ b/res/res_pjsip.c @@ -349,7 +349,7 @@ </description> </configOption> <configOption name="outbound_proxy"> - <synopsis>Proxy through which to send requests, a full SIP URI must be provided</synopsis> + <synopsis>Full SIP URI of the outbound proxy used to send requests</synopsis> </configOption> <configOption name="rewrite_contact"> <synopsis>Allow Contact header to be rewritten with the source IP address-port</synopsis> diff --git a/res/res_pjsip_outbound_publish.c b/res/res_pjsip_outbound_publish.c index 37f64481e..0273c6a68 100644 --- a/res/res_pjsip_outbound_publish.c +++ b/res/res_pjsip_outbound_publish.c @@ -68,7 +68,7 @@ </description> </configOption> <configOption name="outbound_proxy" default=""> - <synopsis>SIP URI of the outbound proxy used to send publishes</synopsis> + <synopsis>Full SIP URI of the outbound proxy used to send publishes</synopsis> </configOption> <configOption name="server_uri"> <synopsis>SIP URI of the server and entity to publish to</synopsis> diff --git a/res/res_pjsip_outbound_registration.c b/res/res_pjsip_outbound_registration.c index 122d5bb69..622df03f7 100644 --- a/res/res_pjsip_outbound_registration.c +++ b/res/res_pjsip_outbound_registration.c @@ -96,7 +96,7 @@ </description> </configOption> <configOption name="outbound_proxy" default=""> - <synopsis>Outbound Proxy used to send registrations</synopsis> + <synopsis>Full SIP URI of the outbound proxy used to send registrations</synopsis> </configOption> <configOption name="retry_interval" default="60"> <synopsis>Interval in seconds between retries if outbound registration is unsuccessful</synopsis> @@ -1210,6 +1210,17 @@ static int sip_outbound_registration_regc_alloc(void *data) return -1; } + if (!ast_strlen_zero(registration->outbound_proxy)) { + pj_strdup2_with_null(pool, &tmp, registration->outbound_proxy); + uri = pjsip_parse_uri(pool, tmp.ptr, tmp.slen, 0); + if (!uri) { + ast_log(LOG_ERROR, "Invalid outbound proxy URI '%s' specified on outbound registration '%s'\n", + registration->outbound_proxy, ast_sorcery_object_get_id(registration)); + pjsip_endpt_release_pool(ast_sip_get_pjsip_endpoint(), pool); + return -1; + } + } + pjsip_endpt_release_pool(ast_sip_get_pjsip_endpoint(), pool); |