forked from Mirrors/freeswitch
update
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@15222 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
parent
a4b2dce44d
commit
2a02981b8c
@ -262,10 +262,16 @@ static int parse_exten(switch_core_session_t *session, switch_caller_profile_t *
|
||||
if (anti_action) {
|
||||
for (xaction = switch_xml_child(xcond, "anti-action"); xaction; xaction = xaction->next) {
|
||||
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");
|
||||
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,
|
||||
"Dialplan: %s ANTI-Action %s(%s) %s\n",
|
||||
switch_channel_get_name(channel), application, data, xinline ? "INLINE" : "");
|
||||
|
@ -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 ((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);
|
||||
nua_update(tech_pvt->nh,
|
||||
TAG_IF(!zstr_buf(message), SIPTAG_HEADER_STR(message)),
|
||||
nua_update(tech_pvt->nh,
|
||||
TAG_IF(!zstr(message), SIPTAG_HEADER_STR(message)),
|
||||
TAG_IF(!zstr(tech_pvt->user_via), SIPTAG_VIA_STR(tech_pvt->user_via)),
|
||||
TAG_END());
|
||||
free(message);
|
||||
|
@ -576,6 +576,8 @@ static const char *message_names[] = {
|
||||
"TRANSCODING_NECESSARY",
|
||||
"AUDIO_SYNC",
|
||||
"REQUEST_IMAGE_MEDIA",
|
||||
"UUID_CHANGE",
|
||||
"WARNING",
|
||||
"INVALID"
|
||||
};
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user