config: Improve documentation and behavior of outbound_proxy option.

This change updates the documentation for the outbound_proxy option
to ensure it is consistently stated that a full SIP URI must be
provided for the option.

The res_pjsip_outbound_registration module has also been changed so
that the provided outbound_proxy value is checked to ensure it is a
URI and if not an error is output stating so.

ASTERISK-26782

Change-Id: I6c239a32274846fd44e65b44ad9bf6373479b593
This commit is contained in:
Joshua Colp
2017-02-24 17:49:59 +00:00
parent e4ba07f1a6
commit 2046743938
4 changed files with 19 additions and 8 deletions

View File

@@ -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>
@@ -1209,6 +1209,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);