- Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r12996 - freeswitch/trunk/src/mod/applications/mod_cidlookup
by FreeSWITCH SVN 11 Apr '09

11 Apr '09

Author: rupa Date: Fri Apr 10 23:04:24 2009 New Revision: 12996 Log: remove CURL conditionals -- it'll always be there Modified: freeswitch/trunk/src/mod/applications/mod_cidlookup/mod_cidlookup.c Modified: freeswitch/trunk/src/mod/applications/mod_cidlookup/mod_cidlookup.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_cidlookup/mod_cidlookup.c (original) +++ freeswitch/trunk/src/mod/applications/mod_cidlookup/mod_cidlookup.c Fri Apr 10 23:04:24 2009 @@ -32,18 +32,11 @@ * */ -/* ok, what is the right way to conditionally compile CURL? */ -#ifndef HAVE_CURL -#define HAVE_CURL -#endif - #include <switch.h> #ifdef SWITCH_HAVE_ODBC #include <switch_odbc.h> #endif -#ifdef HAVE_CURL #include <curl/curl.h> -#endif /* Prototypes */ SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_cidlookup_shutdown); @@ -188,12 +181,6 @@ return SWITCH_STATUS_GENERR; } -#ifndef HAVE_CURL - if (globals.url) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No LIBCURL - compile with LIBCURL or remove url param\n"); - return SWITCH_STATUS_GENERR; - } -#endif return SWITCH_STATUS_SUCCESS; } @@ -305,7 +292,6 @@ return success; } -#ifdef HAVE_CURL static size_t file_callback(void *ptr, size_t size, size_t nmemb, void *data) { register unsigned int realsize = (unsigned int) (size * nmemb); @@ -375,7 +361,6 @@ switch_safe_free(http_data.stream.data); return name; } -#endif #ifdef SWITCH_HAVE_ODBC static char *do_db_lookup(switch_memory_pool_t *pool, switch_core_session_t *session, switch_event_t *event, const char *num) { @@ -415,14 +400,12 @@ name = do_db_lookup(pool, session, event, number); } #endif -#ifdef HAVE_CURL if (!name && globals.url) { name = do_lookup_url(pool, session, event, number); if (globals.cache && name) { set_cache(pool, number, name); } } -#endif return name; } @@ -464,15 +447,10 @@ stream->write_function(stream, " odbc-dsn: %s\n sql: %s\n", globals.odbc_dsn, globals.sql); -#ifdef HAVE_CURL - stream->write_function(stream, " LIBCURL: true"); -#else - stream->write_function(stream, " LIBCURL: false"); -#endif #ifdef SWITCH_HAVE_ODBC - stream->write_function(stream, " ODBC: true"); + stream->write_function(stream, " ODBC Compiled: true\n"); #else - stream->write_function(stream, " ODBC: false"); + stream->write_function(stream, " ODBC Compiled: false\n"); #endif switch_goto_status(SWITCH_STATUS_SUCCESS, done);

1 0

[commit] r12995 - freeswitch/trunk/src/mod/applications/mod_cidlookup
by FreeSWITCH SVN 11 Apr '09

11 Apr '09

Author: rupa Date: Fri Apr 10 22:49:42 2009 New Revision: 12995 Log: conditionally compile ODBC framework in place to conditionally compile with CURL but what is the master switch? Modified: freeswitch/trunk/src/mod/applications/mod_cidlookup/Makefile freeswitch/trunk/src/mod/applications/mod_cidlookup/mod_cidlookup.c Modified: freeswitch/trunk/src/mod/applications/mod_cidlookup/Makefile ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_cidlookup/Makefile (original) +++ freeswitch/trunk/src/mod/applications/mod_cidlookup/Makefile Fri Apr 10 22:49:42 2009 @@ -1,31 +1,5 @@ -MEMCACHED=libmemcached-0.27 -switch_srcdir=../../../.. - WANT_CURL=yes -MEMCACHED_DIR=$(switch_srcdir)/libs/$(MEMCACHED) - -MEMCACHEDLA=$(MEMCACHED_DIR)/libmemcached/libmemcached.la - -LOCAL_CFLAGS=-I$(MEMCACHED_DIR) -LOCAL_LIBADD=$(MEMCACHEDLA) - -include $(switch_srcdir)/build/modmake.rules - -DEFAULT_ARGS=--prefix=$(PREFIX) --disable-shared --with-pic - -$(LOCAL_OBJS): $(LOCAL_SOURCES) - -$(MEMCACHED_DIR): - $(GETLIB) $(MEMCACHED).tar.gz - -$(MEMCACHED_DIR)/Makefile: $(MEMCACHED_DIR) - cd $(MEMCACHED_DIR) && CFLAGS=$(AM_CFLAGS) CC=$(CC) CXX=$(CXX) ./configure --disable-shared --with-pic CPPFLAGS= LDFLAGS= - $(TOUCH_TARGET) - -$(MEMCACHEDLA): $(MEMCACHED_DIR)/Makefile - cd $(MEMCACHED_DIR) && $(MAKE) - $(TOUCH_TARGET) - - - +BASE=../../../.. +include $(BASE)/build/modmake.rules +LOCAL_CFLAGS += `if test -f $(BASE)/.libs/libfreeswitch_la-switch_odbc.o ; then echo -DSWITCH_HAVE_ODBC; fi ;` Modified: freeswitch/trunk/src/mod/applications/mod_cidlookup/mod_cidlookup.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_cidlookup/mod_cidlookup.c (original) +++ freeswitch/trunk/src/mod/applications/mod_cidlookup/mod_cidlookup.c Fri Apr 10 22:49:42 2009 @@ -31,9 +31,19 @@ * mod_cidlookup.c -- API for querying cid->name services * */ + +/* ok, what is the right way to conditionally compile CURL? */ +#ifndef HAVE_CURL +#define HAVE_CURL +#endif + #include <switch.h> +#ifdef SWITCH_HAVE_ODBC #include <switch_odbc.h> +#endif +#ifdef HAVE_CURL #include <curl/curl.h> +#endif /* Prototypes */ SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_cidlookup_shutdown); @@ -56,12 +66,20 @@ char *odbc_dsn; char *sql; +#ifdef SWITCH_HAVE_ODBC switch_mutex_t *db_mutex; - switch_odbc_handle_t *master_odbc; +#else + void *filler1; +#endif switch_memory_pool_t *pool; - +#ifdef SWITCH_HAVE_ODBC + switch_odbc_handle_t *master_odbc; +#else + void *filler2; +#endif } globals; +#ifdef SWITCH_HAVE_ODBC struct odbc_obj { switch_odbc_handle_t *handle; SQLHSTMT stmt; @@ -73,6 +91,7 @@ typedef struct odbc_obj odbc_obj_t; typedef odbc_obj_t *odbc_handle; +#endif struct http_data { switch_stream_handle_t stream; @@ -94,6 +113,7 @@ static switch_status_t config_callback_dsn(switch_xml_config_item_t *data, switch_config_callback_type_t callback_type, switch_bool_t changed) { switch_status_t status = SWITCH_STATUS_SUCCESS; +#ifdef SWITCH_HAVE_ODBC char *odbc_user = NULL; char *odbc_pass = NULL; @@ -136,8 +156,12 @@ /* and swap in new connection */ globals.master_odbc = odbc; } - + switch_goto_status(SWITCH_STATUS_SUCCESS, done); +#else + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "ODBC is not compiled in. Do not configure odbc-dsn parameter!\n"); + switch_goto_status(SWITCH_STATUS_FALSE, done); +#endif done: if (globals.db_mutex) { @@ -164,7 +188,12 @@ return SWITCH_STATUS_GENERR; } - +#ifndef HAVE_CURL + if (globals.url) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No LIBCURL - compile with LIBCURL or remove url param\n"); + return SWITCH_STATUS_GENERR; + } +#endif return SWITCH_STATUS_SUCCESS; } @@ -174,6 +203,7 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "cidlookup Reloaded\n"); } +#ifdef SWITCH_HAVE_ODBC static switch_bool_t cidlookup_execute_sql_callback(char *sql, switch_core_db_callback_func_t callback, void *pdata) { switch_bool_t retval = SWITCH_FALSE; @@ -207,6 +237,7 @@ return SWITCH_STATUS_SUCCESS; } +#endif /* make a new string with digits only */ static char *string_digitsonly(switch_memory_pool_t *pool, const char *str) @@ -274,6 +305,7 @@ return success; } +#ifdef HAVE_CURL static size_t file_callback(void *ptr, size_t size, size_t nmemb, void *data) { register unsigned int realsize = (unsigned int) (size * nmemb); @@ -343,7 +375,9 @@ switch_safe_free(http_data.stream.data); return name; } +#endif +#ifdef SWITCH_HAVE_ODBC static char *do_db_lookup(switch_memory_pool_t *pool, switch_core_session_t *session, switch_event_t *event, const char *num) { char *name = NULL; char *newsql = NULL; @@ -364,6 +398,7 @@ } return name; } +#endif static char *do_lookup(switch_memory_pool_t *pool, switch_core_session_t *session, switch_event_t *event, const char *num) { char *number = NULL; @@ -375,16 +410,19 @@ if (globals.cache) { name = check_cache(pool, number); } +#ifdef SWITCH_HAVE_ODBC if (!name && globals.master_odbc && globals.sql) { name = do_db_lookup(pool, session, event, number); } +#endif +#ifdef HAVE_CURL if (!name && globals.url) { name = do_lookup_url(pool, session, event, number); if (globals.cache && name) { set_cache(pool, number, name); } } - +#endif return name; } @@ -426,6 +464,16 @@ stream->write_function(stream, " odbc-dsn: %s\n sql: %s\n", globals.odbc_dsn, globals.sql); +#ifdef HAVE_CURL + stream->write_function(stream, " LIBCURL: true"); +#else + stream->write_function(stream, " LIBCURL: false"); +#endif +#ifdef SWITCH_HAVE_ODBC + stream->write_function(stream, " ODBC: true"); +#else + stream->write_function(stream, " ODBC: false"); +#endif switch_goto_status(SWITCH_STATUS_SUCCESS, done); } @@ -463,11 +511,13 @@ globals.pool = pool; +#ifdef SWITCH_HAVE_ODBC if (!globals.db_mutex) { if (switch_mutex_init(&globals.db_mutex, SWITCH_MUTEX_UNNESTED, globals.pool) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "failed to initialize db_mutex\n"); } } +#endif do_config(SWITCH_FALSE); @@ -488,9 +538,15 @@ SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_cidlookup_shutdown) { /* Cleanup dynamically allocated config settings */ - switch_mutex_destroy(globals.db_mutex); - switch_odbc_handle_disconnect(globals.master_odbc); - switch_odbc_handle_destroy(&globals.master_odbc); +#ifdef SWITCH_HAVE_ODBC + if (globals.db_mutex) { + switch_mutex_destroy(globals.db_mutex); + } + if (globals.master_odbc) { + switch_odbc_handle_disconnect(globals.master_odbc); + switch_odbc_handle_destroy(&globals.master_odbc); + } +#endif switch_event_unbind(&reload_xml_event); return SWITCH_STATUS_SUCCESS; }

