Merged revisions 113927 via svnmerge from

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

........
r113927 | mmichelson | 2008-04-09 15:54:31 -0500 (Wed, 09 Apr 2008) | 8 lines

We need to set the persistant_route [sic] parameter for the sip_pvt
during the initial INVITE, no matter if we're building the route set from
an INVITE request or response.

(closes issue #12391)
Reported by: benjaminbohlmann
Tested by: benjaminbohlmann

........

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

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 501a50c..b538b70 100644 (file)
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -9976,8 +9976,9 @@ static void build_route(struct sip_pvt *p, struct sip_request *req, int backward
                free_old_route(p->route);
                p->route = NULL;
        }
-       
-       p->route_persistant = backwards;
+
+       /* We only want to create the route set the first time this is called */
+       p->route_persistant = 1;
        
        /* Build a tailq, then assign it to p->route when done.
         * If backwards, we add entries from the head so they end up