Issue #6848 take two - Use the tag provided by the SUBSCRIBE request when sending...

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

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 4b3095414a314373ba435ccee32d07e97ccf18cc..0d939923adaea2ca9b254d2bfd5a605604c2ecd2 100644 (file)
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -4825,12 +4825,16 @@ static void initreqprep(struct sip_request *req, struct sip_pvt *p, int sipmetho
 
        ast_copy_string(p->uri, invite_buf, sizeof(p->uri));
 
-       /* If there is a VXML URL append it to the SIP URL */
-       if (p->options && p->options->vxml_url) {
+       if (sipmethod == SIP_NOTIFY && !ast_strlen_zero(p->theirtag)) { 
+               /* If this is a NOTIFY, use the From: tag in the subscribe (RFC 3265) */
+               snprintf(to, sizeof(to), "<sip:%s>;tag=%s", p->uri, p->theirtag);
+       } else if (p->options && p->options->vxml_url) {
+               /* If there is a VXML URL append it to the SIP URL */
                snprintf(to, sizeof(to), "<%s>;%s", p->uri, p->options->vxml_url);
        } else {
                snprintf(to, sizeof(to), "<%s>", p->uri);
        }
+       
        memset(req, 0, sizeof(struct sip_request));
        init_req(req, sipmethod, p->uri);
        snprintf(tmp, sizeof(tmp), "%d %s", ++p->ocseq, sip_methods[sipmethod].text);