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

update 

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@15222 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Brian West 2009-10-23 23:47:51 +00:00
parent a4b2dce44d
commit 2a02981b8c
3 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.c
View File

@ -262,10 +262,16 @@ static int parse_exten(switch_core_session_t *session, switch_caller_profile_t *
if (anti_action) { if (anti_action) {
for (xaction = switch_xml_child(xcond, "anti-action"); xaction; xaction = xaction->next) { for (xaction = switch_xml_child(xcond, "anti-action"); xaction; xaction = xaction->next) {
const char *application = switch_xml_attr_soft(xaction, "application"); const char *application = switch_xml_attr_soft(xaction, "application");
const char *data = switch_xml_attr_soft(xaction, "data"); const char *data;
const char *inline_ = switch_xml_attr_soft(xaction, "inline"); const char *inline_ = switch_xml_attr_soft(xaction, "inline");
int xinline = switch_true(inline_); int xinline = switch_true(inline_);
if (!zstr(xaction->txt)) {
data = xaction->txt;
} else {
data = (char *) switch_xml_attr_soft(xaction, "data");
}
switch_log_printf(SWITCH_CHANNEL_SESSION_LOG_CLEAN(session), SWITCH_LOG_DEBUG, switch_log_printf(SWITCH_CHANNEL_SESSION_LOG_CLEAN(session), SWITCH_LOG_DEBUG,
"Dialplan: %s ANTI-Action %s(%s) %s\n", "Dialplan: %s ANTI-Action %s(%s) %s\n",
switch_channel_get_name(channel), application, data, xinline ? "INLINE" : ""); switch_channel_get_name(channel), application, data, xinline ? "INLINE" : "");

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

@ -1278,10 +1278,10 @@ static switch_status_t sofia_receive_message(switch_core_session_t *session, swi
if (!sofia_test_flag(tech_pvt, TFLAG_UPDATING_DISPLAY)) { if (!sofia_test_flag(tech_pvt, TFLAG_UPDATING_DISPLAY)) {
if ((ua && (switch_stristr("polycom", ua)))) { if ((ua && (switch_stristr("polycom", ua)))) {
message = switch_mprintf("Warning: 300 freeswitch \"%s\"", msg->string_arg); message = switch_mprintf("Warning: 399 devnull \"%s\"", msg->string_arg);
sofia_set_flag_locked(tech_pvt, TFLAG_UPDATING_DISPLAY); sofia_set_flag_locked(tech_pvt, TFLAG_UPDATING_DISPLAY);
nua_update(tech_pvt->nh, nua_update(tech_pvt->nh,
TAG_IF(!zstr_buf(message), SIPTAG_HEADER_STR(message)), TAG_IF(!zstr(message), SIPTAG_HEADER_STR(message)),
TAG_IF(!zstr(tech_pvt->user_via), SIPTAG_VIA_STR(tech_pvt->user_via)), TAG_IF(!zstr(tech_pvt->user_via), SIPTAG_VIA_STR(tech_pvt->user_via)),
TAG_END()); TAG_END());
free(message); free(message);

2
src/switch_core_session.c
View File

@ -576,6 +576,8 @@ static const char *message_names[] = {
"TRANSCODING_NECESSARY", "TRANSCODING_NECESSARY",
"AUDIO_SYNC", "AUDIO_SYNC",
"REQUEST_IMAGE_MEDIA", "REQUEST_IMAGE_MEDIA",
"UUID_CHANGE",
"WARNING",
"INVALID" "INVALID"
}; };