1 0

[commit] r12994 - freeswitch/trunk/conf/autoload_configs
by FreeSWITCH SVN 11 Apr '09

11 Apr '09

Author: rupa Date: Fri Apr 10 22:14:17 2009 New Revision: 12994 Log: config file Added: freeswitch/trunk/conf/autoload_configs/cidlookup.conf.xml Added: freeswitch/trunk/conf/autoload_configs/cidlookup.conf.xml ============================================================================== --- (empty file) +++ freeswitch/trunk/conf/autoload_configs/cidlookup.conf.xml Fri Apr 10 22:14:17 2009 @@ -0,0 +1,15 @@ +<configuration name="cidlookup.conf" description="cidlookup Configuration"> + <settings> + <param name="url" value="http://query.voipcnam.com/query.php?api_key=MYAPIKEY&number=${caller_id_num…"/> + <param name="cache" value="true"/> + <param name="cache-expire" value="86400"/> + + <param name="odbc-dsn" value="phone:phone:phone"/> + <param name="sql" value=" +SELECT name||' ('||type||')' AS name + FROM phonebook p JOIN numbers n ON p.id = n.phonebook_id + WHERE n.number='${caller_id_number}' + LIMIT 1 + "/> + </settings> +</configuration>

1 0

[commit] r12993 - freeswitch/trunk/src/mod/applications/mod_cidlookup
by FreeSWITCH SVN 11 Apr '09

11 Apr '09

