Merge "config: Improve documentation and behavior of outbound_proxy option."
This commit is contained in:
commit
0986998f2f
|
@ -642,7 +642,7 @@
|
||||||
; when placing on hold and sendrecv when taking off hold
|
; when placing on hold and sendrecv when taking off hold
|
||||||
;outbound_auth= ; Authentication object used for outbound requests (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: "")
|
; must be provided (default: "")
|
||||||
;rewrite_contact=no ; Allow Contact header to be rewritten with the source
|
;rewrite_contact=no ; Allow Contact header to be rewritten with the source
|
||||||
; IP address port (default: "no")
|
; IP address port (default: "no")
|
||||||
|
@ -877,8 +877,8 @@
|
||||||
;qualify_timeout=3.0 ; Qualify timeout in fractional seconds (default: "3.0")
|
;qualify_timeout=3.0 ; Qualify timeout in fractional seconds (default: "3.0")
|
||||||
;authenticate_qualify=no ; Authenticates a qualify request if needed
|
;authenticate_qualify=no ; Authenticates a qualify request if needed
|
||||||
; (default: "no")
|
; (default: "no")
|
||||||
;outbound_proxy= ; Outbound proxy used when sending OPTIONS request
|
;outbound_proxy= ; Proxy through which to send OPTIONS requests, a full SIP URI
|
||||||
; (default: "")
|
; must be provided (default: "")
|
||||||
|
|
||||||
|
|
||||||
;==========================SYSTEM SECTION OPTIONS=========================
|
;==========================SYSTEM SECTION OPTIONS=========================
|
||||||
|
@ -1044,8 +1044,8 @@
|
||||||
;max_retries=10 ; Maximum number of registration attempts (default: "10")
|
;max_retries=10 ; Maximum number of registration attempts (default: "10")
|
||||||
;outbound_auth= ; Authentication object to be used for outbound registrations
|
;outbound_auth= ; Authentication object to be used for outbound registrations
|
||||||
; (default: "")
|
; (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
|
;retry_interval=60 ; Interval in seconds between retries if outbound
|
||||||
; registration is unsuccessful (default: "60")
|
; registration is unsuccessful (default: "60")
|
||||||
;forbidden_retry_interval=0 ; Interval used when receiving a 403 Forbidden
|
;forbidden_retry_interval=0 ; Interval used when receiving a 403 Forbidden
|
||||||
|
|
|
@ -349,7 +349,7 @@
|
||||||
</description>
|
</description>
|
||||||
</configOption>
|
</configOption>
|
||||||
<configOption name="outbound_proxy">
|
<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>
|
||||||
<configOption name="rewrite_contact">
|
<configOption name="rewrite_contact">
|
||||||
<synopsis>Allow Contact header to be rewritten with the source IP address-port</synopsis>
|
<synopsis>Allow Contact header to be rewritten with the source IP address-port</synopsis>
|
||||||
|
|
|
@ -69,7 +69,7 @@
|
||||||
</description>
|
</description>
|
||||||
</configOption>
|
</configOption>
|
||||||
<configOption name="outbound_proxy" default="">
|
<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>
|
||||||
<configOption name="server_uri">
|
<configOption name="server_uri">
|
||||||
<synopsis>SIP URI of the server and entity to publish to</synopsis>
|
<synopsis>SIP URI of the server and entity to publish to</synopsis>
|
||||||
|
|
|
@ -96,7 +96,7 @@
|
||||||
</description>
|
</description>
|
||||||
</configOption>
|
</configOption>
|
||||||
<configOption name="outbound_proxy" default="">
|
<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>
|
||||||
<configOption name="retry_interval" default="60">
|
<configOption name="retry_interval" default="60">
|
||||||
<synopsis>Interval in seconds between retries if outbound registration is unsuccessful</synopsis>
|
<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;
|
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);
|
pjsip_endpt_release_pool(ast_sip_get_pjsip_endpoint(), pool);
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue