Revision

15150

Author

anthm

Date

2009-10-13 15:28:45 -0500 (Tue, 13 Oct 2009)

Log Message

working on 2 boxes at once ignore me

Modified Paths

• freeswitch/trunk/src/include/switch_core.h
• freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c
• freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c
• freeswitch/trunk/src/switch_core_session.c
• freeswitch/trunk/src/switch_ivr_bridge.c

Diff

--- freeswitch/trunk/src/include/switch_core.h	2009-10-13 20:03:18 UTC (rev 15149)
+++ freeswitch/trunk/src/include/switch_core.h	2009-10-13 20:28:45 UTC (rev 15150)
@@ -59,6 +59,8 @@
 	struct switch_app_log *next;
 };
 
+#define MESSAGE_STAMP_FFL(_m) _m->_file = __FILE__; _m->_func = __SWITCH_FUNC__; _m->_line = __LINE__
+
 #define MESSAGE_STRING_ARG_MAX 10
 /*! \brief A message object designed to allow unlike technologies to exchange data */
 struct switch_core_session_message {

--- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c	2009-10-13 20:03:18 UTC (rev 15149)
+++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c	2009-10-13 20:28:45 UTC (rev 15150)
@@ -1295,8 +1295,8 @@
 					nua_info(tech_pvt->nh, SIPTAG_CONTENT_TYPE_STR("message/sipfrag"),
 							 TAG_IF(!switch_strlen_zero(tech_pvt->user_via), SIPTAG_VIA_STR(tech_pvt->user_via)),
 							 SIPTAG_PAYLOAD_STR(message), TAG_END());
-				} else if ((ua && (switch_stristr("polycom", ua) || switch_stristr("FreeSWITCH", ua))) || 
-						   switch_stristr("UPDATE", tech_pvt->x_actually_support_remote)) {
+				} else if ((ua && (switch_stristr("polycom", ua) ||
+								   switch_stristr("UPDATE", tech_pvt->x_actually_support_remote)))) {
 					snprintf(message, sizeof(message), "P-Asserted-Identity: \"%s\" <%s>", name, number);
 					nua_update(tech_pvt->nh,
 							   TAG_IF(!switch_strlen_zero_buf(message), SIPTAG_HEADER_STR(message)),

--- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c	2009-10-13 20:03:18 UTC (rev 15149)
+++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c	2009-10-13 20:28:45 UTC (rev 15150)
@@ -404,6 +404,7 @@
 		switch_core_session_message_t *msg;
 		
 		msg = switch_core_session_alloc(session_b, sizeof(*msg));
+		MESSAGE_STAMP_FFL(msg);
 		msg->message_id = SWITCH_MESSAGE_INDICATE_DISPLAY;
 		msg->string_array_arg[0] = switch_core_session_strdup(session_b, name);
 		msg->string_array_arg[1] = switch_core_session_strdup(session_b, number);
@@ -443,7 +444,7 @@
 			}
 		}
 	}
-
+	
 	if ((tmp = switch_channel_get_variable(channel, "sip_callee_id_name"))) {
 		name = (char *)tmp;
 	}
@@ -467,7 +468,7 @@
 	caller_profile = switch_channel_get_caller_profile(channel);
 	caller_profile->callee_id_name = switch_core_strdup(caller_profile->pool, name);
 	caller_profile->callee_id_number = switch_core_strdup(caller_profile->pool, number);
-
+	
 	if (send) {
 		sofia_send_callee_id(session, NULL, NULL);
 	}
@@ -483,8 +484,8 @@
 		return;
 	}
 
-
 	sofia_update_callee_id(session, profile, sip, SWITCH_TRUE);
+	nua_respond(nh, SIP_200_OK, NUTAG_WITH_THIS(nua), TAG_END());
 }
 
 

--- freeswitch/trunk/src/switch_core_session.c	2009-10-13 20:03:18 UTC (rev 15149)
+++ freeswitch/trunk/src/switch_core_session.c	2009-10-13 20:28:45 UTC (rev 15150)
@@ -582,15 +582,24 @@
 		return status;
 	}
 
-	message->_file = file;
-	message->_func = func;
-	message->_line = line;
+	if (!message->_file) {
+		message->_file = file;
+	}
 
+	if (!message->_func) {
+		message->_func = func;
+	}
+
+	if (!message->_line) {
+		message->_line = line;
+	}
+
 	if (message->message_id > SWITCH_MESSAGE_INVALID) {
 		message->message_id = SWITCH_MESSAGE_INVALID;
 	}
 
-	switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, func, line, switch_core_session_get_uuid(session), SWITCH_LOG_DEBUG, "%s receive message [%s]\n",
+	switch_log_printf(SWITCH_CHANNEL_ID_LOG, message->_file, message->_func, message->_line, 
+					  switch_core_session_get_uuid(session), SWITCH_LOG_DEBUG, "%s receive message [%s]\n",
 					  switch_channel_get_name(session->channel), message_names[message->message_id]);
 	
 	if (session->endpoint_interface->io_routines->receive_message) {

--- freeswitch/trunk/src/switch_ivr_bridge.c	2009-10-13 20:03:18 UTC (rev 15149)
+++ freeswitch/trunk/src/switch_ivr_bridge.c	2009-10-13 20:28:45 UTC (rev 15150)
@@ -161,7 +161,7 @@
 	const char *silence_var, *var;
 	int silence_val = 0, bypass_media_after_bridge = 0;
 	const char *bridge_answer_timeout = NULL;
-	int answer_timeout, sent_update = -5;
+	int answer_timeout, sent_update = -50;
 	time_t answer_limit = 0;
 	
 #ifdef SWITCH_VIDEO_IN_THREADS