Diff
Modified: freeswitch/trunk/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.c (15221 => 15222)
--- freeswitch/trunk/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.c 2009-10-23 23:02:14 UTC (rev 15221)
+++ freeswitch/trunk/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.c 2009-10-23 23:47:51 UTC (rev 15222)
@@ -262,10 +262,16 @@
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" : "");
Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c (15221 => 15222)
--- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c 2009-10-23 23:02:14 UTC (rev 15221)
+++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c 2009-10-23 23:47:51 UTC (rev 15222)
@@ -1278,10 +1278,10 @@
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);
Modified: freeswitch/trunk/src/switch_core_session.c (15221 => 15222)
--- freeswitch/trunk/src/switch_core_session.c 2009-10-23 23:02:14 UTC (rev 15221)
+++ freeswitch/trunk/src/switch_core_session.c 2009-10-23 23:47:51 UTC (rev 15222)
@@ -576,6 +576,8 @@
"TRANSCODING_NECESSARY",
"AUDIO_SYNC",
"REQUEST_IMAGE_MEDIA",
+ "UUID_CHANGE",
+ "WARNING",
"INVALID"
};