Revert routing change
authorMark Spencer <markster@digium.com>
Sat, 1 May 2004 03:04:04 +0000 (03:04 +0000)
committerMark Spencer <markster@digium.com>
Sat, 1 May 2004 03:04:04 +0000 (03:04 +0000)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@2835 65c4cc65-6c06-0410-ace0-fbb531ad65f3

channels/chan_sip.c

index 0f07b29..ad9c53a 100755 (executable)
@@ -3699,9 +3699,12 @@ static void build_route(struct sip_pvt *p, struct sip_request *req, int backward
        struct sip_route *thishop, *head, *tail;
        int start = 0;
        int len;
-       int firstpass = 1;
        char *rr, *contact, *c;
 
+       if (p->route) {
+               free_old_route(p->route);
+               p->route = NULL;
+       }
        /* We build up head, then assign it to p->route when we're done */
        head = NULL;  tail = head;
        /* 1st we pass through all the hops in any Record-Route headers */
@@ -3709,13 +3712,6 @@ static void build_route(struct sip_pvt *p, struct sip_request *req, int backward
                /* Each Record-Route header */
                rr = __get_header(req, "Record-Route", &start);
                if (*rr == '\0') break;
-               if (firstpass) {
-                       if (p->route) {
-                               free_old_route(p->route);
-                               p->route = NULL;
-                       }
-                       firstpass = 0;
-               }
                for (;;) {
                        /* Each route entry */
                        /* Find < */