November 2007 - freeswitch-svn@lists.freeswitch.org

[Freeswitch-svn] [commit] r6135 - in freeswitch/trunk: build conf src/mod/applications/mod_limit
by Freeswitch SVN 01 Nov '07

01 Nov '07

Author: anthm Date: Thu Nov 1 15:05:48 2007 New Revision: 6135 Added: freeswitch/trunk/src/mod/applications/mod_limit/ freeswitch/trunk/src/mod/applications/mod_limit/Makefile freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.c Modified: freeswitch/trunk/build/modules.conf.in freeswitch/trunk/conf/freeswitch.xml freeswitch/trunk/conf/modules.conf.xml Log: add mod_limit Modified: freeswitch/trunk/build/modules.conf.in ============================================================================== --- freeswitch/trunk/build/modules.conf.in (original) +++ freeswitch/trunk/build/modules.conf.in Thu Nov 1 15:05:48 2007 @@ -6,6 +6,7 @@ applications/mod_enum applications/mod_fifo applications/mod_voicemail +applications/mod_limit #applications/mod_ivrtest #applications/mod_soundtouch #applications/mod_rss Modified: freeswitch/trunk/conf/freeswitch.xml ============================================================================== --- freeswitch/trunk/conf/freeswitch.xml (original) +++ freeswitch/trunk/conf/freeswitch.xml Thu Nov 1 15:05:48 2007 @@ -62,6 +62,7 @@    +    Modified: freeswitch/trunk/conf/modules.conf.xml ============================================================================== --- freeswitch/trunk/conf/modules.conf.xml (original) +++ freeswitch/trunk/conf/modules.conf.xml Thu Nov 1 15:05:48 2007 @@ -38,6 +38,7 @@ <load module="mod_dptools"/> <load module="mod_fifo"/> <load module="mod_voicemail"/> + <load module="mod_limit"/>   Added: freeswitch/trunk/src/mod/applications/mod_limit/Makefile ============================================================================== --- (empty file) +++ freeswitch/trunk/src/mod/applications/mod_limit/Makefile Thu Nov 1 15:05:48 2007 @@ -0,0 +1,3 @@ +BASE=../../../.. +include $(BASE)/build/modmake.rules +LOCAL_CFLAGS += `if test -f $(BASE)/.libs/libfreeswitch_la-switch_odbc.o ; then echo -DSWITCH_HAVE_ODBC; fi ;` Added: freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.c ============================================================================== --- (empty file) +++ freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.c Thu Nov 1 15:05:48 2007 @@ -0,0 +1,391 @@ +/* + * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application + * Copyright (C) 2005/2006, Anthony Minessale II <anthmct(a)yahoo.com> + * + * 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 <anthmct(a)yahoo.com> + * Portions created by the Initial Developer are Copyright (C) + * the Initial Developer. All Rights Reserved. + * + * Contributor(s): + * + * Anthony Minessale II <anthmct(a)yahoo.com> + * Neal Horman <neal at wanlink dot com> + * + * + * mod_limit.c -- Framework Demo Module + * + */ +#include <switch.h> +#ifdef SWITCH_HAVE_ODBC +#include <switch_odbc.h> +#endif + +SWITCH_MODULE_LOAD_FUNCTION(mod_limit_load); +SWITCH_MODULE_DEFINITION(mod_limit, mod_limit_load, NULL, NULL); + +static struct { + switch_memory_pool_t *pool; + char hostname[256]; + char *dbname; + char *odbc_dsn; + switch_mutex_t *mutex; +#ifdef SWITCH_HAVE_ODBC + switch_odbc_handle_t *master_odbc; +#else + void *filler1; +#endif +} globals; + +static char limit_sql[] = + "CREATE TABLE limit_data (\n" + " hostname VARCHAR(255),\n" + " realm VARCHAR(255),\n" + " id VARCHAR(255),\n" + " uuid VARCHAR(255)\n" + ");\n"; + + + +static switch_status_t limit_execute_sql(char *sql, switch_mutex_t *mutex) +{ + switch_core_db_t *db; + switch_status_t status = SWITCH_STATUS_SUCCESS; + + if (mutex) { + switch_mutex_lock(mutex); + } + +#ifdef SWITCH_HAVE_ODBC + if (globals.odbc_dsn) { + SQLHSTMT stmt; + if (switch_odbc_handle_exec(globals.master_odbc, sql, &stmt) != SWITCH_ODBC_SUCCESS) { + char *err_str; + err_str = switch_odbc_handle_get_error(globals.master_odbc, stmt); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "ERR: [%s]\n[%s]\n", sql, switch_str_nil(err_str)); + switch_safe_free(err_str); + status = SWITCH_STATUS_FALSE; + } + SQLFreeHandle(SQL_HANDLE_STMT, stmt); + } else { +#endif + if (!(db = switch_core_db_open_file(globals.dbname))) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error Opening DB %s\n", globals.dbname); + status = SWITCH_STATUS_FALSE; + goto end; + } + + status = switch_core_db_persistant_execute(db, sql, 25); + switch_core_db_close(db); + +#ifdef SWITCH_HAVE_ODBC + } +#endif + + + end: + if (mutex) { + switch_mutex_unlock(mutex); + } + + return status; +} + + +static switch_bool_t limit_execute_sql_callback(switch_mutex_t *mutex, + char *sql, + switch_core_db_callback_func_t callback, + void *pdata) +{ + switch_bool_t ret = SWITCH_FALSE; + switch_core_db_t *db; + char *errmsg = NULL; + + if (mutex) { + switch_mutex_lock(mutex); + } + + +#ifdef SWITCH_HAVE_ODBC + if (globals.odbc_dsn) { + switch_odbc_handle_callback_exec(globals.master_odbc, sql, callback, pdata); + } else { +#endif + + + + if (!(db = switch_core_db_open_file(globals.dbname))) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error Opening DB %s\n", globals.dbname); + goto end; + } + + + switch_core_db_exec(db, sql, callback, pdata, &errmsg); + + if (errmsg) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "SQL ERR: [%s] %s\n", sql, errmsg); + free(errmsg); + } + + if (db) { + switch_core_db_close(db); + } + +#ifdef SWITCH_HAVE_ODBC + } +#endif + + + end: + + if (mutex) { + switch_mutex_unlock(mutex); + } + + + + return ret; + +} + + +static switch_status_t do_config() +{ + char *cf = "limit.conf"; + switch_xml_t cfg, xml, settings, param; + switch_core_db_t *db; + switch_status_t status = SWITCH_STATUS_SUCCESS; + char *odbc_user = NULL; + char *odbc_pass = NULL; + + if (!(xml = switch_xml_open_cfg(cf, &cfg, NULL))) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "open of %s failed\n", cf); + return SWITCH_STATUS_TERM; + } + + if ((settings = switch_xml_child(cfg, "settings"))) { + for (param = switch_xml_child(settings, "param"); param; param = param->next) { + char *var = (char *) switch_xml_attr_soft(param, "name"); + char *val = (char *) switch_xml_attr_soft(param, "value"); + + if (!strcasecmp(var, "debug")) { + + } else if (!strcasecmp(var, "odbc-dsn")) { +#ifdef SWITCH_HAVE_ODBC + globals.odbc_dsn = switch_core_strdup(globals.pool, val); + if ((odbc_user = strchr(globals.odbc_dsn, ':'))) { + *odbc_user++ = '\0'; + } + if ((odbc_pass = strchr(odbc_user, ':'))) { + *odbc_pass++ = '\0'; + } +#else + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "ODBC IS NOT AVAILABLE!\n"); +#endif + + } + } + } + + if (switch_strlen_zero(globals.odbc_dsn) || switch_strlen_zero(odbc_user) || switch_strlen_zero(odbc_pass)) { + globals.dbname = "call_limit"; + } + + +#ifdef SWITCH_HAVE_ODBC + if (globals.odbc_dsn) { + if (!(globals.master_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"); + status = SWITCH_STATUS_FALSE; + goto done; + } + if (switch_odbc_handle_connect(globals.master_odbc) != SWITCH_ODBC_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Cannot Open ODBC Database!\n"); + status = SWITCH_STATUS_FALSE; + goto done; + } + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Connected ODBC DSN: %s\n", globals.odbc_dsn); + switch_odbc_handle_exec(globals.master_odbc, limit_sql, NULL); + } else { +#endif + if ((db = switch_core_db_open_file(globals.dbname))) { + switch_core_db_test_reactive(db, "select * from limit_data", NULL, limit_sql); + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Cannot Open SQL Database!\n"); + status = SWITCH_STATUS_FALSE; + goto done; + } + switch_core_db_close(db); +#ifdef SWITCH_HAVE_ODBC + } +#endif + + done: + + return status; + +} + +static switch_status_t hanguphook(switch_core_session_t *session) +{ + switch_channel_t *channel; + switch_channel_state_t state; + const char *realm = NULL; + const char *id = NULL; + char *sql = NULL; + + channel = switch_core_session_get_channel(session); + assert(channel != NULL); + + state = switch_channel_get_state(channel); + + if (state == CS_HANGUP || state == CS_RING) { + id = switch_channel_get_variable(channel, "limit_id"); + realm = switch_channel_get_variable(channel, "limit_realm"); + sql = switch_mprintf("delete from limit_data where uuid='%q' and hostname='%q' and realm='%q'and id='%q';", + switch_core_session_get_uuid(session), globals.hostname, realm, id); + printf("wtf [%s]\n", sql); + limit_execute_sql(sql, globals.mutex); + switch_safe_free(sql); + switch_core_event_hook_remove_state_change(session, hanguphook); + } + return SWITCH_STATUS_SUCCESS; +} + +struct callback { + char *buf; + size_t len; + int matches; +}; +typedef struct callback callback_t; +static int sql2str_callback(void *pArg, int argc, char **argv, char **columnNames) +{ + callback_t *cbt = (callback_t *) pArg; + + switch_copy_string(cbt->buf, argv[0], cbt->len); + cbt->matches++; + return 0; +} + + +#define LIMIT_USAGE "<realm> <id> <max>" +#define LIMIT_DESC "limit access to an extension" + +SWITCH_STANDARD_APP(limit_function) +{ + int argc = 0; + char *argv[6] = { 0 }; + char *mydata = NULL; + char *sql = NULL; + char *realm = NULL; + char *id = NULL; + int max = 0, got = 0; + char buf[80] = ""; + callback_t cbt = { 0 }; + switch_channel_t *channel; + + channel = switch_core_session_get_channel(session); + assert(channel != NULL); + + if (!switch_strlen_zero(data)) { + mydata = switch_core_session_strdup(session, data); + argc = switch_separate_string(mydata, ' ', argv, (sizeof(argv) / sizeof(argv[0]))); + } + + if (argc < 3) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "USAGE: limit %s\n", LIMIT_USAGE); + return; + } + + + switch_mutex_lock(globals.mutex); + + + + realm = argv[0]; + id = argv[1]; + max = atoi(argv[2]); + + if (max < 0) { + max = 0; + } + + switch_channel_set_variable(channel, "limit_realm", realm); + switch_channel_set_variable(channel, "limit_id", id); + switch_channel_set_variable(channel, "limit_max", argv[2]); + + cbt.buf = buf; + cbt.len = sizeof(buf); + sql = switch_mprintf("select count(hostname) from limit_data where realm='%q' and id='%q'", realm, id); + limit_execute_sql_callback(NULL, sql, sql2str_callback, &cbt); + got = atoi(buf); + + if (got + 1 > max) { + switch_ivr_session_transfer(session, "limit_exceeded", NULL, NULL); + goto done; + } + + switch_core_event_hook_add_state_change(session, hanguphook); + sql = switch_mprintf("insert into limit_data values('%q','%q','%q','%q');", globals.hostname, realm, id, switch_core_session_get_uuid(session)); + limit_execute_sql(sql, NULL); + switch_safe_free(sql); + + + done: + + switch_mutex_unlock(globals.mutex); + +} + + +SWITCH_MODULE_LOAD_FUNCTION(mod_limit_load) +{ + switch_status_t status; + switch_application_interface_t *app_interface; + + memset(&globals, 0, sizeof(&globals)); + gethostname(globals.hostname, sizeof(globals.hostname)); + globals.pool = pool; + + if ((status = do_config() != SWITCH_STATUS_SUCCESS)) { + return status; + } + + switch_mutex_init(&globals.mutex, SWITCH_MUTEX_NESTED, globals.pool); + + /* connect my internal structure to the blank pointer passed to me */ + *module_interface = switch_loadable_module_create_module_interface(pool, modname); + + SWITCH_ADD_APP(app_interface, "limit", "Limit", LIMIT_DESC, limit_function, LIMIT_USAGE, SAF_NONE); + + /* indicate that the module should continue to be loaded */ + return SWITCH_STATUS_SUCCESS; +} + + + +/* For Emacs: + * Local Variables: + * mode:c + * indent-tabs-mode:nil + * tab-width:4 + * c-basic-offset:4 + * End: + * For VIM: + * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: + */

