<!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][15572] </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=15572">15572</a></dd>
<dt>Author</dt> <dd>mrene</dd>
<dt>Date</dt> <dd>2009-11-20 11:29:59 -0600 (Fri, 20 Nov 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>add mod_blacklist to contrib directory</pre>
<h3>Added Paths</h3>
<ul>
<li>freeswitch/trunk/contrib/mrene/mod_blacklist/</li>
<li><a href="#freeswitchtrunkcontribmrenemod_blacklistMakefile">freeswitch/trunk/contrib/mrene/mod_blacklist/Makefile</a></li>
<li><a href="#freeswitchtrunkcontribmrenemod_blacklistREADME">freeswitch/trunk/contrib/mrene/mod_blacklist/README</a></li>
<li><a href="#freeswitchtrunkcontribmrenemod_blacklistmod_blacklistc">freeswitch/trunk/contrib/mrene/mod_blacklist/mod_blacklist.c</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunkcontribmrenemod_blacklistMakefile"></a>
<div class="addfile"><h4>Added: freeswitch/trunk/contrib/mrene/mod_blacklist/Makefile (0 => 15572)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/mrene/mod_blacklist/Makefile         (rev 0)
+++ freeswitch/trunk/contrib/mrene/mod_blacklist/Makefile        2009-11-20 17:29:59 UTC (rev 15572)
</span><span class="lines">@@ -0,0 +1,2 @@
</span><ins>+BASE=../../../..
+include $(BASE)/build/modmake.rules
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="freeswitchtrunkcontribmrenemod_blacklistREADME"></a>
<div class="addfile"><h4>Added: freeswitch/trunk/contrib/mrene/mod_blacklist/README (0 => 15572)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/mrene/mod_blacklist/README         (rev 0)
+++ freeswitch/trunk/contrib/mrene/mod_blacklist/README        2009-11-20 17:29:59 UTC (rev 15572)
</span><span class="lines">@@ -0,0 +1,3 @@
</span><ins>+Move to mod/applications/
+Add to modules.conf
+make mod_blacklist-install
</ins></span></pre></div>
<a id="freeswitchtrunkcontribmrenemod_blacklistmod_blacklistc"></a>
<div class="addfile"><h4>Added: freeswitch/trunk/contrib/mrene/mod_blacklist/mod_blacklist.c (0 => 15572)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/mrene/mod_blacklist/mod_blacklist.c         (rev 0)
+++ freeswitch/trunk/contrib/mrene/mod_blacklist/mod_blacklist.c        2009-11-20 17:29:59 UTC (rev 15572)
</span><span class="lines">@@ -0,0 +1,279 @@
</span><ins>+/*
+ * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
+ * Copyright (C) 2005-2009, Anthony Minessale II <anthm@freeswitch.org>
+ *
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
+ *
+ * The Initial Developer of the Original Code is
+ * Anthony Minessale II <anthm@freeswitch.org>
+ * Portions created by the Initial Developer are Copyright (C)
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * Mathieu Rene <mrene@avgs.ca>
+ *
+ * mod_blacklist.c -- Blacklist module
+ *
+ */
+#include <switch.h>
+
+/* Prototypes */
+SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_blacklist_shutdown);
+SWITCH_MODULE_RUNTIME_FUNCTION(mod_blacklist_runtime);
+SWITCH_MODULE_LOAD_FUNCTION(mod_blacklist_load);
+
+
+SWITCH_MODULE_DEFINITION(mod_blacklist, mod_blacklist_load, mod_blacklist_shutdown, NULL);
+
+typedef struct {
+        switch_hash_t *list;
+        switch_mutex_t *list_mutex;
+        switch_memory_pool_t *pool;
+} blacklist_t;
+
+static struct {
+        switch_hash_t *lists;
+        switch_mutex_t *lists_mutex;
+        switch_memory_pool_t *pool;
+} globals;
+
+blacklist_t *blacklist_create(const char *name)
+{
+        switch_memory_pool_t *pool = NULL;
+        blacklist_t *bl = NULL;
+        
+        switch_core_new_memory_pool(&pool);
+        bl = switch_core_alloc(pool, sizeof(*bl));
+        switch_assert(bl);
+        bl->pool = pool;
+        
+        switch_core_hash_init(&bl->list, pool);
+        switch_mutex_init(&bl->list_mutex, SWITCH_MUTEX_NESTED, pool);
+        
+        return bl;
+}
+
+void blacklist_free(blacklist_t *bl)
+{
+        switch_core_destroy_memory_pool(&bl->pool);
+}
+
+
+void trim(char *string)
+{
+        char *p;
+        if ((p = strchr(string, '\n'))) {
+                *p = '\0';
+        }
+        if ((p = strchr(string, '\r'))) {
+                *p = '\0';
+        }
+}
+
+static switch_status_t load_list(const char *name, const char *filename)
+{
+        FILE *f;
+        blacklist_t *bl = blacklist_create(name);
+        /* Create a hashtable + mutex for that list */
+        
+        if ((f = fopen(filename, "r"))) {
+                char buf[1024] = {0};
+                while (fgets(buf, 1024, f)) {
+                        trim(buf);
+                        switch_core_hash_insert(bl->list, buf, (void*)SWITCH_TRUE);
+                }
+        } else {
+                switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Couldn't open [%s] to load list [%s]\n", filename, name);
+                return SWITCH_STATUS_FALSE;
+        }
+        
+        switch_core_hash_insert(globals.lists, name, bl);
+        switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Loaded list [%s]\n", name);
+        
+        
+        return SWITCH_STATUS_SUCCESS;
+}
+
+static switch_status_t do_config(switch_bool_t reload)
+{
+        /* Load up blacklists */
+        switch_xml_t xml, cfg, lists, list;
+        switch_hash_index_t *hi;
+        
+        if (!(xml = switch_xml_open_cfg("mod_blacklist.conf", &cfg, NULL))) {
+                switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Couldn't load configuration section\n");
+                return SWITCH_STATUS_FALSE;
+        }
+        
+        switch_mutex_lock(globals.lists_mutex);
+        
+        /* Destroy any active lists */
+        while ((hi = switch_hash_first(NULL, globals.lists))) {
+                const void *key;
+                void *val;
+                switch_hash_this(hi, &key, NULL, &val);
+                blacklist_free((blacklist_t*)val);
+                switch_core_hash_delete(globals.lists, (const char*)key);
+        }
+        
+        if ((lists = switch_xml_child(cfg, "lists"))) {
+                for (list = switch_xml_child(lists, "list"); list; list = list->next) {
+                        const char *name = switch_xml_attr_soft(list, "name");
+                        const char *filename = switch_xml_attr_soft(list, "filename");
+                        
+                        if (name && filename) {
+                                load_list(name, filename);
+                        }
+                }
+        }
+        
+        switch_mutex_unlock(globals.lists_mutex);
+        
+        if (xml) {
+                switch_xml_free(xml);
+                xml = NULL;
+        }
+
+        return SWITCH_STATUS_SUCCESS;
+}
+
+SWITCH_STANDARD_API(blacklist_api_function)
+{
+        char *data;
+        int argc;
+        char *argv[3];
+        
+        data = strdup(cmd);
+        trim(data);
+        if (!(argc = switch_separate_string(data, ' ', argv, (sizeof(argv) / sizeof(argv[0]))))) {
+                switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid usage\n");
+                goto done;
+        }
+        
+        if (!strcasecmp(argv[0], "check")) {
+                blacklist_t *bl = NULL;
+                switch_bool_t result;
+                
+                if (argc < 2 || zstr(argv[1]) || zstr(argv[2])) {
+                        switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Wrong syntax");
+                        goto done;
+                }
+                
+                switch_mutex_lock(globals.lists_mutex);
+                bl = switch_core_hash_find(globals.lists, argv[1]);
+                switch_mutex_unlock(globals.lists_mutex);
+                
+                if (!bl) {
+                        switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Unknown blacklist [%s]\n", argv[1]);
+                        stream->write_function(stream, "false");
+                        goto done;
+                }
+                
+                switch_mutex_lock(bl->list_mutex);
+                result = (switch_bool_t)(intptr_t)switch_core_hash_find(bl->list, argv[2]);
+                stream->write_function(stream, "%s", result ? "true" : "false");
+                switch_mutex_unlock(bl->list_mutex);
+        } else if (!strcasecmp(argv[0], "add")) {
+                blacklist_t *bl = NULL;
+                if (argc < 2 || zstr(argv[1]) || zstr(argv[2])) {
+                        switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Wrong syntax");
+                        goto done;
+                }
+                
+                switch_mutex_lock(globals.lists_mutex);
+                bl = switch_core_hash_find(globals.lists, argv[1]);
+                switch_mutex_unlock(globals.lists_mutex);
+                
+                if (!bl) {
+                        switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Unknown blacklist [%s]\n", argv[1]);
+                        stream->write_function(stream, "-ERR Unknown blacklist\n");
+                        goto done;
+                }
+                
+                switch_mutex_lock(bl->list_mutex);
+                switch_core_hash_insert(bl->list, argv[2], (void*)SWITCH_TRUE);
+                switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Added [%s] to list [%s]\n", argv[2], argv[1]);
+                switch_mutex_unlock(bl->list_mutex);
+                stream->write_function(stream, "+OK\n");
+        } else if (!strcasecmp(argv[0], "del")) {
+                        blacklist_t *bl = NULL;
+                if (argc < 2 || zstr(argv[1]) || zstr(argv[2])) {
+                        switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Wrong syntax");
+                        goto done;
+                }
+                
+                switch_mutex_lock(globals.lists_mutex);
+                bl = switch_core_hash_find(globals.lists, argv[1]);
+                switch_mutex_unlock(globals.lists_mutex);
+                
+                if (!bl) {
+                        switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Unknown blacklist [%s]\n", argv[1]);
+                        stream->write_function(stream, "-ERR Unknown blacklist\n");
+                        goto done;
+                }
+                
+                switch_mutex_lock(bl->list_mutex);
+                switch_core_hash_insert(bl->list, argv[2], NULL);
+                switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Removed [%s] from list [%s]\n", argv[2], argv[1]);
+                switch_mutex_unlock(bl->list_mutex);
+                stream->write_function(stream, "+OK\n");
+        } else if (!strcasecmp(argv[0], "reload")) {
+                do_config(SWITCH_TRUE);
+                stream->write_function(stream, "+OK\n");
+        }
+        
+done:
+        switch_safe_free(data);
+        return SWITCH_STATUS_SUCCESS;
+}
+
+
+SWITCH_MODULE_LOAD_FUNCTION(mod_blacklist_load)
+{
+        switch_api_interface_t *api_interface;
+        //switch_application_interface_t *app_interface;
+        /* connect my internal structure to the blank pointer passed to me */
+        *module_interface = switch_loadable_module_create_module_interface(pool, modname);
+        
+        memset(&globals, 0, sizeof(globals));
+        globals.pool = pool;
+
+        switch_core_hash_init(&globals.lists, globals.pool);
+        switch_mutex_init(&globals.lists_mutex, SWITCH_MUTEX_NESTED, globals.pool);
+
+        do_config(SWITCH_FALSE);
+
+        SWITCH_ADD_API(api_interface, "blacklist", "Control blacklists", blacklist_api_function, "");
+
+        return SWITCH_STATUS_SUCCESS;
+}
+
+SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_blacklist_shutdown)
+{
+        return SWITCH_STATUS_SUCCESS;
+}
+
+
+/* For Emacs:
+ * Local Variables:
+ * mode:c
+ * indent-tabs-mode:t
+ * tab-width:4
+ * c-basic-offset:4
+ * End:
+ * For VIM:
+ * vim:set softtabstop=4 shiftwidth=4 tabstop=4
+ */
</ins></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>