April 2009 - Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r12871 - freeswitch/trunk/src/mod/applications/mod_memcache
by FreeSWITCH SVN 01 Apr '09

01 Apr '09

Author: rupa Date: Wed Apr 1 14:02:59 2009 New Revision: 12871 Log: add API for memcached have to run through valgrind still Added: freeswitch/trunk/src/mod/applications/mod_memcache/ freeswitch/trunk/src/mod/applications/mod_memcache/Makefile freeswitch/trunk/src/mod/applications/mod_memcache/mod_memcache.c (contents, props changed) Added: freeswitch/trunk/src/mod/applications/mod_memcache/Makefile ============================================================================== --- (empty file) +++ freeswitch/trunk/src/mod/applications/mod_memcache/Makefile Wed Apr 1 14:02:59 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_memcache/mod_memcache.c ============================================================================== --- (empty file) +++ freeswitch/trunk/src/mod/applications/mod_memcache/mod_memcache.c Wed Apr 1 14:02:59 2009 @@ -0,0 +1,391 @@ +/* + * 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_memcache.c -- API for memcache + * + */ +#include <switch.h> +#include <libmemcached/memcached.h> + +/* Prototypes */ +SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_memcache_shutdown); +SWITCH_MODULE_RUNTIME_FUNCTION(mod_memcache_runtime); +SWITCH_MODULE_LOAD_FUNCTION(mod_memcache_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_memcache, mod_memcache_load, mod_memcache_shutdown, NULL); + +static char *SYNTAX = "memcache <set|replace|add> <key> <value> [expiration [flags]]\n" + "memcache <getflags> <key>\n" + "memcache <delete> <key>\n" + "memcache <increment|decrement> <key> [offset]\n" + "memcache <flush>\n" + "memcache <status> [verbose]\n"; + +static struct { + memcached_st *memcached; + char *memcached_str; +} globals; + +static switch_status_t config_callback_memcached(switch_xml_config_item_t *data, switch_config_callback_type_t callback_type, switch_bool_t changed) +{ + memcached_server_st *memcached_server = NULL; + memcached_st *newmemcached = NULL; + memcached_st *oldmemcached = NULL; + char *memcached_str = NULL; + memcached_return rc; + unsigned int servercount; + + if ((callback_type == CONFIG_LOAD || callback_type == CONFIG_RELOAD) && changed) { + memcached_str = *((char**)data->ptr); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "memcached data: %s\n", memcached_str); + + /* initialize main ptr */ + memcached_server = memcached_servers_parse(memcached_str); + if (!memcached_server) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Unable to initialize memcached data structure (server_list).\n"); + goto error; + } + + if ((servercount = memcached_server_list_count(memcached_server)) == 0) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "No memcache servers defined. Server string: %s.\n", memcached_str); + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%u servers defined.\n", servercount); + } + + /* setup memcached */ + newmemcached = memcached_create(NULL); + if (!newmemcached) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Unable to initialize memcached data structure (memcached_st).\n"); + goto error; + } + rc = memcached_server_push(newmemcached, memcached_server); + if (rc != MEMCACHED_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Memcache error adding server list: %s\n", memcached_strerror(newmemcached, rc)); + goto error; + } + /* memcached_behavior_set(newmemcached, MEMCACHED_BEHAVIOR_BINARY_PROTOCOL, 1); */ + + /* swap pointers */ + oldmemcached = globals.memcached; + globals.memcached = newmemcached; + newmemcached = NULL; + } + + if (memcached_server) { + memcached_server_list_free(memcached_server); + } + if (newmemcached) { + memcached_free(newmemcached); + } + if (oldmemcached) { + memcached_free(oldmemcached); + } + return SWITCH_STATUS_SUCCESS; + +error: + if (memcached_server) { + memcached_server_list_free(memcached_server); + } + if (newmemcached) { + memcached_free(newmemcached); + } + if (oldmemcached) { + memcached_free(oldmemcached); + } + return SWITCH_STATUS_GENERR; +} + +static switch_xml_config_string_options_t config_opt_memcache_servers = {NULL, 0, ".*"}; /* anything is ok here */ + +static switch_xml_config_item_t instructions[] = { + /* parameter name type reloadable pointer default value options structure */ + SWITCH_CONFIG_ITEM_CALLBACK("memcache-servers", SWITCH_CONFIG_STRING, CONFIG_REQUIRED | CONFIG_RELOAD, &globals.memcached_str, NULL, config_callback_memcached, &config_opt_memcache_servers, + "host,host:port,host", "List of memcached servers."), + SWITCH_CONFIG_ITEM_END() +}; + +static switch_status_t do_config(switch_bool_t reload) +{ + switch_xml_t cfg, xml, settings; + + memset(&globals, 0, sizeof(globals)); + + if (!(xml = switch_xml_open_cfg("memcache.conf", &cfg, NULL))) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Could not open memcache.conf\n"); + return SWITCH_STATUS_FALSE; + } + + if ((settings = switch_xml_child(cfg, "settings"))) { + if (switch_xml_config_parse(switch_xml_child(settings, "param"), 0, instructions) == SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE,"Config parsed ok!\n"); + } + } + + if (xml) { + switch_xml_free(xml); + } + + return SWITCH_STATUS_SUCCESS; +} + +SWITCH_STANDARD_API(memcache_function) +{ + char *argv[5] = { 0 }; + int argc; + char *subcmd = NULL; + char *key = NULL; + char *val = NULL; + char *expires_str = NULL; + char *flags_str = NULL; + char *mydata = NULL; + size_t string_length = 0; + time_t expires = 0; + uint32_t flags = 0; + unsigned int server_count = 0; + + memcached_return rc; + memcached_st *memcached = NULL; + memcached_stat_st *stat = NULL; + memcached_server_st *server_list; + + if (switch_strlen_zero(cmd)) { + goto usage; + } + + mydata = strdup(cmd); + if ((argc = switch_separate_string(mydata, ' ', argv, (sizeof(argv) / sizeof(argv[0]))))) { + if (argc < 1) { + goto usage; + } + + /* clone memcached struct so we're thread safe */ + memcached = memcached_clone(NULL, globals.memcached); + if (!memcached) { + stream->write_function(stream, "-ERR Error cloning memcached object\n"); + } + + subcmd = argv[0]; + + if ((!strcasecmp(subcmd, "set") || !strcasecmp(subcmd, "replace") || !strcasecmp(subcmd, "add")) && argc > 2) { + key = argv[1]; + val = argv[2]; + + if(argc > 3) { + expires_str = argv[3]; + expires = (time_t)strtol(expires_str, NULL, 10); + } + if(argc > 4) { + flags_str = argv[4]; + flags = (uint32_t)strtol(flags_str, NULL, 16); + } + if (!strcasecmp(subcmd, "set")) { + rc = memcached_set(memcached, key, strlen(key), val, strlen(val), expires, flags); + } else if (!strcasecmp(subcmd, "replace")) { + rc = memcached_replace(memcached, key, strlen(key), val, strlen(val), expires, flags); + } else if (!strcasecmp(subcmd, "add")) { + rc = memcached_add(memcached, key, strlen(key), val, strlen(val), expires, flags); + } + + if (rc == MEMCACHED_SUCCESS) { + stream->write_function(stream, "+OK\n"); + } else { + stream->write_function(stream, "-ERR Error while running command %s: %s\n", subcmd, memcached_strerror(memcached, rc)); + } + } else if (!strcasecmp(subcmd, "get") && argc > 1) { + key = argv[1]; + + val = memcached_get(memcached, key, strlen(key), &string_length, &flags, &rc); + if (rc == MEMCACHED_SUCCESS) { + stream->write_function(stream, "%.*s", (int)string_length, val); + } else { + stream->write_function(stream, "-ERR Error while running command %s: %s\n", subcmd, memcached_strerror(memcached, rc)); + } + } else if (!strcasecmp(subcmd, "getflags") && argc > 1) { + key = argv[1]; + + val = memcached_get(memcached, key, strlen(key), &string_length, &flags, &rc); + if (rc == MEMCACHED_SUCCESS) { + stream->write_function(stream, "%x", flags); + } else { + stream->write_function(stream, "-ERR Error while running command %s: %s\n", subcmd, memcached_strerror(memcached, rc)); + } + } else if ((!strcasecmp(subcmd, "increment") || !strcasecmp(subcmd, "decrement")) && argc > 1) { + key = argv[1]; + uint64_t ivalue; + unsigned int offset = 1; + if(argc > 2) { + offset = (unsigned int)strtol(argv[2], NULL, 10); + } + if (!strcasecmp(subcmd, "increment")) { + rc = memcached_increment(memcached, key, strlen(key), offset, &ivalue); + } else if (!strcasecmp(subcmd, "decrement")) { + rc = memcached_decrement(memcached, key, strlen(key), offset, &ivalue); + } + if (rc == MEMCACHED_SUCCESS) { + stream->write_function(stream, "%ld", ivalue); + } else { + stream->write_function(stream, "-ERR Error while running command %s %s: %s\n", subcmd, key, memcached_strerror(memcached, rc)); + } + } else if (!strcasecmp(subcmd, "delete") && argc > 1) { + key = argv[1]; + if(argc > 2) { + expires_str = argv[3]; + expires = (time_t)strtol(expires_str, NULL, 10); + } + rc = memcached_delete(memcached, key, strlen(key), expires); + if (rc == MEMCACHED_SUCCESS) { + stream->write_function(stream, "+OK\n", key); + } else { + stream->write_function(stream, "-ERR Error while running command %s %s: %s\n", subcmd, key, memcached_strerror(memcached, rc)); + } + } else if (!strcasecmp(subcmd, "flush")) { + if(argc > 1) { + expires_str = argv[3]; + expires = (time_t)strtol(expires_str, NULL, 10); + } + rc = memcached_flush(memcached, expires); + if (rc == MEMCACHED_SUCCESS) { + stream->write_function(stream, "+OK\n", key); + } else { + stream->write_function(stream, "-ERR Error while running command %s : %s\n", subcmd, memcached_strerror(memcached, rc)); + } + } else if (!strcasecmp(subcmd, "status")) { + switch_bool_t verbose = SWITCH_FALSE; + + if (argc > 1) { + if (!strcasecmp(argv[1], "verbose")) { + verbose = SWITCH_TRUE; + } + } + + stream->write_function(stream, "Lib version: %s\n", memcached_lib_version()); + stat = memcached_stat(memcached, NULL, &rc); + if (rc != MEMCACHED_SUCCESS && rc != MEMCACHED_SOME_ERRORS) { + stream->write_function(stream, "-ERR Error communicating with servers (%s)\n", memcached_strerror(memcached, rc)); + } + server_list = memcached_server_list(memcached); + server_count = memcached_server_count(memcached); + stream->write_function(stream, "Servers: %d\n", server_count); + for (int x=0; x < server_count; x++) { + stream->write_function(stream, " %s (%u)\n", memcached_server_name(memcached, server_list[x]), memcached_server_port(memcached, server_list[x])); + if (verbose == SWITCH_TRUE) { + char **list; + char **ptr; + char *value; + memcached_return rc2; + + list = memcached_stat_get_keys(memcached, &stat[x], &rc); + for (ptr = list; *ptr; ptr++) { + value = memcached_stat_get_value(memcached, &stat[x], *ptr, &rc2); + stream->write_function(stream, " %s: %s\n", *ptr, value); + switch_safe_free(value); + } + switch_safe_free(list); + stream->write_function(stream, "\n"); + } + } + } else { + goto usage; + } + } + + if (memcached) { + memcached_quit(memcached); + memcached_free(memcached); + } + switch_safe_free(mydata); + switch_safe_free(stat); + return SWITCH_STATUS_SUCCESS; +usage: + if (memcached) { + memcached_quit(memcached); + memcached_free(memcached); + } + switch_safe_free(mydata); + stream->write_function(stream, "-ERR\n%s\n", SYNTAX); + return SWITCH_STATUS_SUCCESS; +} + +/* Macro expands to: switch_status_t mod_memcache_load(switch_loadable_module_interface_t **module_interface, switch_memory_pool_t *pool) */ +SWITCH_MODULE_LOAD_FUNCTION(mod_memcache_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); + + do_config(SWITCH_FALSE); + + SWITCH_ADD_API(api_interface, "memcache", "Memcache API", memcache_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_memcache_shutdown() */ +SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_memcache_shutdown) +{ + /* Cleanup dynamically allocated config settings */ + switch_xml_config_cleanup(instructions); + if (globals.memcached) { + memcached_free(globals.memcached); + } + 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_memcache_runtime() +SWITCH_MODULE_RUNTIME_FUNCTION(mod_memcache_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] r12870 - freeswitch/trunk/src/mod/applications/mod_skel
by FreeSWITCH SVN 01 Apr '09

