From: Mark Spencer <markster@digium.com>
Date: Sun, 15 Jun 2003 22:53:05 +0000 (+0000)
Subject: Handle registration setups better when username contains an @
X-Git-Tag: 0.5.0~403
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b04542e11eb048f7e44caa8275b40804c4fd0ae1;p=thirdparty%2Fasterisk.git

Handle registration setups better when username contains an @


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@1093 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 77f301b506..87f179f843 100755
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -2613,8 +2613,13 @@ static int transmit_register(struct sip_registry *r, char *cmd, char *auth)
 		ast_log(LOG_DEBUG, "Scheduled a timeout # %d\n", r->timeout);
 	}
 
-	snprintf(from, sizeof(from), "<sip:%s@%s>;tag=as%08x", r->username, r->hostname, p->tag);
-	snprintf(to, sizeof(to),     "<sip:%s@%s>", r->username, r->hostname);
+	if (strchr(r->username, '@')) {
+		snprintf(from, sizeof(from), "<sip:%s>;tag=as%08x", r->username, p->tag);
+		snprintf(to, sizeof(to),     "<sip:%s>", r->username);
+	} else {
+		snprintf(from, sizeof(from), "<sip:%s@%s>;tag=as%08x", r->username, r->hostname, p->tag);
+		snprintf(to, sizeof(to),     "<sip:%s@%s>", r->username, r->hostname);
+	}
 	
 	snprintf(addr, sizeof(addr), "sip:%s", r->hostname);
 	strncpy(p->uri, addr, sizeof(p->uri) - 1);