[Asterisk-cvs] asterisk/channels chan_sip.c,1.350,1.351

[markster at lists.digium.com]

Update of /usr/cvsroot/asterisk/channels
In directory mongoose.digium.com:/tmp/cvs-serv26038/channels

Modified Files:
	chan_sip.c 
Log Message:
Revert routing change


Index: chan_sip.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_sip.c,v
retrieving revision 1.350
retrieving revision 1.351
diff -u -d -r1.350 -r1.351
--- chan_sip.c	30 Apr 2004 04:05:22 -0000	1.350
+++ chan_sip.c	1 May 2004 03:04:04 -0000	1.351
@@ -3699,9 +3699,12 @@
 	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 @@
 		/* 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 < */