Author: rupa Date: Fri Apr 10 22:12:52 2009 New Revision: 12993 Log: all components are now (runtime) optional no ifdefs for curl and odbc yet Modified: freeswitch/trunk/src/mod/applications/mod_cidlookup/mod_cidlookup.c Modified: freeswitch/trunk/src/mod/applications/mod_cidlookup/mod_cidlookup.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_cidlookup/mod_cidlookup.c (original) +++ freeswitch/trunk/src/mod/applications/mod_cidlookup/mod_cidlookup.c Fri Apr 10 22:12:52 2009 @@ -49,11 +49,11 @@ static struct { char *url; + switch_bool_t cache; int cache_expire; char *odbc_dsn; - switch_status_t db_overide; char *sql; switch_mutex_t *db_mutex; @@ -149,11 +149,10 @@ static switch_xml_config_string_options_t config_opt_dsn = {NULL, 0, NULL}; /* anything is ok here */ static switch_xml_config_item_t instructions[] = { /* parameter name type reloadable pointer default value options structure */ - SWITCH_CONFIG_ITEM_STRING_STRDUP("url", CONFIG_REQUIRED | CONFIG_RELOAD, &globals.url, NULL, "http://server.example.com/app?number=${caller_id_number}", "URL for the CID lookup service"), + SWITCH_CONFIG_ITEM_STRING_STRDUP("url", CONFIG_RELOAD, &globals.url, NULL, "http://server.example.com/app?number=${caller_id_number}", "URL for the CID lookup service"), SWITCH_CONFIG_ITEM("cache", SWITCH_CONFIG_BOOL, CONFIG_RELOAD, &globals.cache, SWITCH_FALSE, NULL, "true|false", "whether to cache via cidlookup"), SWITCH_CONFIG_ITEM("cache-expire", SWITCH_CONFIG_INT, CONFIG_RELOAD, &globals.cache_expire, (void *)300, NULL, "expire", "seconds to preserve num->name cache"), SWITCH_CONFIG_ITEM_STRING_STRDUP("sql", CONFIG_RELOAD, &globals.sql, NULL, "sql whre number=${caller_id_number}", "SQL to run if overriding CID"), - SWITCH_CONFIG_ITEM("db-overide", SWITCH_CONFIG_BOOL, CONFIG_RELOAD, &globals.db_overide, SWITCH_FALSE, NULL, "true|false", "whether to overide CID with local table"), SWITCH_CONFIG_ITEM_CALLBACK("odbc-dsn", SWITCH_CONFIG_STRING, CONFIG_RELOAD, &globals.odbc_dsn, NULL, config_callback_dsn, &config_opt_dsn, "db:user:passwd", "Database to use."), SWITCH_CONFIG_ITEM_END() @@ -249,6 +248,7 @@ } } + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "memcache: k:'%s', v:'%s'\n", cmd, (name) ? name : "(null)"); switch_safe_free(stream.data); return name; } @@ -260,6 +260,7 @@ SWITCH_STANDARD_STREAM(stream); cmd = switch_core_sprintf(pool, "set fs:cidlookup:%s '%s' %d", number, cid, globals.cache_expire); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "memcache: %s\n", cmd); if (switch_api_execute("memcache", cmd, NULL, &stream) == SWITCH_STATUS_SUCCESS) { if (strncmp("-ERR", stream.data, 4)) { @@ -291,7 +292,7 @@ return realsize; } -static char *do_lookup_real(switch_memory_pool_t *pool, switch_core_session_t *session, switch_event_t *event, const char *num) { +static char *do_lookup_url(switch_memory_pool_t *pool, switch_core_session_t *session, switch_event_t *event, const char *num) { char *name = NULL; char *newurl = NULL; @@ -310,7 +311,7 @@ newurl = switch_event_expand_headers(event, globals.url); - /* switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "cmd: %s\n", cmd); */ + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "url: %s\n", newurl); curl_handle = curl_easy_init(); if (!strncasecmp(newurl, "https", 5)) { @@ -343,13 +344,13 @@ return name; } -static char *do_dboveride(switch_memory_pool_t *pool, switch_core_session_t *session, switch_event_t *event, const char *num) { +static char *do_db_lookup(switch_memory_pool_t *pool, switch_core_session_t *session, switch_event_t *event, const char *num) { char *name = NULL; char *newsql = NULL; callback_t cbt = { 0 }; cbt.pool = pool; - if (globals.db_overide && globals.master_odbc) { + if (globals.master_odbc) { newsql = switch_event_expand_headers(event, globals.sql); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "SQL: %s\n", newsql); if (cidlookup_execute_sql_callback(newsql, cidlookup_callback, &cbt)) { @@ -374,11 +375,11 @@ if (globals.cache) { name = check_cache(pool, number); } - if (!name) { - name = do_dboveride(pool, session, event, number); + if (!name && globals.master_odbc && globals.sql) { + name = do_db_lookup(pool, session, event, number); } - if (!name) { - name = do_lookup_real(pool, session, event, number); + if (!name && globals.url) { + name = do_lookup_url(pool, session, event, number); if (globals.cache && name) { set_cache(pool, number, name); } @@ -422,8 +423,7 @@ (globals.cache) ? "true" : "false", globals.cache_expire); - stream->write_function(stream, " db-overide: %s\n dsn: %s\n sql: %s\n", - (globals.db_overide) ? "true" : "false", + stream->write_function(stream, " odbc-dsn: %s\n sql: %s\n", globals.odbc_dsn, globals.sql);

1 0

[commit] r12992 - freeswitch/trunk/src/mod/applications/mod_cidlookup
by FreeSWITCH SVN 11 Apr '09

11 Apr '09

Author: rupa Date: Fri Apr 10 21:45:22 2009 New Revision: 12992 Log: switch to using CURL instead of mod_http Modified: freeswitch/trunk/src/mod/applications/mod_cidlookup/mod_cidlookup.c Modified: freeswitch/trunk/src/mod/applications/mod_cidlookup/mod_cidlookup.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_cidlookup/mod_cidlookup.c (original) +++ freeswitch/trunk/src/mod/applications/mod_cidlookup/mod_cidlookup.c Fri Apr 10 21:45:22 2009 @@ -33,6 +33,7 @@ */ #include <switch.h> #include <switch_odbc.h> +#include <curl/curl.h> /* Prototypes */ SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_cidlookup_shutdown); @@ -73,6 +74,14 @@ typedef struct odbc_obj odbc_obj_t; typedef odbc_obj_t *odbc_handle; +struct http_data { + switch_stream_handle_t stream; + switch_size_t bytes; + switch_size_t max_bytes; + int err; +}; + + struct callback_obj { switch_memory_pool_t *pool; char *name; @@ -264,34 +273,73 @@ return success; } +static size_t file_callback(void *ptr, size_t size, size_t nmemb, void *data) +{ + register unsigned int realsize = (unsigned int) (size * nmemb); + struct http_data *http_data = data; + + http_data->bytes += realsize; + + if (http_data->bytes > http_data->max_bytes) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Oversized file detected [%d bytes]\n", (int)http_data->bytes); + http_data->err = 1; + return 0; + } + + http_data->stream.write_function( + &http_data->stream, "%.*s", realsize, ptr); + return realsize; +} + static char *do_lookup_real(switch_memory_pool_t *pool, switch_core_session_t *session, switch_event_t *event, const char *num) { - char *cmd = NULL; char *name = NULL; char *newurl = NULL; - switch_stream_handle_t stream = { 0 }; - SWITCH_STANDARD_STREAM(stream); + CURL *curl_handle = NULL; + long httpRes = 0; + char hostname[256] = ""; + + struct http_data http_data; - newurl = switch_event_expand_headers(event, globals.url); + memset(&http_data, 0, sizeof(http_data)); - cmd = switch_core_sprintf(pool, "GET '%s' '{}' '' bodyonly", newurl); + http_data.max_bytes = 1024; + SWITCH_STANDARD_STREAM(http_data.stream); + gethostname(hostname, sizeof(hostname)); + + newurl = switch_event_expand_headers(event, globals.url); + /* switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "cmd: %s\n", cmd); */ + curl_handle = curl_easy_init(); - if (switch_api_execute("http", cmd, NULL, &stream) == SWITCH_STATUS_SUCCESS) { - if (strncmp("-ERR", stream.data, 4) && - !switch_strlen_zero((char *)stream.data) && - strncmp(" ", stream.data, 1)) { /* some vendors give a single space for invalid */ - name = switch_core_strdup(pool, stream.data); - } else { - name = NULL; - } + if (!strncasecmp(newurl, "https", 5)) { + curl_easy_setopt(curl_handle, CURLOPT_SSL_VERIFYPEER, 0); + curl_easy_setopt(curl_handle, CURLOPT_SSL_VERIFYHOST, 0); + } + curl_easy_setopt(curl_handle, CURLOPT_POST, SWITCH_FALSE); + curl_easy_setopt(curl_handle, CURLOPT_FOLLOWLOCATION, 1); + curl_easy_setopt(curl_handle, CURLOPT_MAXREDIRS, 10); + curl_easy_setopt(curl_handle, CURLOPT_URL, newurl); + curl_easy_setopt(curl_handle, CURLOPT_WRITEFUNCTION, file_callback); + curl_easy_setopt(curl_handle, CURLOPT_WRITEDATA, (void *) &http_data); + curl_easy_setopt(curl_handle, CURLOPT_USERAGENT, "freeswitch-cidlookup/1.0"); + + curl_easy_perform(curl_handle); + curl_easy_getinfo(curl_handle, CURLINFO_RESPONSE_CODE, &httpRes); + curl_easy_cleanup(curl_handle); + + if ( http_data.stream.data && + !switch_strlen_zero((char *)http_data.stream.data) && + strcmp(" ", http_data.stream.data) ) { + + name = switch_core_strdup(pool, http_data.stream.data); } - switch_safe_free(stream.data); if (newurl != globals.url) { switch_safe_free(newurl); } + switch_safe_free(http_data.stream.data); return name; }

1 0

[commit] r12991 - freeswitch/trunk/docs/phrase
by FreeSWITCH SVN 10 Apr '09

10 Apr '09

Author: mcollins Date: Fri Apr 10 18:53:48 2009 New Revision: 12991 Log: conf-muted.wav ==> conf-muted.wav Modified: freeswitch/trunk/docs/phrase/phrase_en.xml Modified: freeswitch/trunk/docs/phrase/phrase_en.xml ============================================================================== --- freeswitch/trunk/docs/phrase/phrase_en.xml (original) +++ freeswitch/trunk/docs/phrase/phrase_en.xml Fri Apr 10 18:53:48 2009 @@ -221,7 +221,7 @@ <conference> <prompt phrase="NULL" filename="conf-ack.wav" type="tone"/> <prompt phrase="NULL" filename="conf-nack.wav" type="tone"/> - <prompt phrase="You are now muted." filename="conf-mute.wav"/> + <prompt phrase="You are now muted." filename="conf-muted.wav"/> <prompt phrase="You are now unmuted." filename="conf-unmuted.wav"/> <prompt phrase="You are currently the only person in this conference." filename="conf-alone.wav"/> <prompt phrase="NULL" filename="conf-perpetual.wav" type="music"/>

1 0

[commit] r12990 - freeswitch/trunk/src/mod/applications/mod_cidlookup
by FreeSWITCH SVN 10 Apr '09

10 Apr '09

Author: rupa Date: Fri Apr 10 17:01:23 2009 New Revision: 12990 Log: mod_cidlookup -- looks up cid via database, http api and stores result in memcache work in progress, but works for me :) Added: freeswitch/trunk/src/mod/applications/mod_cidlookup/ freeswitch/trunk/src/mod/applications/mod_cidlookup/Makefile freeswitch/trunk/src/mod/applications/mod_cidlookup/mod_cidlookup.c (contents, props changed) Added: freeswitch/trunk/src/mod/applications/mod_cidlookup/Makefile ============================================================================== --- (empty file) +++ freeswitch/trunk/src/mod/applications/mod_cidlookup/Makefile Fri Apr 10 17:01:23 2009 @@ -0,0 +1,31 @@ +MEMCACHED=libmemcached-0.27 +switch_srcdir=../../../.. + +WANT_CURL=yes + +MEMCACHED_DIR=$(switch_srcdir)/libs/$(MEMCACHED) + +MEMCACHEDLA=$(MEMCACHED_DIR)/libmemcached/libmemcached.la + +LOCAL_CFLAGS=-I$(MEMCACHED_DIR) +LOCAL_LIBADD=$(MEMCACHEDLA) + +include $(switch_srcdir)/build/modmake.rules + +DEFAULT_ARGS=--prefix=$(PREFIX) --disable-shared --with-pic + +$(LOCAL_OBJS): $(LOCAL_SOURCES) + +$(MEMCACHED_DIR): + $(GETLIB) $(MEMCACHED).tar.gz + +$(MEMCACHED_DIR)/Makefile: $(MEMCACHED_DIR) + cd $(MEMCACHED_DIR) && CFLAGS=$(AM_CFLAGS) CC=$(CC) CXX=$(CXX) ./configure --disable-shared --with-pic CPPFLAGS= LDFLAGS= + $(TOUCH_TARGET) + +$(MEMCACHEDLA): $(MEMCACHED_DIR)/Makefile + cd $(MEMCACHED_DIR) && $(MAKE) + $(TOUCH_TARGET) + + + Added: freeswitch/trunk/src/mod/applications/mod_cidlookup/mod_cidlookup.c ============================================================================== --- (empty file) +++ freeswitch/trunk/src/mod/applications/mod_cidlookup/mod_cidlookup.c Fri Apr 10 17:01:23 2009 @@ -0,0 +1,474 @@ +/* + * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application + * Copyright (C) 2005-2009, Anthony Minessale II <anthm(a)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(a)freeswitch.org> + * Portions created by the Initial Developer are Copyright (C) + * the Initial Developer. All Rights Reserved. + * + * Contributor(s): + * + * Rupa Schomaker <rupa(a)rupa.com> + * Anthony Minessale II <anthm(a)freeswitch.org> + * Neal Horman <neal at wanlink dot com> + * + * + * mod_cidlookup.c -- API for querying cid->name services + * + */ +#include <switch.h> +#include <switch_odbc.h> + +/* Prototypes */ +SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_cidlookup_shutdown); +SWITCH_MODULE_RUNTIME_FUNCTION(mod_cidlookup_runtime); +SWITCH_MODULE_LOAD_FUNCTION(mod_cidlookup_load); + +/* SWITCH_MODULE_DEFINITION(name, load, shutdown, runtime) + * Defines a switch_loadable_module_function_table_t and a static const char[] modname + */ +SWITCH_MODULE_DEFINITION(mod_cidlookup, mod_cidlookup_load, mod_cidlookup_shutdown, NULL); + +static char *SYNTAX = "cidlookup number"; + +static struct { + char *url; + switch_bool_t cache; + int cache_expire; + + char *odbc_dsn; + switch_status_t db_overide; + char *sql; + + switch_mutex_t *db_mutex; + switch_odbc_handle_t *master_odbc; + switch_memory_pool_t *pool; + +} globals; + +struct odbc_obj { + switch_odbc_handle_t *handle; + SQLHSTMT stmt; + SQLCHAR *colbuf; + int32_t cblen; + SQLCHAR *code; + int32_t codelen; +}; + +typedef struct odbc_obj odbc_obj_t; +typedef odbc_obj_t *odbc_handle; + +struct callback_obj { + switch_memory_pool_t *pool; + char *name; +}; +typedef struct callback_obj callback_t; + + +static switch_event_node_t *reload_xml_event = NULL; + +static switch_status_t config_callback_dsn(switch_xml_config_item_t *data, switch_config_callback_type_t callback_type, switch_bool_t changed) +{ + switch_status_t status = SWITCH_STATUS_SUCCESS; + char *odbc_user = NULL; + char *odbc_pass = NULL; + + switch_odbc_handle_t *odbc = NULL; + + if ((callback_type == CONFIG_LOAD || callback_type == CONFIG_RELOAD) && changed) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "dsn data: %s\n", globals.odbc_dsn); + } + + /* setup dsn */ + if (globals.odbc_dsn) { + if ((odbc_user = strchr(globals.odbc_dsn, ':'))) { + *odbc_user++ = '\0'; + if ((odbc_pass = strchr(odbc_user, ':'))) { + *odbc_pass++ = '\0'; + } + } + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Connecting to dsn: %s, %s, %s.\n", globals.odbc_dsn, odbc_user, odbc_pass); + + if (globals.db_mutex) { + switch_mutex_lock(globals.db_mutex); + } + + if (!(odbc = switch_odbc_handle_new(globals.odbc_dsn, odbc_user, odbc_pass))) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Cannot Open ODBC Database!\n"); + switch_goto_status(SWITCH_STATUS_FALSE, done); + } + if (switch_odbc_handle_connect(odbc) != SWITCH_ODBC_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Cannot Open ODBC Database!\n"); + switch_goto_status(SWITCH_STATUS_FALSE, done); + } + + /* ok, we have a new connection, tear down old one */ + if (globals.master_odbc) { + switch_odbc_handle_disconnect(globals.master_odbc); + switch_odbc_handle_destroy(&globals.master_odbc); + } + + /* and swap in new connection */ + globals.master_odbc = odbc; + } + + switch_goto_status(SWITCH_STATUS_SUCCESS, done); + +done: + if (globals.db_mutex) { + switch_mutex_unlock(globals.db_mutex); + } + return status; +} + +static switch_xml_config_string_options_t config_opt_dsn = {NULL, 0, NULL}; /* anything is ok here */ +static switch_xml_config_item_t instructions[] = { + /* parameter name type reloadable pointer default value options structure */ + SWITCH_CONFIG_ITEM_STRING_STRDUP("url", CONFIG_REQUIRED | CONFIG_RELOAD, &globals.url, NULL, "http://server.example.com/app?number=${caller_id_number}", "URL for the CID lookup service"), + SWITCH_CONFIG_ITEM("cache", SWITCH_CONFIG_BOOL, CONFIG_RELOAD, &globals.cache, SWITCH_FALSE, NULL, "true|false", "whether to cache via cidlookup"), + SWITCH_CONFIG_ITEM("cache-expire", SWITCH_CONFIG_INT, CONFIG_RELOAD, &globals.cache_expire, (void *)300, NULL, "expire", "seconds to preserve num->name cache"), + SWITCH_CONFIG_ITEM_STRING_STRDUP("sql", CONFIG_RELOAD, &globals.sql, NULL, "sql whre number=${caller_id_number}", "SQL to run if overriding CID"), + SWITCH_CONFIG_ITEM("db-overide", SWITCH_CONFIG_BOOL, CONFIG_RELOAD, &globals.db_overide, SWITCH_FALSE, NULL, "true|false", "whether to overide CID with local table"), + SWITCH_CONFIG_ITEM_CALLBACK("odbc-dsn", SWITCH_CONFIG_STRING, CONFIG_RELOAD, &globals.odbc_dsn, NULL, config_callback_dsn, &config_opt_dsn, + "db:user:passwd", "Database to use."), + SWITCH_CONFIG_ITEM_END() +}; + +static switch_status_t do_config(switch_bool_t reload) +{ + if (switch_xml_config_parse_module_settings("cidlookup.conf", reload, instructions) != SWITCH_STATUS_SUCCESS) { + return SWITCH_STATUS_GENERR; + } + + + return SWITCH_STATUS_SUCCESS; +} + +static void event_handler(switch_event_t *event) +{ + do_config(SWITCH_TRUE); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "cidlookup Reloaded\n"); +} + +static switch_bool_t cidlookup_execute_sql_callback(char *sql, switch_core_db_callback_func_t callback, void *pdata) +{ + switch_bool_t retval = SWITCH_FALSE; + + switch_mutex_lock(globals.db_mutex); + if (globals.odbc_dsn) { + if (switch_odbc_handle_callback_exec(globals.master_odbc, sql, callback, pdata) + == SWITCH_ODBC_FAIL) { + retval = SWITCH_FALSE; + } else { + retval = SWITCH_TRUE; + } + } + switch_mutex_unlock(globals.db_mutex); + return retval; +} + +static int cidlookup_callback(void *pArg, int argc, char **argv, char **columnNames) +{ + callback_t *cbt = (callback_t *) pArg; + switch_memory_pool_t *pool = cbt->pool; + + if (argc < 1) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, + "Unexpected number of columns returned for SQL. Returned column count: %d. ", + argc); + return SWITCH_STATUS_GENERR; + } + cbt->name = switch_core_strdup(pool, switch_str_nil(argv[0])); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Name: %s\n", cbt->name); + + return SWITCH_STATUS_SUCCESS; +} + +/* make a new string with digits only */ +static char *string_digitsonly(switch_memory_pool_t *pool, const char *str) +{ + char *p, *np, *newstr; + size_t len; + + p = (char *)str; + + len = strlen(str); + newstr = switch_core_alloc(pool, len+1); + np = newstr; + + while(*p) { + if (switch_isdigit(*p)) { + *np = *p; + np++; + } + p++; + } + *np = '\0'; + + return newstr; +} + +static char *check_cache(switch_memory_pool_t *pool, const char *number) { + char *cmd; + char *name; + switch_stream_handle_t stream = { 0 }; + + SWITCH_STANDARD_STREAM(stream); + cmd = switch_core_sprintf(pool, "get fs:cidlookup:%s", number); + + if (switch_api_execute("memcache", cmd, NULL, &stream) == SWITCH_STATUS_SUCCESS) { + if (strncmp("-ERR", stream.data, 4)) { + name = switch_core_strdup(pool, stream.data); + } else { + name = NULL; + } + } + + switch_safe_free(stream.data); + return name; +} + +switch_bool_t set_cache(switch_memory_pool_t *pool, const char *number, const char *cid) { + char *cmd; + switch_bool_t success; + switch_stream_handle_t stream = { 0 }; + + SWITCH_STANDARD_STREAM(stream); + cmd = switch_core_sprintf(pool, "set fs:cidlookup:%s '%s' %d", number, cid, globals.cache_expire); + + if (switch_api_execute("memcache", cmd, NULL, &stream) == SWITCH_STATUS_SUCCESS) { + if (strncmp("-ERR", stream.data, 4)) { + success = SWITCH_TRUE; + } else { + success = SWITCH_FALSE; + } + } + + switch_safe_free(stream.data); + return success; +} + +static char *do_lookup_real(switch_memory_pool_t *pool, switch_core_session_t *session, switch_event_t *event, const char *num) { + char *cmd = NULL; + char *name = NULL; + char *newurl = NULL; + switch_stream_handle_t stream = { 0 }; + + SWITCH_STANDARD_STREAM(stream); + + newurl = switch_event_expand_headers(event, globals.url); + + cmd = switch_core_sprintf(pool, "GET '%s' '{}' '' bodyonly", newurl); + + /* switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "cmd: %s\n", cmd); */ + + if (switch_api_execute("http", cmd, NULL, &stream) == SWITCH_STATUS_SUCCESS) { + if (strncmp("-ERR", stream.data, 4) && + !switch_strlen_zero((char *)stream.data) && + strncmp(" ", stream.data, 1)) { /* some vendors give a single space for invalid */ + name = switch_core_strdup(pool, stream.data); + } else { + name = NULL; + } + } + + switch_safe_free(stream.data); + if (newurl != globals.url) { + switch_safe_free(newurl); + } + return name; +} + +static char *do_dboveride(switch_memory_pool_t *pool, switch_core_session_t *session, switch_event_t *event, const char *num) { + char *name = NULL; + char *newsql = NULL; + callback_t cbt = { 0 }; + cbt.pool = pool; + + if (globals.db_overide && globals.master_odbc) { + newsql = switch_event_expand_headers(event, globals.sql); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "SQL: %s\n", newsql); + if (cidlookup_execute_sql_callback(newsql, cidlookup_callback, &cbt)) { + name = cbt.name; + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Unable to lookup cid\n"); + } + } + if (newsql != globals.sql) { + switch_safe_free(newsql); + } + return name; +} + +static char *do_lookup(switch_memory_pool_t *pool, switch_core_session_t *session, switch_event_t *event, const char *num) { + char *number = NULL; + char *name = NULL; + + number = string_digitsonly(pool, num); + switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "caller_id_number", number); + + if (globals.cache) { + name = check_cache(pool, number); + } + if (!name) { + name = do_dboveride(pool, session, event, number); + } + if (!name) { + name = do_lookup_real(pool, session, event, number); + if (globals.cache && name) { + set_cache(pool, number, name); + } + } + + return name; +} + + +SWITCH_STANDARD_API(cidlookup_function) +{ + switch_status_t status; + char *argv[3] = { 0 }; + int argc; + char *name = NULL; + char *mydata = NULL; + + switch_memory_pool_t *pool = NULL; + switch_event_t *event = NULL; + + if (switch_strlen_zero(cmd)) { + switch_goto_status(SWITCH_STATUS_SUCCESS, usage); + } + + if (session) { + pool = switch_core_session_get_pool(session); + } else { + switch_core_new_memory_pool(&pool); + } + switch_event_create(&event, SWITCH_EVENT_MESSAGE); + + mydata = strdup(cmd); + if ((argc = switch_separate_string(mydata, ' ', argv, (sizeof(argv) / sizeof(argv[0]))))) { + if (argc < 1) { + switch_goto_status(SWITCH_STATUS_SUCCESS, usage); + } + + if (!strcmp("status", argv[0])) { + stream->write_function(stream, "+OK\n url: %s\n cache: %s\n cache-expire: %d\n", + globals.url, + (globals.cache) ? "true" : "false", + globals.cache_expire); + + stream->write_function(stream, " db-overide: %s\n dsn: %s\n sql: %s\n", + (globals.db_overide) ? "true" : "false", + globals.odbc_dsn, + globals.sql); + + switch_goto_status(SWITCH_STATUS_SUCCESS, done); + } + + name = do_lookup(pool, session, event, argv[0]); + if (name) { + stream->write_function(stream, name); + } else { + stream->write_function(stream,"-ERR"); + } + } + switch_goto_status(SWITCH_STATUS_SUCCESS, done); + +usage: + stream->write_function(stream, "-ERR\n%s\n", SYNTAX); + switch_goto_status(status, done); + +done: + switch_safe_free(mydata); + switch_event_destroy(&event); + if (!session) { + switch_core_destroy_memory_pool(&pool); + } + return status; +} + +/* Macro expands to: switch_status_t mod_cidlookup_load(switch_loadable_module_interface_t **module_interface, switch_memory_pool_t *pool) */ +SWITCH_MODULE_LOAD_FUNCTION(mod_cidlookup_load) +{ + switch_api_interface_t *api_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; + + if (!globals.db_mutex) { + if (switch_mutex_init(&globals.db_mutex, SWITCH_MUTEX_UNNESTED, globals.pool) != SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "failed to initialize db_mutex\n"); + } + } + + do_config(SWITCH_FALSE); + + if ((switch_event_bind_removable(modname, SWITCH_EVENT_RELOADXML, NULL, event_handler, NULL, &reload_xml_event) != SWITCH_STATUS_SUCCESS)) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Couldn't bind event!\n"); + return SWITCH_STATUS_TERM; + } + + SWITCH_ADD_API(api_interface, "cidlookup", "cidlookup API", cidlookup_function, "syntax"); + + /* indicate that the module should continue to be loaded */ + return SWITCH_STATUS_SUCCESS; +} + +/* + Called when the system shuts down + Macro expands to: switch_status_t mod_cidlookup_shutdown() */ +SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_cidlookup_shutdown) +{ + /* Cleanup dynamically allocated config settings */ + switch_mutex_destroy(globals.db_mutex); + switch_odbc_handle_disconnect(globals.master_odbc); + switch_odbc_handle_destroy(&globals.master_odbc); + switch_event_unbind(&reload_xml_event); + return SWITCH_STATUS_SUCCESS; +} + + +/* + If it exists, this is called in it's own thread when the module-load completes + If it returns anything but SWITCH_STATUS_TERM it will be called again automatically + Macro expands to: switch_status_t mod_cidlookup_runtime() +SWITCH_MODULE_RUNTIME_FUNCTION(mod_cidlookup_runtime) +{ + while(looping) + { + switch_cond_next(); + } + return SWITCH_STATUS_TERM; +} +*/ + +/* 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 + */

1 0

[commit] r12989 - freeswitch/trunk/src
by FreeSWITCH SVN 10 Apr '09

10 Apr '09

Author: anthm Date: Fri Apr 10 16:37:17 2009 New Revision: 12989 Log: refactor Modified: freeswitch/trunk/src/switch_core_memory.c freeswitch/trunk/src/switch_core_session.c Modified: freeswitch/trunk/src/switch_core_memory.c ============================================================================== --- freeswitch/trunk/src/switch_core_memory.c (original) +++ freeswitch/trunk/src/switch_core_memory.c Fri Apr 10 16:37:17 2009 @@ -135,8 +135,13 @@ switch_size_t len; switch_assert(memory_manager.memory_pool != NULL); - if (!todup) + if (!todup) { return NULL; + } + + if (switch_strlen_zero(todup)) { + return SWITCH_BLANK_STRING; + } #ifdef LOCK_MORE #ifdef USE_MEM_LOCK @@ -229,6 +234,11 @@ if (!todup) { return NULL; } + + if (switch_strlen_zero(todup)) { + return SWITCH_BLANK_STRING; + } + #ifdef LOCK_MORE #ifdef USE_MEM_LOCK switch_mutex_lock(memory_manager.mem_lock); @@ -264,6 +274,11 @@ if (!todup) { return NULL; } + + if (switch_strlen_zero(todup)) { + return SWITCH_BLANK_STRING; + } + #ifdef LOCK_MORE #ifdef USE_MEM_LOCK switch_mutex_lock(memory_manager.mem_lock); Modified: freeswitch/trunk/src/switch_core_session.c ============================================================================== --- freeswitch/trunk/src/switch_core_session.c (original) +++ freeswitch/trunk/src/switch_core_session.c Fri Apr 10 16:37:17 2009 @@ -1447,19 +1447,17 @@ session->stack_count++; new_profile = switch_caller_profile_clone(session, profile); - new_profile->destination_number = switch_core_session_strdup(session, exten); + new_profile->destination_number = switch_core_strdup(new_profile->pool, exten); if (!switch_strlen_zero(dialplan)) { - new_profile->dialplan = switch_core_session_strdup(session, dialplan); + new_profile->dialplan = switch_core_strdup(new_profile->pool, dialplan); } if (!switch_strlen_zero(context)) { - new_profile->context = switch_core_session_strdup(session, context); + new_profile->context = switch_core_strdup(new_profile->pool, context); } - if (!(dpstr = switch_core_session_strdup(session, new_profile->dialplan))) { - abort(); - } + dpstr = switch_core_session_strdup(session, new_profile->dialplan); argc = switch_separate_string(dpstr, ',', dp, (sizeof(dp) / sizeof(dp[0]))); for (x = 0; x < argc; x++) {

1 0

[commit] r12988 - freeswitch/trunk/src/mod/applications/mod_conference
by FreeSWITCH SVN 10 Apr '09

10 Apr '09

Author: anthm Date: Fri Apr 10 16:29:09 2009 New Revision: 12988 Log: keep new conference locked the whole time during transfer Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c (original) +++ freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Fri Apr 10 16:29:09 2009 @@ -3635,6 +3635,8 @@ switch_status_t ret_status = SWITCH_STATUS_SUCCESS; char *conf_name = NULL, *profile_name; switch_event_t *params = NULL; + conference_obj_t *new_conference = NULL; + switch_assert(conference != NULL); switch_assert(stream != NULL); @@ -3652,7 +3654,6 @@ for (x = 3; x < argc; x++) { conference_member_t *member = NULL; uint32_t id = atoi(argv[x]); - conference_obj_t *new_conference = NULL; switch_channel_t *channel; switch_event_t *event; switch_xml_t cxml = NULL, cfg = NULL, profiles = NULL; @@ -3664,71 +3665,73 @@ channel = switch_core_session_get_channel(member->session); - /* build a new conference if it doesn't exist */ - if (!(new_conference = (conference_obj_t *) switch_core_hash_find(globals.conference_hash, conf_name))) { - switch_memory_pool_t *pool = NULL; - conf_xml_cfg_t xml_cfg = { 0 }; - - /* Setup a memory pool to use. */ - if (switch_core_new_memory_pool(&pool) != SWITCH_STATUS_SUCCESS) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Pool Failure\n"); - goto done; - } + if (!new_conference) { + if (!(new_conference = (conference_obj_t *) switch_core_hash_find(globals.conference_hash, conf_name))) { + /* build a new conference if it doesn't exist */ + switch_memory_pool_t *pool = NULL; + conf_xml_cfg_t xml_cfg = { 0 }; + + /* Setup a memory pool to use. */ + if (switch_core_new_memory_pool(&pool) != SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Pool Failure\n"); + goto done; + } - switch_event_create(&params, SWITCH_EVENT_REQUEST_PARAMS); - switch_assert(params); - switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "conf_name", conf_name); - switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "profile_name", profile_name); - switch_channel_event_set_data(channel, params); - - /* Open the config from the xml registry */ - if (!(cxml = switch_xml_open_cfg(global_cf_name, &cfg, params))) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Open of %s failed\n", global_cf_name); - goto done; - } + switch_event_create(&params, SWITCH_EVENT_REQUEST_PARAMS); + switch_assert(params); + switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "conf_name", conf_name); + switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "profile_name", profile_name); + switch_channel_event_set_data(channel, params); + + /* Open the config from the xml registry */ + if (!(cxml = switch_xml_open_cfg(global_cf_name, &cfg, params))) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Open of %s failed\n", global_cf_name); + goto done; + } - if ((profiles = switch_xml_child(cfg, "profiles"))) { - xml_cfg.profile = switch_xml_find_child(profiles, "profile", "name", profile_name); - } + if ((profiles = switch_xml_child(cfg, "profiles"))) { + xml_cfg.profile = switch_xml_find_child(profiles, "profile", "name", profile_name); + } - if (!xml_cfg.profile) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot find profile: %s\n", profile_name); - switch_xml_free(cxml); - cxml = NULL; - goto done; - } + if (!xml_cfg.profile) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot find profile: %s\n", profile_name); + switch_xml_free(cxml); + cxml = NULL; + goto done; + } - xml_cfg.controls = switch_xml_child(cfg, "caller-controls"); + xml_cfg.controls = switch_xml_child(cfg, "caller-controls"); - /* Release the config registry handle */ - if (cxml) { - switch_xml_free(cxml); - cxml = NULL; - } + /* Release the config registry handle */ + if (cxml) { + switch_xml_free(cxml); + cxml = NULL; + } - /* Create the conference object. */ - new_conference = conference_new(conf_name, xml_cfg, pool); + /* Create the conference object. */ + new_conference = conference_new(conf_name, xml_cfg, pool); - if (!new_conference) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Memory Error!\n"); - if (pool != NULL) { - switch_core_destroy_memory_pool(&pool); + if (!new_conference) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Memory Error!\n"); + if (pool != NULL) { + switch_core_destroy_memory_pool(&pool); + } + goto done; } - goto done; - } - /* Set the minimum number of members (once you go above it you cannot go below it) */ - new_conference->min = 1; + /* Set the minimum number of members (once you go above it you cannot go below it) */ + new_conference->min = 1; - /* Indicate the conference is dynamic */ - switch_set_flag_locked(new_conference, CFLAG_DYNAMIC); + /* Indicate the conference is dynamic */ + switch_set_flag_locked(new_conference, CFLAG_DYNAMIC); - switch_mutex_lock(new_conference->mutex); + switch_mutex_lock(new_conference->mutex); - /* Start the conference thread for this conference */ - launch_conference_thread(new_conference); - } else { - switch_mutex_lock(new_conference->mutex); + /* Start the conference thread for this conference */ + launch_conference_thread(new_conference); + } else { + switch_mutex_lock(new_conference->mutex); + } } /* move the member from the old conference to the new one */ @@ -3745,9 +3748,7 @@ } } - switch_mutex_unlock(new_conference->mutex); switch_mutex_unlock(member->control_mutex); - stream->write_function(stream, "OK Member '%d' sent to conference %s.\n", member->id, argv[2]); @@ -3761,6 +3762,11 @@ switch_event_fire(&event); } } + + if (new_conference) { + switch_mutex_unlock(new_conference->mutex); + } + } else { ret_status = SWITCH_STATUS_GENERR; }

