From: Terry Wilson <twilson@digium.com>
Date: Tue, 13 Jan 2009 22:22:34 +0000 (+0000)
Subject: Merged revisions 168551 via svnmerge from
X-Git-Tag: 1.6.2.0-beta1~458
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=938191bc194c4526edf75b2a3c9e682616def032;p=thirdparty%2Fasterisk.git

Merged revisions 168551 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r168551 | twilson | 2009-01-13 12:34:14 -0600 (Tue, 13 Jan 2009) | 7 lines

  Don't pass a value with a side effect to a macro

  (closes issue #14176)
  Reported by: paraeco
  Patches:
        chan_sip.c.diff uploaded by paraeco (license 658)
........


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

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 0a066c7dc4..de914872ec 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -10609,6 +10609,8 @@ static int transmit_register(struct sip_registry *r, int sipmethod, const char *
 	}
 
 	if ((fromdomain = strchr(r->username, '@'))) {
+		/* the domain name is just behind '@' */
+		fromdomain++ ;
 		/* We have a domain in the username for registration */
 		snprintf(from, sizeof(from), "<sip:%s>;tag=%s", r->username, p->tag);
 		if (!ast_strlen_zero(p->theirtag))
@@ -10619,7 +10621,7 @@ static int transmit_register(struct sip_registry *r, int sipmethod, const char *
 		/* If the registration username contains '@', then the domain should be used as
 		   the equivalent of "fromdomain" for the registration */
 		if (ast_strlen_zero(p->fromdomain)) {
-			ast_string_field_set(p, fromdomain, ++fromdomain);
+			ast_string_field_set(p, fromdomain, fromdomain);
 		}
 	} else {
 		snprintf(from, sizeof(from), "<sip:%s@%s>;tag=%s", r->username, p->tohost, p->tag);