kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

working on 2 boxes at once ignore me 

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@15150 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Anthony Minessale 2009-10-13 20:28:45 +00:00
parent 4b73a5f111
commit 0ef7525cea
5 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/include/switch_core.h
View File

@ -59,6 +59,8 @@ struct switch_app_log {
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 {

4
src/mod/endpoints/mod_sofia/mod_sofia.c
View File

@ -1295,8 +1295,8 @@ static switch_status_t sofia_receive_message(switch_core_session_t *session, swi
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)),

3
src/mod/endpoints/mod_sofia/sofia.c
View File

@ -404,6 +404,7 @@ void sofia_send_callee_id(switch_core_session_t *session, const char *name, cons
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);
@ -483,8 +484,8 @@ static void sofia_handle_sip_i_update(nua_t *nua, sofia_profile_t *profile, nua_
return;
}
sofia_update_callee_id(session, profile, sip, SWITCH_TRUE);
nua_respond(nh, SIP_200_OK, NUTAG_WITH_THIS(nua), TAG_END());
}

11
src/switch_core_session.c
View File

@ -582,15 +582,24 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_perform_receive_message(swit
return status;
}
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) {

2
src/switch_ivr_bridge.c
View File

@ -161,7 +161,7 @@ static void *audio_bridge_thread(switch_thread_t *thread, void *obj)
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