Merged revisions 205776 via svnmerge from

https://origsvn.digium.com/svn/asterisk/trunk

................
  r205776 | mmichelson | 2009-07-10 10:56:45 -0500 (Fri, 10 Jul 2009) | 16 lines

  Merged revisions 205775 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.4

  ........
    r205775 | mmichelson | 2009-07-10 10:51:36 -0500 (Fri, 10 Jul 2009) | 10 lines

    Ensure that outbound NOTIFY requests are properly routed through stateful proxies.

    With this change, we make note of Record-Route headers present in any SUBSCRIBE
    request that we receive so that our outbound NOTIFY requests will have the proper
    Route headers in them.

    (closes issue #14725)
    Reported by: ibc
  ........
................

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

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 671ffa142e205d1df72a728cf63712f0ba398423..6ede9cabace92ba5d6a6aff844769c2a6f0ec88c 100644 (file)
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -9667,8 +9667,11 @@ static void initreqprep(struct sip_request *req, struct sip_pvt *p, int sipmetho
 
        add_header(req, "Via", p->via);
        add_header(req, "Max-Forwards", DEFAULT_MAX_FORWARDS);
-       /* SLD: FIXME?: do Route: here too?  I think not cos this is the first request.
-        * OTOH, then we won't have anything in p->route anyway */
+       /* This will be a no-op most of the time. However, under certain circumstances,
+        * NOTIFY messages will use this function for preparing the request and should
+        * have Route headers present.
+        */
+       add_route(req, p->route);
 
        /* Build Remote Party-ID and From */
        if (ast_test_flag(&p->flags[0], SIP_SENDRPID) && (sipmethod == SIP_INVITE)) {
@@ -19695,6 +19698,7 @@ static int handle_request_subscribe(struct sip_pvt *p, struct sip_request *req,
                if (sipdebug)
                        ast_debug(4, "Initializing initreq for method %s - callid %s\n", sip_methods[req->method].text, p->callid);
                check_via(p, req);
+               build_route(p, req, 0);
        } else if (req->debug && req->ignore)
                ast_verbose("Ignoring this SUBSCRIBE request\n");