From: Mike Jerris <mike@jerris.com>
Date: Thu, 5 Jan 2017 22:02:17 +0000 (-0600)
Subject: FS-9844: [mod_sofia] populate sip_full_route var with all of the route headers, not... 
X-Git-Tag: v1.8.0~926^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f418baf7c85c91b79ecb1cd593b570f99a7c0e2d;p=thirdparty%2Ffreeswitch.git

FS-9844: [mod_sofia] populate sip_full_route var with all of the route headers, not just the first one
---

diff --git a/src/mod/endpoints/mod_sofia/sofia.c b/src/mod/endpoints/mod_sofia/sofia.c
index de780ef41a..0093839578 100644
--- a/src/mod/endpoints/mod_sofia/sofia.c
+++ b/src/mod/endpoints/mod_sofia/sofia.c
@@ -227,12 +227,23 @@ static void extract_header_vars(sofia_profile_t *profile, sip_t const *sip,
 
 	if (sip) {
 		if (sip->sip_route) {
-			if ((full = sip_header_as_string(nh->nh_home, (void *) sip->sip_route))) {
-				const char *v = switch_channel_get_variable(channel, "sip_full_route");
-				if (!v) {
-					switch_channel_set_variable(channel, "sip_full_route", full);
+			const char *v = switch_channel_get_variable(channel, "sip_full_route");
+
+			if (!v) {
+				sip_route_t *rp;
+				switch_stream_handle_t stream = { 0 };
+				int x = 0;
+
+				SWITCH_STANDARD_STREAM(stream);
+
+				for (rp = sip->sip_route; rp; rp = rp->r_next) {
+					char *route = sip_header_as_string(nh->nh_home, (void *) rp);
+					stream.write_function(&stream, x == 0 ? "%s" : ",%s", route);
+					su_free(nh->nh_home, route);
+					x++;
 				}
-				su_free(nh->nh_home, full);
+				switch_channel_set_variable(channel, "sip_full_route", stream.data);
+				free(stream.data);
 			}
 		}