1 0

[commit] r12987 - in freeswitch/trunk/src/mod/endpoints: mod_alsa mod_dingaling mod_iax mod_loopback mod_opal mod_reference mod_skypiax mod_sofia mod_unicall
by FreeSWITCH SVN 10 Apr '09

10 Apr '09

Author: anthm Date: Fri Apr 10 15:14:02 2009 New Revision: 12987 Log: FSCORE-352 Modified: freeswitch/trunk/src/mod/endpoints/mod_alsa/mod_alsa.c freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.c freeswitch/trunk/src/mod/endpoints/mod_loopback/mod_loopback.c freeswitch/trunk/src/mod/endpoints/mod_opal/mod_opal.cpp freeswitch/trunk/src/mod/endpoints/mod_reference/mod_reference.c freeswitch/trunk/src/mod/endpoints/mod_skypiax/mod_skypiax.c freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c freeswitch/trunk/src/mod/endpoints/mod_unicall/mod_unicall.c Modified: freeswitch/trunk/src/mod/endpoints/mod_alsa/mod_alsa.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_alsa/mod_alsa.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_alsa/mod_alsa.c Fri Apr 10 15:14:02 2009 @@ -428,14 +428,12 @@ static switch_status_t channel_on_destroy(switch_core_session_t *session) { - switch_channel_t *channel = NULL; - private_t *tech_pvt = NULL; + //switch_channel_t *channel = NULL; + //private_t *tech_pvt = NULL; - channel = switch_core_session_get_channel(session); - assert(channel != NULL); + //channel = switch_core_session_get_channel(session); + //tech_pvt = switch_core_session_get_private(session); - tech_pvt = switch_core_session_get_private(session); - assert(tech_pvt != NULL); return SWITCH_STATUS_SUCCESS; } Modified: freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c Fri Apr 10 15:14:02 2009 @@ -1214,23 +1214,23 @@ struct private_object *tech_pvt = NULL; tech_pvt = switch_core_session_get_private(session); - switch_assert(tech_pvt != NULL); - if (tech_pvt->rtp_session) { - switch_rtp_destroy(&tech_pvt->rtp_session); - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "NUKE RTP\n"); - tech_pvt->rtp_session = NULL; - } + if (tech_pvt) { + if (tech_pvt->rtp_session) { + switch_rtp_destroy(&tech_pvt->rtp_session); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "NUKE RTP\n"); + tech_pvt->rtp_session = NULL; + } - if (switch_core_codec_ready(&tech_pvt->read_codec)) { - switch_core_codec_destroy(&tech_pvt->read_codec); - } + if (switch_core_codec_ready(&tech_pvt->read_codec)) { + switch_core_codec_destroy(&tech_pvt->read_codec); + } - if (switch_core_codec_ready(&tech_pvt->write_codec)) { - switch_core_codec_destroy(&tech_pvt->write_codec); + if (switch_core_codec_ready(&tech_pvt->write_codec)) { + switch_core_codec_destroy(&tech_pvt->write_codec); + } } - return SWITCH_STATUS_SUCCESS; } Modified: freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.c Fri Apr 10 15:14:02 2009 @@ -493,14 +493,14 @@ { private_t *tech_pvt = switch_core_session_get_private(session); - switch_assert(tech_pvt != NULL); - - if (switch_core_codec_ready(&tech_pvt->read_codec)) { - switch_core_codec_destroy(&tech_pvt->read_codec); - } - - if (!switch_core_codec_ready(&tech_pvt->write_codec)) { - switch_core_codec_destroy(&tech_pvt->write_codec); + if (tech_pvt) { + if (switch_core_codec_ready(&tech_pvt->read_codec)) { + switch_core_codec_destroy(&tech_pvt->read_codec); + } + + if (!switch_core_codec_ready(&tech_pvt->write_codec)) { + switch_core_codec_destroy(&tech_pvt->write_codec); + } } return SWITCH_STATUS_SUCCESS; Modified: freeswitch/trunk/src/mod/endpoints/mod_loopback/mod_loopback.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_loopback/mod_loopback.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_loopback/mod_loopback.c Fri Apr 10 15:14:02 2009 @@ -353,16 +353,17 @@ switch_assert(channel != NULL); tech_pvt = switch_core_session_get_private(session); - switch_assert(tech_pvt != NULL); - - switch_core_timer_destroy(&tech_pvt->timer); - - if (switch_core_codec_ready(&tech_pvt->read_codec)) { - switch_core_codec_destroy(&tech_pvt->read_codec); - } - if (switch_core_codec_ready(&tech_pvt->write_codec)) { - switch_core_codec_destroy(&tech_pvt->write_codec); + if (tech_pvt) { + switch_core_timer_destroy(&tech_pvt->timer); + + if (switch_core_codec_ready(&tech_pvt->read_codec)) { + switch_core_codec_destroy(&tech_pvt->read_codec); + } + + if (switch_core_codec_ready(&tech_pvt->write_codec)) { + switch_core_codec_destroy(&tech_pvt->write_codec); + } } Modified: freeswitch/trunk/src/mod/endpoints/mod_opal/mod_opal.cpp ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_opal/mod_opal.cpp (original) +++ freeswitch/trunk/src/mod/endpoints/mod_opal/mod_opal.cpp Fri Apr 10 15:14:02 2009 @@ -835,38 +835,36 @@ static switch_status_t on_destroy(switch_core_session_t *session) { - switch_channel_t *channel = switch_core_session_get_channel(session); + //switch_channel_t *channel = switch_core_session_get_channel(session); opal_private_t *tech_pvt = (opal_private_t *) switch_core_session_get_private(session); - if (tech_pvt->read_codec.implementation) { - switch_core_codec_destroy(&tech_pvt->read_codec); - } + if (tech_pvt) { + if (tech_pvt->read_codec.implementation) { + switch_core_codec_destroy(&tech_pvt->read_codec); + } - if (tech_pvt->write_codec.implementation) { - switch_core_codec_destroy(&tech_pvt->write_codec); - } + if (tech_pvt->write_codec.implementation) { + switch_core_codec_destroy(&tech_pvt->write_codec); + } - if (tech_pvt->vid_read_codec.implementation) { - switch_core_codec_destroy(&tech_pvt->vid_read_codec); - } + if (tech_pvt->vid_read_codec.implementation) { + switch_core_codec_destroy(&tech_pvt->vid_read_codec); + } - if (tech_pvt->vid_write_codec.implementation) { - switch_core_codec_destroy(&tech_pvt->vid_write_codec); - } + if (tech_pvt->vid_write_codec.implementation) { + switch_core_codec_destroy(&tech_pvt->vid_write_codec); + } - if (tech_pvt->read_timer.timer_interface) { - switch_core_timer_destroy(&tech_pvt->read_timer); - } + if (tech_pvt->read_timer.timer_interface) { + switch_core_timer_destroy(&tech_pvt->read_timer); + } - if (tech_pvt->vid_read_timer.timer_interface) { - switch_core_timer_destroy(&tech_pvt->vid_read_timer); + if (tech_pvt->vid_read_timer.timer_interface) { + switch_core_timer_destroy(&tech_pvt->vid_read_timer); + } } - switch_core_session_unset_read_codec(session); - switch_core_session_unset_write_codec(session); - return SWITCH_STATUS_SUCCESS; - } /* this function has to be called with the original session beause the FSConnection might already be destroyed and we Modified: freeswitch/trunk/src/mod/endpoints/mod_reference/mod_reference.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_reference/mod_reference.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_reference/mod_reference.c Fri Apr 10 15:14:02 2009 @@ -195,15 +195,15 @@ assert(channel != NULL); tech_pvt = switch_core_session_get_private(session); - assert(tech_pvt != NULL); - - - if (switch_core_codec_ready(&tech_pvt->read_codec)) { - switch_core_codec_destroy(&tech_pvt->read_codec); - } - if (switch_core_codec_ready(&tech_pvt->write_codec)) { - switch_core_codec_destroy(&tech_pvt->write_codec); + if (tech_pvt) { + if (switch_core_codec_ready(&tech_pvt->read_codec)) { + switch_core_codec_destroy(&tech_pvt->read_codec); + } + + if (switch_core_codec_ready(&tech_pvt->write_codec)) { + switch_core_codec_destroy(&tech_pvt->write_codec); + } } return SWITCH_STATUS_SUCCESS; Modified: freeswitch/trunk/src/mod/endpoints/mod_skypiax/mod_skypiax.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_skypiax/mod_skypiax.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_skypiax/mod_skypiax.c Fri Apr 10 15:14:02 2009 @@ -183,23 +183,24 @@ return SWITCH_STATUS_SUCCESS; } -static switch_status_t channel_on_hangup(switch_core_session_t * session) +static switch_status_t channel_on_destroy(switch_core_session_t * session) { - switch_channel_t *channel = NULL; + //switch_channel_t *channel = NULL; private_t *tech_pvt = NULL; - channel = switch_core_session_get_channel(session); - switch_assert(channel != NULL); + //channel = switch_core_session_get_channel(session); + //switch_assert(channel != NULL); tech_pvt = switch_core_session_get_private(session); - switch_assert(tech_pvt != NULL); - - if (switch_core_codec_ready(&tech_pvt->read_codec)) { - switch_core_codec_destroy(&tech_pvt->read_codec); - } - if (switch_core_codec_ready(&tech_pvt->write_codec)) { - switch_core_codec_destroy(&tech_pvt->write_codec); + if (tech_pvt) { + if (switch_core_codec_ready(&tech_pvt->read_codec)) { + switch_core_codec_destroy(&tech_pvt->read_codec); + } + + if (switch_core_codec_ready(&tech_pvt->write_codec)) { + switch_core_codec_destroy(&tech_pvt->write_codec); + } } return SWITCH_STATUS_SUCCESS; Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Fri Apr 10 15:14:02 2009 @@ -239,22 +239,24 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s SOFIA DESTROY\n", switch_channel_get_name(channel)); - if (switch_core_codec_ready(&tech_pvt->read_codec)) { - switch_core_codec_destroy(&tech_pvt->read_codec); - } - - if (switch_core_codec_ready(&tech_pvt->write_codec)) { - switch_core_codec_destroy(&tech_pvt->write_codec); - } + if (tech_pvt) { + if (switch_core_codec_ready(&tech_pvt->read_codec)) { + switch_core_codec_destroy(&tech_pvt->read_codec); + } + + if (switch_core_codec_ready(&tech_pvt->write_codec)) { + switch_core_codec_destroy(&tech_pvt->write_codec); + } - switch_core_session_unset_read_codec(session); - switch_core_session_unset_write_codec(session); + switch_core_session_unset_read_codec(session); + switch_core_session_unset_write_codec(session); - switch_mutex_lock(tech_pvt->profile->flag_mutex); - tech_pvt->profile->inuse--; - switch_mutex_unlock(tech_pvt->profile->flag_mutex); + switch_mutex_lock(tech_pvt->profile->flag_mutex); + tech_pvt->profile->inuse--; + switch_mutex_unlock(tech_pvt->profile->flag_mutex); - sofia_glue_deactivate_rtp(tech_pvt); + sofia_glue_deactivate_rtp(tech_pvt); + } return SWITCH_STATUS_SUCCESS; Modified: freeswitch/trunk/src/mod/endpoints/mod_unicall/mod_unicall.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_unicall/mod_unicall.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_unicall/mod_unicall.c Fri Apr 10 15:14:02 2009 @@ -934,18 +934,20 @@ static switch_status_t unicall_on_destroy(switch_core_session_t *session) { - switch_channel_t *channel; + //switch_channel_t *channel; private_t *tech_pvt; - channel = switch_core_session_get_channel(session); - assert(channel != NULL); + //channel = switch_core_session_get_channel(session); + //assert(channel != NULL); + tech_pvt = switch_core_session_get_private(session); - assert(tech_pvt != NULL); - if (switch_core_codec_ready(&tech_pvt->read_codec)) - switch_core_codec_destroy(&tech_pvt->read_codec); - if (switch_core_codec_ready(&tech_pvt->write_codec)) - switch_core_codec_destroy(&tech_pvt->write_codec); + if (tech_pvt) { + if (switch_core_codec_ready(&tech_pvt->read_codec)) + switch_core_codec_destroy(&tech_pvt->read_codec); + if (switch_core_codec_ready(&tech_pvt->write_codec)) + switch_core_codec_destroy(&tech_pvt->write_codec); + } return SWITCH_STATUS_SUCCESS;

1 0