aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortwilson <twilson@f38db490-d61c-443f-a65b-d21fe96a405b>2009-01-13 18:34:14 +0000
committertwilson <twilson@f38db490-d61c-443f-a65b-d21fe96a405b>2009-01-13 18:34:14 +0000
commit3e8748117aa0389222d223b386e30ef894614281 (patch)
treedf8fd34e4d550ccef86003d44f133b60a5e497b0
parent0d2c4d15669322ca2f49b3e70c4d148f2f13a01e (diff)
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: http://svn.digium.com/svn/asterisk/branches/1.4@168551 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r--channels/chan_sip.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 5d8ed871f..004aaaabe 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -7753,6 +7753,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))
@@ -7763,7 +7765,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);