From 00647c1f8fce85441eff3760c472863d38c87996 Mon Sep 17 00:00:00 2001 From: Terry Wilson Date: Tue, 13 Jan 2009 22:31:20 +0000 Subject: [PATCH] Merged revisions 168578 via svnmerge from https://origsvn.digium.com/svn/asterisk/trunk ................ r168578 | twilson | 2009-01-13 16:22:34 -0600 (Tue, 13 Jan 2009) | 14 lines 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/branches/1.6.0@168580 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- channels/chan_sip.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 92f3e78292..87d090e054 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -9514,6 +9514,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), ";tag=%s", r->username, p->tag); if (!ast_strlen_zero(p->theirtag)) @@ -9524,7 +9526,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), ";tag=%s", r->username, p->tohost, p->tag);