Revision
15391
Author
anthm
Date
2009-11-06 16:08:59 -0600 (Fri, 06 Nov 2009)

Log Message

add var check

Modified Paths

Diff

Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c (15390 => 15391)


--- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c	2009-11-06 21:17:23 UTC (rev 15390)
+++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c	2009-11-06 22:08:59 UTC (rev 15391)
@@ -3100,11 +3100,13 @@
 		switch_channel_set_variable(nchannel, "sip_invite_params", "intercom=true");
 	}
 
-	if ((hval = switch_event_get_header(var_event, "sip_callee_id_name"))) {
+	if (((hval = switch_event_get_header(var_event, "effective_callee_id_name")) || 
+		 (hval = switch_event_get_header(var_event, "sip_callee_id_name"))) && !zstr(hval)) {
 		caller_profile->callee_id_name = switch_core_strdup(caller_profile->pool, hval);
 	}
 
-	if ((hval = switch_event_get_header(var_event, "sip_callee_id_number"))) {
+	if (((hval = switch_event_get_header(var_event, "effective_callee_id_number")) || 
+		 (hval = switch_event_get_header(var_event, "sip_callee_id_number"))) && !zstr(hval)) {
 		caller_profile->callee_id_number = switch_core_strdup(caller_profile->pool, hval);
 	}