From 2a02981b8cbf58fca8614d5d84633ab5b4836484 Mon Sep 17 00:00:00 2001 From: Brian West Date: Fri, 23 Oct 2009 23:47:51 +0000 Subject: [PATCH] update git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@15222 d0543943-73ff-0310-b7d9-9358b9ac24b2 --- src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.c | 8 +++++++- src/mod/endpoints/mod_sofia/mod_sofia.c | 6 +++--- src/switch_core_session.c | 2 ++ 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.c b/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.c index 1d24123895..55eb23453c 100644 --- a/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.c +++ b/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.c @@ -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" : ""); diff --git a/src/mod/endpoints/mod_sofia/mod_sofia.c b/src/mod/endpoints/mod_sofia/mod_sofia.c index f43798d17b..890ac9ba44 100644 --- a/src/mod/endpoints/mod_sofia/mod_sofia.c +++ b/src/mod/endpoints/mod_sofia/mod_sofia.c @@ -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); diff --git a/src/switch_core_session.c b/src/switch_core_session.c index 83c16ada53..b0753d259d 100644 --- a/src/switch_core_session.c +++ b/src/switch_core_session.c @@ -576,6 +576,8 @@ static const char *message_names[] = { "TRANSCODING_NECESSARY", "AUDIO_SYNC", "REQUEST_IMAGE_MEDIA", + "UUID_CHANGE", + "WARNING", "INVALID" };