From: Brian West <brian@freeswitch.org>
Date: Mon, 14 Jun 2010 00:06:57 +0000 (-0500)
Subject:  SFSIP-214 don't override with a possible NULL value for tech_pvt->cid_type because... 
X-Git-Tag: v1.2-rc1~686
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=67217f0c9b944fdf7f6d46ee9a719ab66cfd8964;p=thirdparty%2Ffreeswitch.git

 SFSIP-214 don't override with a possible NULL value for tech_pvt->cid_type because its already defaulted to the profile setting at the top of sofia_glue_do_invite
---

diff --git a/src/mod/endpoints/mod_sofia/sofia_glue.c b/src/mod/endpoints/mod_sofia/sofia_glue.c
index c2aaf5265e..39f8d5cf72 100644
--- a/src/mod/endpoints/mod_sofia/sofia_glue.c
+++ b/src/mod/endpoints/mod_sofia/sofia_glue.c
@@ -1893,9 +1893,7 @@ switch_status_t sofia_glue_do_invite(switch_core_session_t *session)
 
 		if ((val = switch_channel_get_variable(channel, "sip_cid_type"))) {
 			cid_type = sofia_cid_name2type(val);
-		} else {
-			cid_type = tech_pvt->cid_type;
-		}
+		} 
 
 		if (sofia_test_flag(tech_pvt, TFLAG_RECOVERING) && switch_channel_direction(tech_pvt->channel) == SWITCH_CALL_DIRECTION_INBOUND) {
 			if (zstr((use_name = switch_channel_get_variable(tech_pvt->channel, "effective_callee_id_name"))) &&