<!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][16527] </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=16527">16527</a></dd>
<dt>Author</dt> <dd>anthm</dd>
<dt>Date</dt> <dd>2010-01-27 19:00:04 -0600 (Wed, 27 Jan 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>fix filters (reported on mailing list use jira next time =/)</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunklibseslsrcesl_eventc">freeswitch/trunk/libs/esl/src/esl_event.c</a></li>
<li><a href="#freeswitchtrunklibseslsrcincludeesl_eventh">freeswitch/trunk/libs/esl/src/include/esl_event.h</a></li>
<li><a href="#freeswitchtrunksrcincludeswitch_eventh">freeswitch/trunk/src/include/switch_event.h</a></li>
<li><a href="#freeswitchtrunksrcmodevent_handlersmod_event_socketmod_event_socketc">freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c</a></li>
<li><a href="#freeswitchtrunksrcswitch_eventc">freeswitch/trunk/src/switch_event.c</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunklibseslsrcesl_eventc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/esl/src/esl_event.c (16526 => 16527)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/esl/src/esl_event.c 2010-01-27 22:27:26 UTC (rev 16526)
+++ freeswitch/trunk/libs/esl/src/esl_event.c 2010-01-28 01:00:04 UTC (rev 16527)
</span><span class="lines">@@ -254,7 +254,7 @@
</span><span class="cx"> return (event ? event->body : NULL);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-ESL_DECLARE(esl_status_t) esl_event_del_header(esl_event_t *event, const char *header_name)
</del><ins>+ESL_DECLARE(esl_status_t) esl_event_del_header_val(esl_event_t *event, const char *header_name, const char *val)
</ins><span class="cx"> {
</span><span class="cx"> esl_event_header_t *hp, *lp = NULL, *tp;
</span><span class="cx"> esl_status_t status = ESL_FAIL;
</span><span class="lines">@@ -271,7 +271,7 @@
</span><span class="cx"> esl_assert(x < 1000);
</span><span class="cx"> hash = esl_ci_hashfunc_default(header_name, &hlen);
</span><span class="cx">
</span><del>- if (hp->name && (!hp->hash || hash == hp->hash) && !strcasecmp(header_name, hp->name)) {
</del><ins>+ if (hp->name && (!hp->hash || hash == hp->hash) && !strcasecmp(header_name, hp->name) && (esl_strlen_zero(val) || !strcmp(hp->value, val))) {
</ins><span class="cx"> if (lp) {
</span><span class="cx"> lp->next = hp->next;
</span><span class="cx"> } else {
</span></span></pre></div>
<a id="freeswitchtrunklibseslsrcincludeesl_eventh"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/esl/src/include/esl_event.h (16526 => 16527)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/esl/src/include/esl_event.h 2010-01-27 22:27:26 UTC (rev 16526)
+++ freeswitch/trunk/libs/esl/src/include/esl_event.h 2010-01-28 01:00:04 UTC (rev 16527)
</span><span class="lines">@@ -226,7 +226,8 @@
</span><span class="cx"> */
</span><span class="cx"> ESL_DECLARE(esl_status_t) esl_event_add_header_string(esl_event_t *event, esl_stack_t stack, const char *header_name, const char *data);
</span><span class="cx">
</span><del>-ESL_DECLARE(esl_status_t) esl_event_del_header(esl_event_t *event, const char *header_name);
</del><ins>+ESL_DECLARE(esl_status_t) esl_event_del_header_val(esl_event_t *event, const char *header_name, const char *var);
+#define esl_event_del_header(_e, _h) esl_event_del_header_val(_e, _h, NULL)
</ins><span class="cx">
</span><span class="cx"> /*!
</span><span class="cx"> \brief Destroy an event
</span></span></pre></div>
<a id="freeswitchtrunksrcincludeswitch_eventh"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/include/switch_event.h (16526 => 16527)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/include/switch_event.h 2010-01-27 22:27:26 UTC (rev 16526)
+++ freeswitch/trunk/src/include/switch_event.h 2010-01-28 01:00:04 UTC (rev 16527)
</span><span class="lines">@@ -182,7 +182,8 @@
</span><span class="cx"> */
</span><span class="cx"> SWITCH_DECLARE(switch_status_t) switch_event_add_header_string(switch_event_t *event, switch_stack_t stack, const char *header_name, const char *data);
</span><span class="cx">
</span><del>-SWITCH_DECLARE(switch_status_t) switch_event_del_header(switch_event_t *event, const char *header_name);
</del><ins>+SWITCH_DECLARE(switch_status_t) switch_event_del_header_val(switch_event_t *event, const char *header_name, const char *val);
+#define switch_event_del_header(_e, _h) switch_event_del_header_val(_e, _h, NULL)
</ins><span class="cx">
</span><span class="cx"> /*!
</span><span class="cx"> \brief Destroy an event
</span></span></pre></div>
<a id="freeswitchtrunksrcmodevent_handlersmod_event_socketmod_event_socketc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c (16526 => 16527)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c 2010-01-27 22:27:26 UTC (rev 16526)
+++ freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c 2010-01-28 01:00:04 UTC (rev 16527)
</span><span class="lines">@@ -1705,36 +1705,44 @@
</span><span class="cx">
</span><span class="cx"> if (!strncasecmp(cmd, "filter ", 7)) {
</span><span class="cx"> char *header_name = cmd + 7;
</span><del>- char *header_val;
</del><ins>+ char *header_val = NULL;
</ins><span class="cx">
</span><span class="cx"> strip_cr(header_name);
</span><span class="cx">
</span><span class="cx"> while(header_name && *header_name && *header_name == ' ') header_name++;
</span><span class="cx">
</span><del>- if (!(header_val = strchr(header_name, ' '))) {
- switch_snprintf(reply, reply_len, "-ERR invalid syntax");
- goto done;
</del><ins>+ if ((header_val = strchr(header_name, ' '))) {
+ *header_val++ = '\0';
</ins><span class="cx"> }
</span><del>-
- *header_val++ = '\0';
-
-
</del><ins>+
</ins><span class="cx"> switch_mutex_lock(listener->filter_mutex);
</span><span class="cx"> if (!listener->filters) {
</span><span class="cx"> switch_event_create_plain(&listener->filters, SWITCH_EVENT_CHANNEL_DATA);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!strcasecmp(header_name, "delete")) {
</span><del>- if (!strcasecmp(header_val, "all")) {
</del><ins>+ header_name = header_val;
+ if ((header_val = strchr(header_name, ' '))) {
+ *header_val++ = '\0';
+ }
+ if (!strcasecmp(header_name, "all")) {
</ins><span class="cx"> switch_event_destroy(&listener->filters);
</span><span class="cx"> switch_event_create_plain(&listener->filters, SWITCH_EVENT_CHANNEL_DATA);
</span><span class="cx"> } else {
</span><del>- switch_event_del_header(listener->filters, header_val);
</del><ins>+ switch_event_del_header_val(listener->filters, header_name, header_val);
</ins><span class="cx"> }
</span><del>- switch_snprintf(reply, reply_len, "+OK filter deleted. [%s]", header_val);
- } else {
</del><ins>+ switch_snprintf(reply, reply_len, "+OK filter deleted. [%s][%s]", header_name, switch_str_nil(header_val));
+ } else if (header_val) {
+ if (!strcasecmp(header_name, "add")) {
+ header_name = header_val;
+ if ((header_val = strchr(header_name, ' '))) {
+ *header_val++ = '\0';
+ }
+ }
</ins><span class="cx"> switch_event_add_header_string(listener->filters, SWITCH_STACK_BOTTOM, header_name, header_val);
</span><span class="cx"> switch_snprintf(reply, reply_len, "+OK filter added. [%s]=[%s]", header_name, header_val);
</span><ins>+ } else {
+ switch_snprintf(reply, reply_len, "-ERR invalid syntax");
</ins><span class="cx"> }
</span><span class="cx"> switch_mutex_unlock(listener->filter_mutex);
</span><span class="cx">
</span></span></pre></div>
<a id="freeswitchtrunksrcswitch_eventc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/switch_event.c (16526 => 16527)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/switch_event.c 2010-01-27 22:27:26 UTC (rev 16526)
+++ freeswitch/trunk/src/switch_event.c 2010-01-28 01:00:04 UTC (rev 16527)
</span><span class="lines">@@ -697,7 +697,7 @@
</span><span class="cx"> return (event ? event->body : NULL);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-SWITCH_DECLARE(switch_status_t) switch_event_del_header(switch_event_t *event, const char *header_name)
</del><ins>+SWITCH_DECLARE(switch_status_t) switch_event_del_header_val(switch_event_t *event, const char *header_name, const char *val)
</ins><span class="cx"> {
</span><span class="cx"> switch_event_header_t *hp, *lp = NULL, *tp;
</span><span class="cx"> switch_status_t status = SWITCH_STATUS_FALSE;
</span><span class="lines">@@ -714,7 +714,7 @@
</span><span class="cx"> switch_assert(x < 1000);
</span><span class="cx"> hash = switch_ci_hashfunc_default(header_name, &hlen);
</span><span class="cx">
</span><del>- if ((!hp->hash || hash == hp->hash) && !strcasecmp(header_name, hp->name)) {
</del><ins>+ if ((!hp->hash || hash == hp->hash) && !strcasecmp(header_name, hp->name) && (zstr(val) || !strcmp(hp->value, val))) {
</ins><span class="cx"> if (lp) {
</span><span class="cx"> lp->next = hp->next;
</span><span class="cx"> } else {
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>