Merged revisions 86471 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r86471 | file | 2007-10-19 12:33:49 -0300 (Fri, 19 Oct 2007) | 6 lines

Fix two issues with domains and transfers. If a port was given in the hostname it was treated as part of the hostname. If domains were configured but external domains were not enabled all transfers would be considered remote.
(closes issue #11027)
Reported by: ramonpeek
Patches:
      11027-1.diff uploaded by ramonpeek (license 266)

........

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

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index e5e8e1c..118282f 100644 (file)
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -9756,13 +9756,18 @@ static int get_refer_info(struct sip_pvt *transferer, struct sip_request *outgoi
        }
        
        if ((ptr = strchr(refer_to, '@'))) {    /* Separate domain */
-               char *urioption;
-
+               char *urioption = NULL, *domain;
                *ptr++ = '\0';
-               if ((urioption = strchr(ptr, ';')))
+
+               if ((urioption = strchr(ptr, ';'))) /* Separate urioptions */
                        *urioption++ = '\0';
+               
+               domain = ptr;
+               if ((ptr = strchr(domain, ':')))        /* Remove :port */
+                       *ptr = '\0';
+               
                /* Save the domain for the dial plan */
-               ast_copy_string(referdata->refer_to_domain, ptr, sizeof(referdata->refer_to_domain));
+               ast_copy_string(referdata->refer_to_domain, domain, sizeof(referdata->refer_to_domain));
                if (urioption)
                        ast_copy_string(referdata->refer_to_urioption, urioption, sizeof(referdata->refer_to_urioption));
        }
@@ -15368,11 +15373,10 @@ static int handle_request_refer(struct sip_pvt *p, struct sip_request *req, int
                p->refer->localtransfer = 1;
                if (sipdebug)
                        ast_debug(3, "This SIP transfer is local : %s\n", p->refer->refer_to_domain);
-       } else if (AST_LIST_EMPTY(&domain_list)) {
-               /* This PBX don't bother with SIP domains, so all transfers are local */
+       } else if (AST_LIST_EMPTY(&domain_list) || check_sip_domain(p->refer->refer_to_domain, NULL, 0)) {
+               /* This PBX doesn't bother with SIP domains or domain is local, so this transfer is local */
                p->refer->localtransfer = 1;
-       } else
-               if (sipdebug)
+       } else if (sipdebug)
                        ast_debug(3, "This SIP transfer is to a remote SIP extension (remote domain %s)\n", p->refer->refer_to_domain);
        
        /* Is this a repeat of a current request? Ignore it */