merge 45966 refer_to_domain potentially containing options

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

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 6999cff0e4984f18bec230716c031530d0f85361..037c6a3399487812dab19dec7f47313fbef31af7 100644 (file)
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -8621,14 +8621,14 @@ static int get_also_info(struct sip_pvt *p, struct sip_request *oreq)
                return -1;
        }
        c += 4;
+       if ((a = strchr(c, ';')))       /* Remove arguments */
+               *a = '\0';
+       
        if ((a = strchr(c, '@'))) {     /* Separate Domain */
                *a++ = '\0';
                ast_copy_string(referdata->refer_to_domain, a, sizeof(referdata->refer_to_domain));
        }
        
-       if ((a = strchr(c, ';')))       /* Remove arguments */
-               *a = '\0';
-       
        if (sip_debug_test_pvt(p))
                ast_verbose("Looking for %s in %s\n", c, p->context);