01 Apr '09

Author: mrene Date: Wed Apr 1 13:47:58 2009 New Revision: 12870 Log: tweak Modified: freeswitch/trunk/src/mod/applications/mod_skel/mod_skel.c 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 Wed Apr 1 13:47:58 2009 @@ -98,7 +98,7 @@ { memset(&globals, 0, sizeof(globals)); - if (switch_xml_config_parse_module_settings("skel.conf", SWITCH_FALSE, instructions) != SWITCH_STATUS_SUCCESS) { + if (switch_xml_config_parse_module_settings("skel.conf", reload, instructions) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Could not open skel.conf\n"); return SWITCH_STATUS_FALSE; }

1 0

[commit] r12869 - freeswitch/trunk/src/mod/applications/mod_skel
by FreeSWITCH SVN 01 Apr '09

01 Apr '09

Author: mrene Date: Wed Apr 1 13:44:51 2009 New Revision: 12869 Log: refactor Modified: freeswitch/trunk/src/mod/applications/mod_skel/mod_skel.c 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 Wed Apr 1 13:44:51 2009 @@ -96,25 +96,12 @@ static switch_status_t do_config(switch_bool_t reload) { - switch_xml_t cfg, xml, settings; - memset(&globals, 0, sizeof(globals)); - if (!(xml = switch_xml_open_cfg("skel.conf", &cfg, NULL))) { + if (switch_xml_config_parse_module_settings("skel.conf", SWITCH_FALSE, instructions) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Could not open skel.conf\n"); return SWITCH_STATUS_FALSE; } - - if ((settings = switch_xml_child(cfg, "settings"))) { - if (switch_xml_config_parse(switch_xml_child(settings, "param"), 0, instructions) == SWITCH_STATUS_SUCCESS) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE,"Config parsed ok!\n"); - return SWITCH_STATUS_SUCCESS; - } - } - - if (xml) { - switch_xml_free(xml); - } return SWITCH_STATUS_SUCCESS; }

1 0

[commit] r12868 - freeswitch/trunk/src/mod/applications/mod_skel
by FreeSWITCH SVN 01 Apr '09

01 Apr '09

Author: mrene Date: Wed Apr 1 13:41:46 2009 New Revision: 12868 Log: Free the node element Modified: freeswitch/trunk/src/mod/applications/mod_skel/mod_skel.c 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 Wed Apr 1 13:41:46 2009 @@ -112,8 +112,8 @@ } } - if (cfg) { - switch_xml_free(cfg); + if (xml) { + switch_xml_free(xml); } return SWITCH_STATUS_SUCCESS;

1 0

[commit] r12867 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by FreeSWITCH SVN 01 Apr '09

01 Apr '09

Author: anthm Date: Wed Apr 1 11:53:04 2009 New Revision: 12867 Log: add another destroy case for notify packets Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Wed Apr 1 11:53:04 2009 @@ -539,6 +539,11 @@ break; } + if ((sofia_private && sofia_private == &mod_sofia_globals.destroy_private) || (status >= 300 && status != 401 && status != 407)) { + nua_handle_bind(nh, NULL); + nua_handle_destroy(nh); + nh = NULL; + } if (check_destroy) { if (nh && ((sofia_private && sofia_private->destroy_nh) || !nua_handle_magic(nh))) {

1 0

[commit] r12866 - freeswitch/trunk/src
by FreeSWITCH SVN 01 Apr '09

01 Apr '09

Author: anthm Date: Wed Apr 1 11:51:23 2009 New Revision: 12866 Log: tweak debug message Modified: freeswitch/trunk/src/switch_core_memory.c Modified: freeswitch/trunk/src/switch_core_memory.c ============================================================================== --- freeswitch/trunk/src/switch_core_memory.c (original) +++ freeswitch/trunk/src/switch_core_memory.c Wed Apr 1 11:51:23 2009 @@ -348,7 +348,7 @@ #ifdef DEBUG_ALLOC2 switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, func, line, NULL, SWITCH_LOG_CONSOLE, "New Pool\n"); #endif - tmp = switch_core_sprintf(*pool, "%s:%d", func, line); + tmp = switch_core_sprintf(*pool, "%s:%d", file, line); apr_pool_tag(*pool, tmp); @@ -576,6 +576,7 @@ apr_allocator_mutex_set(my_allocator, my_mutex); apr_pool_mutex_set(memory_manager.memory_pool, my_mutex); apr_allocator_owner_set(my_allocator, memory_manager.memory_pool); + apr_pool_tag(memory_manager.memory_pool, "core_pool"); #else apr_pool_create(&memory_manager.memory_pool, NULL); switch_assert(memory_manager.memory_pool != NULL);

1 0

[commit] r12865 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by FreeSWITCH SVN 01 Apr '09

01 Apr '09

Author: anthm Date: Wed Apr 1 11:35:37 2009 New Revision: 12865 Log: just ok mwi notifies Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Wed Apr 1 11:35:37 2009 @@ -92,7 +92,7 @@ int sub_state; tl_gets(tags, NUTAG_SUBSTATE_REF(sub_state), TAG_END()); - + /* make sure we have a proper event */ if (!sip || !sip->sip_event) { goto error; @@ -254,8 +254,14 @@ error: - nua_respond(nh, 481, "Subscription Does Not Exist", NUTAG_WITH_THIS(nua), TAG_END()); + if (sip->sip_event && sip->sip_event->o_type && !strcasecmp(sip->sip_event->o_type, "message-summary")) { + /* unsolicited mwi, just say ok */ + nua_respond(nh, SIP_200_OK, NUTAG_WITH_THIS(nua), TAG_END()); + } else { + nua_respond(nh, 481, "Subscription Does Not Exist", NUTAG_WITH_THIS(nua), TAG_END()); + } + end: if (sub_state == nua_substate_terminated) {

1 0

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

01 Apr '09

Author: anthm Date: Wed Apr 1 09:26:57 2009 New Revision: 12864 Log: clean up pin prommpting and make local override stay local 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 Wed Apr 1 09:26:57 2009 @@ -4715,11 +4715,6 @@ /* Set the minimum number of members (once you go above it you cannot go below it) */ conference->min = 2; - /* if the dialplan specified a pin, override the profile's value */ - if (dpin) { - conference->pin = switch_core_strdup(conference->pool, dpin); - } - /* Indicate the conference is dynamic */ switch_set_flag_locked(conference, CFLAG_DYNAMIC); @@ -4743,11 +4738,6 @@ goto done; } - /* if the dialplan specified a pin, override the profile's value */ - if (dpin) { - conference->pin = switch_core_strdup(conference->pool, dpin); - } - switch_channel_set_variable(channel, "conference_name", conference->name); /* Set the minimum number of members (once you go above it you cannot go below it) */ @@ -4769,8 +4759,14 @@ } rl++; + if (!dpin && conference->pin) { + dpin = conference->pin; + } + + + /* if this is not an outbound call, deal with conference pins */ - if (enforce_security && conference->pin && *(conference->pin)) { + if (enforce_security && !switch_strlen_zero(dpin)) { char pin_buf[80] = ""; int pin_retries = 3; /* XXX - this should be configurable - i'm too lazy to do it right now... */ int pin_valid = 0; @@ -4778,28 +4774,47 @@ /* Answer the channel */ switch_channel_answer(channel); + + if (!conference->pin_sound) { + conference->pin_sound = switch_core_strdup(conference->pool, "conference/conf-pin.wav"); + } - while (!pin_valid && pin_retries && status == SWITCH_STATUS_SUCCESS) { + if (!conference->bad_pin_sound) { + conference->bad_pin_sound = switch_core_strdup(conference->pool, "conference/conf-bad-pin.wav"); + } + while (!pin_valid && pin_retries && status == SWITCH_STATUS_SUCCESS) { + switch_status_t pstatus = SWITCH_STATUS_FALSE; + /* be friendly */ if (conference->pin_sound) { - conference_local_play_file(conference, session, conference->pin_sound, 20, pin_buf, sizeof(pin_buf)); + pstatus = conference_local_play_file(conference, session, conference->pin_sound, 20, pin_buf, sizeof(pin_buf)); + } else if (conference->tts_engine && conference->tts_voice) { + pstatus = switch_ivr_speak_text(session, conference->tts_engine, conference->tts_voice, "please enter the conference pin number", NULL); + } else { + pstatus = switch_ivr_speak_text(session, "flite", "slt", "please enter the conference pin number", NULL); } + + if (pstatus != SWITCH_STATUS_SUCCESS && pstatus != SWITCH_STATUS_BREAK) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Cannot ask the user for a pin, ending call"); + switch_channel_hangup(channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER); + } + /* wait for them if neccessary */ - if (strlen(pin_buf) < strlen(conference->pin)) { + if (strlen(pin_buf) < strlen(dpin)) { char *buf = pin_buf + strlen(pin_buf); char term = '\0'; - + status = switch_ivr_collect_digits_count(session, buf, sizeof(pin_buf) - strlen(pin_buf), - strlen(conference->pin) - strlen(pin_buf), "#", &term, 10000, 0, 0); + strlen(dpin) - strlen(pin_buf), "#", &term, 10000, 0, 0); if (status == SWITCH_STATUS_TIMEOUT) { status = SWITCH_STATUS_SUCCESS; } } - pin_valid = (status == SWITCH_STATUS_SUCCESS && strcmp(pin_buf, conference->pin) == 0); + pin_valid = (status == SWITCH_STATUS_SUCCESS && strcmp(pin_buf, dpin) == 0); if (!pin_valid) { /* zero the collected pin */ memset(pin_buf, 0, sizeof(pin_buf));

1 0

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

01 Apr '09

Author: anthm Date: Wed Apr 1 08:57:16 2009 New Revision: 12863 Log: add conference_enforce_security variable to bypass or require pin or locked flag 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 Wed Apr 1 08:57:16 2009 @@ -4727,6 +4727,13 @@ launch_conference_thread(conference); } else { + int enforce_security = !switch_channel_test_flag(channel, CF_OUTBOUND); + const char *pvar = switch_channel_get_variable(channel, "conference_enforce_security"); + + if (pvar) { + enforce_security = switch_true(pvar); + } + /* if the conference exists, get the pointer to it */ if (!(conference = (conference_obj_t *) switch_core_hash_find(globals.conference_hash, conf_name))) { /* couldn't find the conference, create one */ @@ -4763,7 +4770,7 @@ rl++; /* if this is not an outbound call, deal with conference pins */ - if (!switch_channel_test_flag(channel, CF_OUTBOUND) && conference->pin && *(conference->pin)) { + if (enforce_security && conference->pin && *(conference->pin)) { char pin_buf[80] = ""; int pin_retries = 3; /* XXX - this should be configurable - i'm too lazy to do it right now... */ int pin_valid = 0; @@ -4815,7 +4822,7 @@ } /* don't allow more callers if the conference is locked, unless we invited them */ - if (switch_test_flag(conference, CFLAG_LOCKED) && !switch_channel_test_flag(channel, CF_OUTBOUND)) { + if (switch_test_flag(conference, CFLAG_LOCKED) && enforce_security) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Conference %s is locked.\n", conf_name); if (conference->locked_sound) { /* Answer the channel */

1 0

[commit] r12862 - in freeswitch/trunk/src/mod/languages: mod_lua mod_perl mod_python mod_spidermonkey
by FreeSWITCH SVN 01 Apr '09

01 Apr '09

Author: brian Date: Tue Mar 31 22:17:27 2009 New Revision: 12862 Log: remove lingering code that is not needed anymore Modified: freeswitch/trunk/src/mod/languages/mod_lua/mod_lua.cpp freeswitch/trunk/src/mod/languages/mod_perl/mod_perl.c freeswitch/trunk/src/mod/languages/mod_python/mod_python.c freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c Modified: freeswitch/trunk/src/mod/languages/mod_lua/mod_lua.cpp ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_lua/mod_lua.cpp (original) +++ freeswitch/trunk/src/mod/languages/mod_lua/mod_lua.cpp Tue Mar 31 22:17:27 2009 @@ -44,7 +44,6 @@ static struct { switch_memory_pool_t *pool; char *xml_handler; - switch_event_node_t *node; } globals; int luaopen_freeswitch(lua_State * L); @@ -461,7 +460,6 @@ SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_lua_shutdown) { - switch_event_unbind(&globals.node); return SWITCH_STATUS_SUCCESS; } Modified: freeswitch/trunk/src/mod/languages/mod_perl/mod_perl.c ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_perl/mod_perl.c (original) +++ freeswitch/trunk/src/mod/languages/mod_perl/mod_perl.c Tue Mar 31 22:17:27 2009 @@ -54,7 +54,6 @@ PerlInterpreter *my_perl; switch_memory_pool_t *pool; char *xml_handler; - switch_event_node_t *node; } globals; Modified: freeswitch/trunk/src/mod/languages/mod_python/mod_python.c ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_python/mod_python.c (original) +++ freeswitch/trunk/src/mod/languages/mod_python/mod_python.c Tue Mar 31 22:17:27 2009 @@ -57,7 +57,6 @@ static struct { switch_memory_pool_t *pool; char *xml_handler; - switch_event_node_t *node; } globals; static void eval_some_python(const char *funcname, char *args, switch_core_session_t *session, switch_stream_handle_t *stream, switch_event_t *params, char **str) @@ -412,7 +411,7 @@ Py_Finalize(); PyEval_ReleaseLock(); - switch_event_unbind(&globals.node); + return SWITCH_STATUS_UNLOAD; } Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c (original) +++ freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c Tue Mar 31 22:17:27 2009 @@ -95,7 +95,6 @@ FILE *gOutFile; int stackDummy; JSRuntime *rt; - switch_event_node_t *node; } globals; static JSClass global_class = { @@ -3723,7 +3722,7 @@ //JS_DestroyRuntime(globals.rt); curl_global_cleanup(); - switch_event_unbind(&globals.node); + switch_core_hash_destroy(&module_manager.mod_hash); switch_core_hash_destroy(&module_manager.load_hash); return SWITCH_STATUS_SUCCESS;

1 0