<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[Freeswitch-trunk][14901] </title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<div id="header">FreeSWITCH Subversion</div>
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://fisheye.freeswitch.org/changelog/FreeSWITCH?cs=14901">14901</a></dd>
<dt>Author</dt> <dd>anthm</dd>
<dt>Date</dt> <dd>2009-09-17 11:21:54 -0500 (Thu, 17 Sep 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre><a href="http://jira.freeswitch.org/browse/DP-6">DP-6</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunksrcmoddialplansmod_dialplan_xmlmod_dialplan_xmlc">freeswitch/trunk/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.c</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunksrcmoddialplansmod_dialplan_xmlmod_dialplan_xmlc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.c (14900 => 14901)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.c 2009-09-17 13:48:38 UTC (rev 14900)
+++ freeswitch/trunk/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.c 2009-09-17 16:21:54 UTC (rev 14901)
</span><span class="lines">@@ -52,6 +52,7 @@
</span><span class="cx"> char *exten_name = (char *) switch_xml_attr(xexten, "name");
</span><span class="cx"> int proceed = 0;
</span><span class="cx"> char *expression_expanded = NULL, *field_expanded = NULL;
</span><ins>+ switch_regex_t *re = NULL;
</ins><span class="cx">
</span><span class="cx"> if (!exten_name) {
</span><span class="cx"> exten_name = "_anon_";
</span><span class="lines">@@ -62,8 +63,8 @@
</span><span class="cx"> char *do_break_a = NULL;
</span><span class="cx"> char *expression = NULL;
</span><span class="cx"> const char *field_data = NULL;
</span><del>- switch_regex_t *re = NULL;
</del><span class="cx"> int ovector[30];
</span><ins>+ switch_bool_t anti_action = SWITCH_TRUE;
</ins><span class="cx"> break_t do_break_i = BREAK_ON_FALSE;
</span><span class="cx">
</span><span class="cx"> const char *xyear = switch_xml_attr(xcond, "year");
</span><span class="lines">@@ -91,39 +92,66 @@
</span><span class="cx"> switch_time_exp_lt(&tm, ts);
</span><span class="cx">
</span><span class="cx"> if (time_match && xyear) {
</span><del>- time_match = switch_number_cmp(xyear, tm.tm_year + 1900);
</del><ins>+ int test = tm.tm_year + 1900;
+ time_match = switch_number_cmp(xyear, test);
+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG_CLEAN(session), SWITCH_LOG_DEBUG,
+ "Dialplan: year[%d] =~ %s %s\n", test, xyear, time_match ? "PASS" : "FAIL");
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (time_match && xyday) {
</span><del>- time_match = switch_number_cmp(xyday, tm.tm_yday + 1);
</del><ins>+ int test = tm.tm_yday + 1;
+ time_match = switch_number_cmp(xyday, test);
+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG_CLEAN(session), SWITCH_LOG_DEBUG,
+ "Dialplan: day of year[%d] =~ %s %s\n", test, xyday, time_match ? "PASS" : "FAIL");
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (time_match && xmon) {
</span><del>- time_match = switch_number_cmp(xmon, tm.tm_mon + 1);
</del><ins>+ int test = tm.tm_mon + 1;
+ time_match = switch_number_cmp(xmon, test);
+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG_CLEAN(session), SWITCH_LOG_DEBUG,
+ "Dialplan: month[%d] =~ %s %s\n", test, xmon, time_match ? "PASS" : "FAIL");
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (time_match && xmday) {
</span><del>- time_match = switch_number_cmp(xmday, tm.tm_mday);
</del><ins>+ int test = tm.tm_mday;
+ time_match = switch_number_cmp(xmday, test);
+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG_CLEAN(session), SWITCH_LOG_DEBUG,
+ "Dialplan: day of month[%d] =~ %s %s\n", test, xmday, time_match ? "PASS" : "FAIL");
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (time_match && xweek) {
</span><del>- time_match = switch_number_cmp(xweek, (int) (tm.tm_yday + 1 / 7));
</del><ins>+ int test = (int) (tm.tm_yday + 1 / 7);
+ time_match = switch_number_cmp(xweek, test);
+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG_CLEAN(session), SWITCH_LOG_DEBUG,
+ "Dialplan: week of year[%d] =~ %s %s\n", test, xweek, time_match ? "PASS" : "FAIL");
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (time_match && xwday) {
</span><del>- time_match = switch_number_cmp(xwday, tm.tm_wday + 1);
</del><ins>+ int test = tm.tm_wday + 1;
+ time_match = switch_number_cmp(xwday, test);
+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG_CLEAN(session), SWITCH_LOG_DEBUG,
+ "Dialplan: day of week[%d] =~ %s %s\n", test, xwday, time_match ? "PASS" : "FAIL");
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (time_match && xhour) {
</span><del>- time_match = switch_number_cmp(xhour, tm.tm_hour);
</del><ins>+ int test = tm.tm_hour;
+ time_match = switch_number_cmp(xhour, test);
+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG_CLEAN(session), SWITCH_LOG_DEBUG,
+ "Dialplan: hour[%d] =~ %s %s\n", test, xhour, time_match ? "PASS" : "FAIL");
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (time_match && xminute) {
</span><del>- time_match = switch_number_cmp(xminute, tm.tm_min);
</del><ins>+ int test = tm.tm_min;
+ time_match = switch_number_cmp(xminute, test);
+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG_CLEAN(session), SWITCH_LOG_DEBUG,
+ "Dialplan: minute[%d] =~ %s %s\n", test, xminute, time_match ? "PASS" : "FAIL");
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (time_match && xminday) {
</span><del>- time_match = switch_number_cmp(xminday, (tm.tm_hour * 60) + (tm.tm_min + 1));
</del><ins>+ int test = (tm.tm_hour * 60) + (tm.tm_min + 1);
+ time_match = switch_number_cmp(xminday, test);
+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG_CLEAN(session), SWITCH_LOG_DEBUG,
+ "Dialplan: minute of day[%d] =~ %s %s\n", test, xminday, time_match ? "PASS" : "FAIL");
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> field = (char *) switch_xml_attr(xcond, "field");
</span><span class="lines">@@ -154,15 +182,15 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (time_match == 0) {
- if (do_break_i == BREAK_ON_FALSE || do_break_i == BREAK_ALWAYS) {
- break;
- } else if (do_break_i == BREAK_NEVER) {
- continue;
- } else {
- proceed = 0;
- goto done;
- }
</del><ins>+ if (time_match == 1) {
+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG_CLEAN(session), SWITCH_LOG_DEBUG,
+ "Dialplan: %s Date/Time Match (PASS) [%s] break=%s\n",
+ switch_channel_get_name(channel), exten_name, do_break_a ? do_break_a : "on-false");
+ anti_action = SWITCH_FALSE;
+ } else if (time_match == 0) {
+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG_CLEAN(session), SWITCH_LOG_DEBUG,
+ "Dialplan: %s Date/Time Match (FAIL) [%s] break=%s\n",
+ switch_channel_get_name(channel), exten_name, do_break_a ? do_break_a : "on-false");
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (field) {
</span><span class="lines">@@ -184,86 +212,83 @@
</span><span class="cx"> switch_log_printf(SWITCH_CHANNEL_SESSION_LOG_CLEAN(session), SWITCH_LOG_DEBUG,
</span><span class="cx"> "Dialplan: %s Regex (PASS) [%s] %s(%s) =~ /%s/ break=%s\n",
</span><span class="cx"> switch_channel_get_name(channel), exten_name, field, field_data, expression, do_break_a ? do_break_a : "on-false");
</span><ins>+ anti_action = SWITCH_FALSE;
</ins><span class="cx"> } else {
</span><span class="cx"> switch_log_printf(SWITCH_CHANNEL_SESSION_LOG_CLEAN(session), SWITCH_LOG_DEBUG,
</span><span class="cx"> "Dialplan: %s Regex (FAIL) [%s] %s(%s) =~ /%s/ break=%s\n",
</span><span class="cx"> switch_channel_get_name(channel), exten_name, field, field_data, expression, do_break_a ? do_break_a : "on-false");
</span><del>- for (xaction = switch_xml_child(xcond, "anti-action"); xaction; xaction = xaction->next) {
- char *application = (char *) switch_xml_attr_soft(xaction, "application");
- char *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)\n",
- switch_channel_get_name(channel), application, data);
-
- if (!*extension) {
- if ((*extension = switch_caller_extension_new(session, exten_name, caller_profile->destination_number)) == 0) {
- switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_CRIT, "Memory Error!\n");
- proceed = 0;
- goto done;
- }
- }
-
- switch_caller_extension_add_application(session, *extension, application, data);
- proceed = 1;
- }
-
- if (do_break_i == BREAK_ON_FALSE || do_break_i == BREAK_ALWAYS) {
- break;
- } else {
- continue;
- }
</del><span class="cx"> }
</span><del>- assert(re != NULL);
- } else {
</del><ins>+ } else if (time_match == -1) {
</ins><span class="cx"> switch_log_printf(SWITCH_CHANNEL_SESSION_LOG_CLEAN(session), SWITCH_LOG_DEBUG,
</span><span class="cx"> "Dialplan: %s Absolute Condition [%s]\n",
</span><span class="cx"> switch_channel_get_name(channel), exten_name);
</span><ins>+ anti_action = SWITCH_FALSE;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- for (xaction = switch_xml_child(xcond, "action"); xaction; xaction = xaction->next) {
- char *application = (char *) switch_xml_attr_soft(xaction, "application");
- char *data = NULL;
- char *substituted = NULL;
- uint32_t len = 0;
- char *app_data = NULL;
</del><ins>+ if (anti_action) {
+ for (xaction = switch_xml_child(xcond, "anti-action"); xaction; xaction = xaction->next) {
+ char *application = (char *) switch_xml_attr_soft(xaction, "application");
+ char *data = (char *) switch_xml_attr_soft(xaction, "data");
</ins><span class="cx">
</span><del>- if (!switch_strlen_zero(xaction->txt)) {
- data = xaction->txt;
- } else {
- data = (char *) switch_xml_attr_soft(xaction, "data");
- }
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG_CLEAN(session), SWITCH_LOG_DEBUG,
+ "Dialplan: %s ANTI-Action %s(%s)\n",
+ switch_channel_get_name(channel), application, data);
</ins><span class="cx">
</span><del>- if (field && strchr(expression, '(')) {
- len = (uint32_t) (strlen(data) + strlen(field_data) + 10) * proceed;
- if (!(substituted = malloc(len))) {
- switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_CRIT, "Memory Error!\n");
- proceed = 0;
- goto done;
</del><ins>+ if (!*extension) {
+ if ((*extension = switch_caller_extension_new(session, exten_name, caller_profile->destination_number)) == 0) {
+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_CRIT, "Memory Error!\n");
+ proceed = 0;
+ goto done;
+ }
</ins><span class="cx"> }
</span><del>- memset(substituted, 0, len);
- switch_perform_substitution(re, proceed, data, field_data, substituted, len, ovector);
- app_data = substituted;
- } else {
- app_data = data;
</del><ins>+
+ switch_caller_extension_add_application(session, *extension, application, data);
+ proceed = 1;
</ins><span class="cx"> }
</span><ins>+ } else {
+ for (xaction = switch_xml_child(xcond, "action"); xaction; xaction = xaction->next) {
+ char *application = (char *) switch_xml_attr_soft(xaction, "application");
+ char *data = NULL;
+ char *substituted = NULL;
+ uint32_t len = 0;
+ char *app_data = NULL;
</ins><span class="cx">
</span><del>- if (!*extension) {
- if ((*extension = switch_caller_extension_new(session, exten_name, caller_profile->destination_number)) == 0) {
- switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_CRIT, "Memory Error!\n");
- proceed = 0;
- goto done;
</del><ins>+ if (!switch_strlen_zero(xaction->txt)) {
+ data = xaction->txt;
+ } else {
+ data = (char *) switch_xml_attr_soft(xaction, "data");
</ins><span class="cx"> }
</span><del>- }
</del><span class="cx">
</span><del>- switch_log_printf(SWITCH_CHANNEL_SESSION_LOG_CLEAN(session), SWITCH_LOG_DEBUG,
- "Dialplan: %s Action %s(%s)\n",
- switch_channel_get_name(channel), application, app_data);
</del><ins>+ if (field && strchr(expression, '(')) {
+ len = (uint32_t) (strlen(data) + strlen(field_data) + 10) * proceed;
+ if (!(substituted = malloc(len))) {
+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_CRIT, "Memory Error!\n");
+ proceed = 0;
+ goto done;
+ }
+ memset(substituted, 0, len);
+ switch_perform_substitution(re, proceed, data, field_data, substituted, len, ovector);
+ app_data = substituted;
+ } else {
+ app_data = data;
+ }
</ins><span class="cx">
</span><del>- switch_caller_extension_add_application(session, *extension, application, app_data);
- switch_safe_free(substituted);
</del><ins>+ if (!*extension) {
+ if ((*extension = switch_caller_extension_new(session, exten_name, caller_profile->destination_number)) == 0) {
+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_CRIT, "Memory Error!\n");
+ proceed = 0;
+ goto done;
+ }
+ }
+
+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG_CLEAN(session), SWITCH_LOG_DEBUG,
+ "Dialplan: %s Action %s(%s)\n",
+ switch_channel_get_name(channel), application, app_data);
+
+ switch_caller_extension_add_application(session, *extension, application, app_data);
+ switch_safe_free(substituted);
+ }
</ins><span class="cx"> }
</span><del>-
</del><span class="cx"> switch_regex_safe_free(re);
</span><span class="cx">
</span><span class="cx"> if (do_break_i == BREAK_ON_TRUE || do_break_i == BREAK_ALWAYS) {
</span><span class="lines">@@ -272,6 +297,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> done:
</span><ins>+ switch_regex_safe_free(re);
</ins><span class="cx"> switch_safe_free(field_expanded);
</span><span class="cx"> switch_safe_free(expression_expanded);
</span><span class="cx"> return proceed;
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>