From 01db62bdbe085c8fe02c30a84ff125137540df86 Mon Sep 17 00:00:00 2001
From: Mark Michelson <mmichelson@digium.com>
Date: Tue, 25 May 2010 20:59:04 +0000
Subject: [PATCH] Properly use peer's outboundproxy for outbound REGISTERs.
The logic used in transmit_register to get the outboundproxy for a peer
was flawed since this value would be overridden shortly afterwards when
create_addr was called.
In addition, this also fixes some logic used when parsing users.conf so
that the peer name is placed in the internally-generated register string
so that an outboundproxy set in the Asterisk GUI will be used for outbound
REGISTERs.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@265698 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
channels/chan_sip.c | 21 +++++----------------
1 file changed, 5 insertions(+), 16 deletions(-)
diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 51896353fa..0fce1e25ae 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -11574,23 +11574,12 @@ static int transmit_register(struct sip_registry *r, int sipmethod, const char *
if (p->do_history)
append_history(p, "RegistryInit", "Account: %s@%s", r->username, r->hostname);
- if (!ast_strlen_zero(r->peername)) {
- if (!(peer = find_peer(r->peername, NULL, 1, FINDPEERS, FALSE, 0))) {
- ast_log(LOG_WARNING, "Could not find peer %s in transmit_register\n", r->peername);
- } else {
- p->peerauth = peer->auth;
- }
- }
- ref_proxy(p, obproxy_get(p, peer)); /* it is ok to pass a NULL peer into obproxy_get() */
- if (peer) {
- unref_peer(peer, "transmit_registration: from find_peer operation");
- }
/* Use port number specified if no SRV record was found */
if (!r->us.sin_port && r->portno)
r->us.sin_port = htons(r->portno);
/* Find address to hostname */
- if (create_addr(p, r->hostname, &r->us, 0, NULL)) {
+ if (create_addr(p, S_OR(r->peername, r->hostname), &r->us, 0, NULL)) {
/* we have what we hope is a temporary network error,
* probably DNS. We need to reschedule a registration try */
dialog_unlink_all(p, TRUE, TRUE);
@@ -26232,14 +26221,14 @@ static int reload_config(enum channelreloadreason reason)
if (!ast_strlen_zero(username) && !ast_strlen_zero(host)) {
if (!ast_strlen_zero(secret)) {
if (!ast_strlen_zero(authuser)) {
- snprintf(tmp, sizeof(tmp), "%s:%s:%s@%s/%s", username, secret, authuser, host, contact);
+ snprintf(tmp, sizeof(tmp), "%s?%s:%s:%s@%s/%s", cat, username, secret, authuser, host, contact);
} else {
- snprintf(tmp, sizeof(tmp), "%s:%s@%s/%s", username, secret, host, contact);
+ snprintf(tmp, sizeof(tmp), "%s?%s:%s@%s/%s", cat, username, secret, host, contact);
}
} else if (!ast_strlen_zero(authuser)) {
- snprintf(tmp, sizeof(tmp), "%s::%s@%s/%s", username, authuser, host, contact);
+ snprintf(tmp, sizeof(tmp), "%s?%s::%s@%s/%s", cat, username, authuser, host, contact);
} else {
- snprintf(tmp, sizeof(tmp), "%s@%s/%s", username, host, contact);
+ snprintf(tmp, sizeof(tmp), "%s?%s@%s/%s", cat, username, host, contact);
}
if (sip_register(tmp, 0) == 0)
registry_count++;
--
GitLab