[Freeswitch-svn] [commit] r8856 - freeswitch/trunk/src/mod/endpoints/mod_sofia

[Freeswitch SVN]

Author: anthm
Date: Fri Jun 27 12:01:40 2008
New Revision: 8856

Modified:
   freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c
   freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c
   freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c

Log:
strip off our private params

Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c
==============================================================================
--- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c	(original)
+++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c	Fri Jun 27 12:01:40 2008
@@ -517,15 +517,10 @@
 		tportlog = 1;
 	}
 
-	if (use_100rel && use_timer) {
-		supported = "100rel, precondition, timer";
-	} else if (use_100rel) {
-		supported = "100rel, precondition";
-	} else if (use_timer) {
-		supported = "timer, precondition";
-	} else {
-		supported = "precondition";
-	}
+	supported = switch_core_sprintf(profile->pool, "%s%sprecondition, path", 
+									use_100rel ? "100rel, " : "",
+									use_timer ? "timer, " : ""
+									);
 
 	profile->nua = nua_create(profile->s_root,	/* Event loop */
 							  sofia_event_callback,	/* Callback for processing events */

Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c
==============================================================================
--- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c	(original)
+++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c	Fri Jun 27 12:01:40 2008
@@ -669,8 +669,15 @@
 {
 	char *stripped = switch_core_session_strdup(session, uri);
 	char *new_uri = NULL;
+	char *p;
 
 	stripped = sofia_glue_get_url_from_contact(stripped, 0);
+
+	/* remove our params so we don't make any whiny moronic device piss it's pants and forget who it is for a half-hour */
+	if ((p = (char *)switch_stristr(";fs_", stripped))) {
+		*p = '\0'; 
+	}
+
 	if (transport && transport != SOFIA_TRANSPORT_UDP) {
 
 		if (switch_stristr("port=", stripped)) {
@@ -1066,7 +1073,7 @@
 								  TAG_END());
 		
 
-		if (strstr(tech_pvt->dest, ";nat") || strstr(tech_pvt->dest, ";received") 
+		if (strstr(tech_pvt->dest, ";fs_nat") || strstr(tech_pvt->dest, ";received") 
 			|| ((val = switch_channel_get_variable(channel, "sip_sticky_contact")) && switch_true(val))) {
 			switch_set_flag(tech_pvt, TFLAG_NAT);
 			tech_pvt->record_route = switch_core_session_strdup(tech_pvt->session, url_str);
@@ -1165,9 +1172,11 @@
 
 	call_id = switch_channel_get_variable(channel, "sip_outgoing_call_id");
 
-	if ((route = strstr(tech_pvt->dest, ";path="))) {
+	if ((route = strstr(tech_pvt->dest, ";fs_path="))) {
 		char *p;
-		route = switch_core_session_strdup(tech_pvt->session, route + 6);
+
+		route = switch_core_session_strdup(tech_pvt->session, route + 9);
+
 		for (p = route; p && *p ; p++) {
 			if (*p == '>' || *p == ';') {
 				*p = '\0';
@@ -1187,8 +1196,6 @@
 		
 		route_uri = sofia_overcome_sip_uri_weakness(tech_pvt->session, route_uri, 0, SWITCH_TRUE, NULL);
 	}
-	
-	
 
 	nua_invite(tech_pvt->nh,
 			   NUTAG_AUTOANSWER(0),

Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c
==============================================================================
--- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c	(original)
+++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c	Fri Jun 27 12:01:40 2008
@@ -462,8 +462,8 @@
 			path_val = sip_header_as_string(nh->nh_home, (void *) sip->sip_path);
 			path_encoded_len = (strlen(path_val) * 3) + 1;
 			switch_zmalloc(path_encoded, path_encoded_len);
-			switch_copy_string(path_encoded, ";path=", 7);
-			switch_url_encode(path_val, path_encoded + 6, path_encoded_len - 6);
+			switch_copy_string(path_encoded, ";fs_path=", 10);
+			switch_url_encode(path_val, path_encoded + 9, path_encoded_len - 9);
 		}
 
 		if (port) {
@@ -477,10 +477,10 @@
 		if (contact->m_url->url_params) {
 			switch_snprintf(contact_str, sizeof(contact_str), "%s <sip:%s@%s%s;%s%s%s%s>",
 							display, contact->m_url->url_user, contact_host, new_port, 
-							contact->m_url->url_params, received_data, is_nat ? ";nat=yes" : "", path_encoded ? path_encoded : "");
+							contact->m_url->url_params, received_data, is_nat ? ";fs_nat=yes" : "", path_encoded ? path_encoded : "");
 		} else {
 			switch_snprintf(contact_str, sizeof(contact_str), "%s <sip:%s@%s%s%s%s%s>", display, contact->m_url->url_user, contact_host, new_port,
-							received_data, is_nat ? ";nat=yes" : "", path_encoded ? path_encoded : "");
+							received_data, is_nat ? ";fs_nat=yes" : "", path_encoded ? path_encoded : "");
 		}
 
 		switch_safe_free(path_encoded);
@@ -532,10 +532,10 @@
 				if (!strcasecmp(v_contact_str, "nat-connectile-dysfunction") ||
 					!strcasecmp(v_contact_str, "NDLB-connectile-dysfunction") || !strcasecmp(v_contact_str, "NDLB-tls-connectile-dysfunction")) {
 					if (contact->m_url->url_params) {
-						switch_snprintf(contact_str, sizeof(contact_str), "%s <sip:%s@%s:%d;%s%s;nat=yes>",
+						switch_snprintf(contact_str, sizeof(contact_str), "%s <sip:%s@%s:%d;%s%s;fs_nat=yes>",
 										display, contact->m_url->url_user, network_ip, network_port, contact->m_url->url_params, received_data);
 					} else {
-						switch_snprintf(contact_str, sizeof(contact_str), "%s <sip:%s@%s:%d%s;nat=yes>", display, contact->m_url->url_user, network_ip,
+						switch_snprintf(contact_str, sizeof(contact_str), "%s <sip:%s@%s:%d%s;fs_nat=yes>", display, contact->m_url->url_user, network_ip,
 										network_port, received_data);
 					}
 					if (strstr(v_contact_str, "tls")) {