1 0

[Freeswitch-svn] [commit] r6134 - freeswitch/trunk/src/mod/applications/mod_skel
by Freeswitch SVN 01 Nov '07

01 Nov '07

Author: anthm Date: Thu Nov 1 15:05:16 2007 New Revision: 6134 Modified: freeswitch/trunk/src/mod/applications/mod_skel/mod_skel.c Log: clean up skel, could use more.... Modified: freeswitch/trunk/src/mod/applications/mod_skel/mod_skel.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_skel/mod_skel.c (original) +++ freeswitch/trunk/src/mod/applications/mod_skel/mod_skel.c Thu Nov 1 15:05:16 2007 @@ -38,23 +38,10 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_skel_load); SWITCH_MODULE_DEFINITION(mod_skel, mod_skel_load, NULL, NULL); -static switch_loadable_module_interface_t skel_module_interface = { - /*.module_name */ modname, - /*.endpoint_interface */ NULL, - /*.timer_interface */ NULL, - /*.dialplan_interface */ NULL, - /*.codec_interface */ NULL, - /*.application_interface */ NULL, - /*.api_interface */ NULL, - /*.file_interface */ NULL, - /*.speech_interface */ NULL, - /*.directory_interface */ NULL -}; - SWITCH_MODULE_LOAD_FUNCTION(mod_skel_load) { /* connect my internal structure to the blank pointer passed to me */ - *module_interface = &skel_module_interface; + *module_interface = switch_loadable_module_create_module_interface(pool, modname); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Hello World!\n");

1 0

[Freeswitch-svn] [commit] r6133 - freeswitch/trunk/src/mod/endpoints/mod_portaudio
by Freeswitch SVN 01 Nov '07

01 Nov '07

Author: anthm Date: Thu Nov 1 13:11:15 2007 New Revision: 6133 Modified: freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c Log: possible fix fore MODEMP-40 Modified: freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c Thu Nov 1 13:11:15 2007 @@ -608,7 +608,6 @@ tech_pvt->hold_frame.datalen = (uint32_t) (olen * sizeof(int16_t)); tech_pvt->hold_frame.samples = (uint32_t) olen; - tech_pvt->hold_frame.timestamp = globals.timer.samplecount; *frame = &tech_pvt->hold_frame; } @@ -628,7 +627,6 @@ globals.read_frame.samples = samples; switch_core_timer_check(&globals.timer); - globals.read_frame.timestamp = globals.timer.samplecount; *frame = &globals.read_frame; if (!switch_test_flag((&globals), GFLAG_MOUTH)) {

1 0

[Freeswitch-svn] [commit] r6132 - freeswitch/trunk/dtd
by Freeswitch SVN 01 Nov '07

01 Nov '07

Author: brian Date: Thu Nov 1 10:59:32 2007 New Revision: 6132 Added: freeswitch/trunk/dtd/freeswitch_dialplan.dtd Log: xmllint --dtdvalid freeswitch_dialplan.dtd /usr/local/freeswitch/conf/default_context.xml >>/dev/null To validate your dialplan. Thanks [intra]lanman. /b Added: freeswitch/trunk/dtd/freeswitch_dialplan.dtd ============================================================================== --- (empty file) +++ freeswitch/trunk/dtd/freeswitch_dialplan.dtd Thu Nov 1 10:59:32 2007 @@ -0,0 +1,31 @@ +<!ELEMENT include (context*)> + +<!ELEMENT context (extension*)> +<!ATTLIST context + name CDATA #REQUIRED +> + +<!ELEMENT extension (condition*)> +<!ATTLIST extension + name CDATA #REQUIRED + continue CDATA #IMPLIED +> + +<!ELEMENT condition (action*, anti-action*)> +<!ATTLIST condition + field CDATA #IMPLIED + expression CDATA #IMPLIED + continue CDATA #IMPLIED +> + +<!ELEMENT action EMPTY> +<!ATTLIST action + application CDATA #REQUIRED + data CDATA #IMPLIED +> + +<!ELEMENT anti-action EMPTY> +<!ATTLIST anti-action + application CDATA #REQUIRED + data CDATA #IMPLIED +>

1 0

[Freeswitch-svn] [commit] r6131 - freeswitch/trunk/dtd
by Freeswitch SVN 01 Nov '07

01 Nov '07

Author: brian Date: Thu Nov 1 10:58:30 2007 New Revision: 6131 Added: freeswitch/trunk/dtd/ Log:

1 0

[Freeswitch-svn] [commit] r6130 - freeswitch/trunk/src
by Freeswitch SVN 01 Nov '07

01 Nov '07

Author: anthm Date: Thu Nov 1 10:58:12 2007 New Revision: 6130 Modified: freeswitch/trunk/src/switch_ivr_async.c Log: attempt to make gcc 4.3 happy, seems to be a little tricky so far Modified: freeswitch/trunk/src/switch_ivr_async.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_async.c (original) +++ freeswitch/trunk/src/switch_ivr_async.c Thu Nov 1 10:58:12 2007 @@ -1229,11 +1229,11 @@ len += strlen(context) + 1; } - switch_zmalloc(helper, len); + switch_zmalloc(cur, len); + helper = (struct transfer_helper *)cur; switch_copy_string(helper->uuid_str, uuid, sizeof(helper->uuid_str)); - cur = (char *) helper; cur += sizeof(*helper); if (extension) { @@ -1278,9 +1278,9 @@ size_t len = sizeof(*helper) + strlen(path) + 1; char *cur = NULL; - switch_zmalloc(helper, len); + switch_zmalloc(cur, len); + helper = (struct broadcast_helper *)cur; - cur = (char *) helper; cur += sizeof(*helper); switch_copy_string(helper->uuid_str, uuid, sizeof(helper->uuid_str)); helper->flags = flags; @@ -1402,3 +1402,13 @@ 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 expandtab: + */

1 0

[Freeswitch-svn] [commit] r6129 - freeswitch/trunk/conf
by Freeswitch SVN 01 Nov '07

01 Nov '07

Author: brian Date: Thu Nov 1 10:55:27 2007 New Revision: 6129 Modified: freeswitch/trunk/conf/default_context.xml Log: woops Modified: freeswitch/trunk/conf/default_context.xml ============================================================================== --- freeswitch/trunk/conf/default_context.xml (original) +++ freeswitch/trunk/conf/default_context.xml Thu Nov 1 10:55:27 2007 @@ -15,7 +15,7 @@ <action application="voicemail" data="check default $${domain} ${dialed_ext}"/> <anti-action application="set" data="call_timeout=30000"/> <anti-action application="set" data="hangup_after_bridge=true"/> - <anti-actino application="set" data="continue_on_fail=true"/> + <anti-action application="set" data="continue_on_fail=true"/> <anti-action application="bridge" data="sofia/$${domain}/${dialed_ext}"/> <anti-action application="voicemail" data="default $${domain} ${dialed_ext}"/> </condition>

1 0

[Freeswitch-svn] [commit] r6128 - freeswitch/trunk/src
by Freeswitch SVN 01 Nov '07

01 Nov '07

Author: anthm Date: Thu Nov 1 10:22:58 2007 New Revision: 6128 Modified: freeswitch/trunk/src/switch_ivr_async.c Log: attempt to make gcc 4.3 happy, getting off to a great new friendship Modified: freeswitch/trunk/src/switch_ivr_async.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_async.c (original) +++ freeswitch/trunk/src/switch_ivr_async.c Thu Nov 1 10:22:58 2007 @@ -1233,23 +1233,24 @@ switch_copy_string(helper->uuid_str, uuid, sizeof(helper->uuid_str)); - cur = (char *) helper + sizeof(*helper); + cur = (char *) helper; + cur += sizeof(*helper); if (extension) { + switch_copy_string(cur, extension, strlen(extension) + 1); helper->extension = cur; - switch_copy_string(helper->extension, extension, strlen(extension) + 1); cur += strlen(helper->extension) + 1; } if (dialplan) { + switch_copy_string(cur, dialplan, strlen(dialplan) + 1); helper->dialplan = cur; - switch_copy_string(helper->dialplan, dialplan, strlen(dialplan) + 1); cur += strlen(helper->dialplan) + 1; } if (context) { + switch_copy_string(cur, context, strlen(context) + 1); helper->context = cur; - switch_copy_string(helper->context, context, strlen(context) + 1); } return switch_scheduler_add_task(runtime, sch_transfer_callback, (char *) __SWITCH_FUNC__, uuid, 0, helper, SSHF_FREE_ARG); @@ -1275,14 +1276,17 @@ { struct broadcast_helper *helper; size_t len = sizeof(*helper) + strlen(path) + 1; + char *cur = NULL; switch_zmalloc(helper, len); - + + cur = (char *) helper; + cur += sizeof(*helper); switch_copy_string(helper->uuid_str, uuid, sizeof(helper->uuid_str)); helper->flags = flags; - helper->path = (char *) helper + sizeof(*helper); - switch_copy_string(helper->path, path, len - sizeof(helper)); - + + switch_copy_string(cur, path, len - sizeof(helper)); + helper->path = cur; return switch_scheduler_add_task(runtime, sch_broadcast_callback, (char *) __SWITCH_FUNC__, uuid, 0, helper, SSHF_FREE_ARG); }

1 0

[Freeswitch-svn] [commit] r6127 - in freeswitch/trunk/src/mod/applications: mod_rss mod_voicemail
by Freeswitch SVN 01 Nov '07

01 Nov '07

Author: mikej Date: Thu Nov 1 09:29:06 2007 New Revision: 6127 Modified: freeswitch/trunk/src/mod/applications/mod_rss/mod_rss.c freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c Log: don't check array's for null with switch_str_nil macro (MODAPP-44) Modified: freeswitch/trunk/src/mod/applications/mod_rss/mod_rss.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_rss/mod_rss.c (original) +++ freeswitch/trunk/src/mod/applications/mod_rss/mod_rss.c Thu Nov 1 09:29:06 2007 @@ -24,6 +24,7 @@ * Contributor(s): * * Anthony Minessale II <anthmct(a)yahoo.com> + * Bret McDanel <trixter AT 0xdecafbad.com> * * * mod_rss.c -- RSS Browser @@ -323,7 +324,7 @@ goto finished; } } - if (!switch_strlen_zero(cmd)) { + if (*cmd != '\0') { int32_t i; char *p; @@ -482,7 +483,7 @@ if (status != SWITCH_STATUS_SUCCESS && status != SWITCH_STATUS_BREAK) { goto finished; } - if (!switch_strlen_zero(cmd)) { + if (*cmd != '\0') { switch (*cmd) { case '0': switch_set_flag(&dtb, SFLAG_INSTRUCT); Modified: freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c (original) +++ freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c Thu Nov 1 09:29:06 2007 @@ -1262,7 +1262,7 @@ sql = switch_mprintf("select count(*) from voicemail_prefs where user='%q' and domain = '%q'", myid, domain_name); vm_execute_sql_callback(profile, profile->mutex, sql, sql2str_callback, &cbt); switch_safe_free(sql); - if (switch_strlen_zero(msg_count) || !atoi(msg_count)) { + if (*msg_count == '\0' || !atoi(msg_count)) { sql = switch_mprintf("insert into voicemail_prefs values('%q','%q','','')", myid, domain_name); vm_execute_sql(profile, sql, profile->mutex); switch_safe_free(sql); @@ -1395,7 +1395,7 @@ goto end; } - if (switch_strlen_zero(id_buf)) { + if (*id_buf == '\0') { continue; } else { myid = id_buf; @@ -1432,7 +1432,7 @@ if (status != SWITCH_STATUS_SUCCESS) { goto end; } - if (switch_strlen_zero(pass_buf)) { + if (*pass_buf == '\0') { continue; } else { mypass = pass_buf; @@ -1656,13 +1656,13 @@ memset(buf, 0, sizeof(buf)); TRY_CODE(switch_ivr_play_file(session, NULL, cbt.name_path, &args)); } - if (switch_strlen_zero(buf)) { + if (*buf == '\0') { memset(buf, 0, sizeof(buf)); TRY_CODE(switch_ivr_phrase_macro(session, VM_PLAY_GREETING_MACRO, id, NULL, &args)); } } - if (!switch_strlen_zero(buf)) { + if (*buf != '\0') { if (!strcasecmp(buf, profile->main_menu_key)) { voicemail_check_main(session, profile_name, domain_name, id, 0); } else {

1 0

[Freeswitch-svn] [commit] r6126 - freeswitch/trunk/src/mod/codecs/mod_lpc10
by Freeswitch SVN 01 Nov '07

01 Nov '07

Author: mikej Date: Thu Nov 1 09:04:32 2007 New Revision: 6126 Modified: freeswitch/trunk/src/mod/codecs/mod_lpc10/mod_lpc10.c Log: fix mod_lpc10 module build (part of MODAPP-44) Modified: freeswitch/trunk/src/mod/codecs/mod_lpc10/mod_lpc10.c ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_lpc10/mod_lpc10.c (original) +++ freeswitch/trunk/src/mod/codecs/mod_lpc10/mod_lpc10.c Thu Nov 1 09:04:32 2007 @@ -24,14 +24,18 @@ * Contributor(s): * * Brian K. West <brian.west(a)mac.com> + * Bret McDanel <trixter AT 0xdecafbad.com> * * * mod_lpc10.c -- LPC10 Codec Module * */ -#include "switch.h" -#include "lpc10.h" +#include <switch.h> +#include <lpc10.h> + +SWITCH_MODULE_LOAD_FUNCTION(mod_lpc10_load); +SWITCH_MODULE_DEFINITION(mod_lpc10, mod_lpc10_load, NULL, NULL); enum { SamplesPerFrame = 180, @@ -44,8 +48,6 @@ #define MaxSampleValue 32767.0 #define MinSampleValue -32767.0 -static const char modname[] = "mod_lpc10"; - struct lpc10_context { struct lpc10_encoder_state encoder_object; struct lpc10_decoder_state decoder_object; @@ -177,24 +179,13 @@ /*.destroy */ switch_lpc10_destroy, }; -const switch_codec_interface_t lpc10_codec_interface = { - /*.interface_name */ "LPC-10 2.4kbps", - /*.implementations */ &lpc10_implementation, -}; - -static switch_loadable_module_interface_t lpc10_module_interface = { - /*.module_name */ modname, - /*.endpoint_interface */ NULL, - /*.timer_interface */ NULL, - /*.dialplan_interface */ NULL, - /*.codec_interface */ &lpc10_codec_interface, - /*.application_interface */ NULL -}; - -SWITCH_MOD_DECLARE(switch_status_t) switch_module_load(const switch_loadable_module_interface_t **module_interface, char *filename) +SWITCH_MODULE_LOAD_FUNCTION(mod_lpc10_load) { + switch_codec_interface_t *codec_interface; + /* connect my internal structure to the blank pointer passed to me */ - *module_interface = &lpc10_module_interface; + *module_interface = switch_loadable_module_create_module_interface(pool, modname); + SWITCH_ADD_CODEC(codec_interface, "LPC-10 2.4kbps", &lpc10_implementation); /* indicate that the module should continue to be loaded */ return SWITCH_STATUS_SUCCESS;

1 0