Handle swapout of "fromdomain" in callid properly (bug #6154)

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

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 027f100..39b5c23 100644 (file)
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -1830,8 +1830,6 @@ static struct sip_user *find_user(const char *name, int realtime)
 /*! \brief  create_addr_from_peer: create address structure from peer reference ---*/
 static int create_addr_from_peer(struct sip_pvt *r, struct sip_peer *peer)
 {
 /*! \brief  create_addr_from_peer: create address structure from peer reference ---*/
 static int create_addr_from_peer(struct sip_pvt *r, struct sip_peer *peer)
 {

-       char *callhost;
-

        if ((peer->addr.sin_addr.s_addr || peer->defaddr.sin_addr.s_addr) &&
            (!peer->maxms || ((peer->lastms >= 0)  && (peer->lastms <= peer->maxms)))) {
                if (peer->addr.sin_addr.s_addr) {
        if ((peer->addr.sin_addr.s_addr || peer->defaddr.sin_addr.s_addr) &&
            (!peer->maxms || ((peer->lastms >= 0)  && (peer->lastms <= peer->maxms)))) {
                if (peer->addr.sin_addr.s_addr) {

@@ -1867,8 +1865,15 @@ static int create_addr_from_peer(struct sip_pvt *r, struct sip_peer *peer)
        ast_string_field_set(r, tohost, peer->tohost);
        ast_string_field_set(r, fullcontact, peer->fullcontact);
        if (!r->initreq.headers && !ast_strlen_zero(peer->fromdomain)) {
        ast_string_field_set(r, tohost, peer->tohost);
        ast_string_field_set(r, fullcontact, peer->fullcontact);
        if (!r->initreq.headers && !ast_strlen_zero(peer->fromdomain)) {

-               if ((callhost = strchr(r->callid, '@'))) {
-                       strncpy(callhost + 1, peer->fromdomain, sizeof(r->callid) - (callhost - r->callid) - 2);
+               char *tmpcall;
+               char *c;
+               tmpcall = ast_strdupa(r->callid);
+               if (tmpcall) {
+                       c = strchr(tmpcall, '@');
+                       if (c) {
+                               *c = '\0';
+                               ast_string_field_build(r, callid, "%s@%s", tmpcall, peer->fromdomain);
+                       }

                }
        }
        if (ast_strlen_zero(r->tohost)) {
                }
        }
        if (ast_strlen_zero(r->tohost)) {