May 2007 - Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r5133 - freeswitch/trunk/src/mod/event_handlers/mod_radius_cdr
by Freeswitch SVN 10 May '07

10 May '07

Author: mikej Date: Thu May 10 15:32:09 2007 New Revision: 5133 Added: freeswitch/trunk/src/mod/event_handlers/mod_radius_cdr/ Log: add dir, things to fill it at some point in the future.

1 0

[commit] r5131 - in freeswitch/trunk: conf src/mod/xml_int/mod_xml_curl
by Freeswitch SVN 10 May '07

10 May '07

Author: mikej Date: Thu May 10 15:11:00 2007 New Revision: 5131 Modified: freeswitch/trunk/conf/xml_curl.conf.xml freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c Log: fix for MDXMLINT-7 from Simon P. Ditner . Added config option disable-100-continue to disable the Expect: 100-continue HTTP 1.1 header so that it will work with lighthttpd. Modified: freeswitch/trunk/conf/xml_curl.conf.xml ============================================================================== --- freeswitch/trunk/conf/xml_curl.conf.xml (original) +++ freeswitch/trunk/conf/xml_curl.conf.xml Thu May 10 15:11:00 2007 @@ -8,6 +8,8 @@ <param name="gateway-url" value="http://www.mydomain.com/test.cgi" bindings="dialplan"/>   +  +  </binding> </bindings> </configuration> Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c ============================================================================== --- freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c (original) +++ freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c Thu May 10 15:11:00 2007 @@ -37,6 +37,7 @@ char *url; char *bindings; char *cred; + int disable100continue; }; typedef struct xml_binding xml_binding_t; @@ -68,6 +69,7 @@ char uuid_str[SWITCH_UUID_FORMATTED_LENGTH + 1]; xml_binding_t *binding = (xml_binding_t *) user_data; char *file_url; + struct curl_slist *slist = NULL; if (!binding) { return NULL; @@ -115,6 +117,12 @@ curl_easy_setopt(curl_handle, CURLOPT_WRITEFUNCTION, file_callback); curl_easy_setopt(curl_handle, CURLOPT_WRITEDATA, (void *) &config_data); curl_easy_setopt(curl_handle, CURLOPT_USERAGENT, "freeswitch-xml/1.0"); + + if (binding->disable100continue) { + slist = curl_slist_append(slist,"Expect:"); + curl_easy_setopt(curl_handle, CURLOPT_HTTPHEADER, slist); + } + curl_easy_perform(curl_handle); curl_easy_cleanup(curl_handle); close(config_data.fd); @@ -169,6 +177,7 @@ char *url = NULL; char *bind_cred = NULL; char *bind_mask = NULL; + int disable100continue = 0; for (param = switch_xml_child(binding_tag, "param"); param; param = param->next) { char *var = (char *) switch_xml_attr_soft(param, "name"); @@ -180,6 +189,8 @@ } } else if (!strcasecmp(var, "gateway-credentials")) { bind_cred = val; + } else if (!strcasecmp(var, "disable-100-continue ") && switch_true(val)) { + disable100continue = 1; } } @@ -203,6 +214,8 @@ binding->cred = strdup(bind_cred); } + binding->disable100continue = disable100continue; + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Binding [%s] XML Fetch Function [%s] [%s]\n", switch_strlen_zero(bname) ? "N/A" : bname, binding->url, binding->bindings ? binding->bindings : "all"); switch_xml_bind_search_function(xml_url_fetch, switch_xml_parse_section_string(binding->bindings), binding);

1 0

[commit] r5130 - freeswitch/trunk/src/mod/languages/mod_python
by Freeswitch SVN 10 May '07

10 May '07

Author: mikej Date: Thu May 10 14:51:47 2007 New Revision: 5130 Modified: freeswitch/trunk/src/mod/languages/mod_python/freeswitch_python.cpp freeswitch/trunk/src/mod/languages/mod_python/mod_python.c Log: merge fix for MODLANG-15 from Traun Leyden. Thanks Traun. Modified: freeswitch/trunk/src/mod/languages/mod_python/freeswitch_python.cpp ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_python/freeswitch_python.cpp (original) +++ freeswitch/trunk/src/mod/languages/mod_python/freeswitch_python.cpp Thu May 10 14:51:47 2007 @@ -9,8 +9,8 @@ tts_name = NULL; voice_name = NULL; - if (session = switch_core_session_locate(uuid)) { - channel = switch_core_session_get_channel(session); + if (session = switch_core_session_locate(uuid)) { + channel = switch_core_session_get_channel(session); } } @@ -83,7 +83,10 @@ ap = &args; } + Py_BEGIN_ALLOW_THREADS status = switch_ivr_play_file(session, NULL, file, ap); + Py_END_ALLOW_THREADS + return status == SWITCH_STATUS_SUCCESS ? 1 : 0; } @@ -114,7 +117,10 @@ ap = &args; } + Py_BEGIN_ALLOW_THREADS status = switch_ivr_speak_text(session, tts_name, voice_name, codec->implementation->samples_per_second, text, ap); + Py_END_ALLOW_THREADS + return status == SWITCH_STATUS_SUCCESS ? 1 : 0; } @@ -129,7 +135,11 @@ { switch_status_t status; sanity_check(-1); + + Py_BEGIN_ALLOW_THREADS status = switch_ivr_collect_digits_count(session, dtmf_buf,(uint32_t) len,(uint32_t) len, terminators, terminator, (uint32_t) timeout); + Py_END_ALLOW_THREADS + return status == SWITCH_STATUS_SUCCESS ? 1 : 0; } @@ -137,7 +147,11 @@ { switch_status_t status; sanity_check(-1); + + Py_BEGIN_ALLOW_THREADS status = switch_ivr_session_transfer(session, extension, dialplan, context); + Py_END_ALLOW_THREADS + return status == SWITCH_STATUS_SUCCESS ? 1 : 0; } @@ -146,9 +160,13 @@ { switch_status_t status; sanity_check(-1); + + Py_BEGIN_ALLOW_THREADS status = switch_play_and_get_digits( session, (uint32_t) min_digits,(uint32_t) max_digits, (uint32_t) max_tries, (uint32_t) timeout, terminators, audio_files, bad_input_audio_files, dtmf_buf, 128, digits_regex); + Py_END_ALLOW_THREADS + return status == SWITCH_STATUS_SUCCESS ? 1 : 0; } 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 Thu May 10 14:51:47 2007 @@ -25,6 +25,7 @@ * * Brian Fertig <brian.fertig(a)convergencetek.com> * Johny Kadarisman <jkr888(a)gmail.com> + * Traun Leyden <tleyden(a)branchcut.com> * * mod_python.c -- Python Module * @@ -43,6 +44,7 @@ #include <switch.h> +static PyThreadState *mainThreadState = NULL; void init_freeswitch(void); static switch_api_interface_t python_run_interface; @@ -51,7 +53,7 @@ static void eval_some_python(char *uuid, char *args) { - PyThreadState *tstate; + PyThreadState *tstate = NULL; FILE *pythonfile = NULL; char *dupargs = NULL; char *argv[128] = {0}; @@ -97,16 +99,15 @@ if ((pythonfile = fopen(script_path, "r"))) { - tstate = Py_NewInterpreter(); + PyEval_AcquireLock(); + tstate = PyThreadState_New(mainThreadState->interp); if (!tstate) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "error acquiring tstate\n"); goto done; } - - - PyThreadState_Clear(tstate); - init_freeswitch(); + PyThreadState_Swap(tstate); + init_freeswitch(); PyRun_SimpleString("from freeswitch import *"); if (uuid) { char code[128]; @@ -115,7 +116,11 @@ } PySys_SetArgv(argc - lead, &argv[lead]); PyRun_SimpleFile(pythonfile, script); - Py_EndInterpreter(tstate); + PyThreadState_Swap(NULL); + PyThreadState_Clear(tstate); + PyThreadState_Delete(tstate); + PyEval_ReleaseLock(); + } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "error running %s\n", script_path); @@ -134,7 +139,6 @@ static void python_function(switch_core_session_t *session, char *data) { - eval_some_python(switch_core_session_get_uuid(session), (char *)data); } @@ -217,9 +221,6 @@ /*.directory_interface */ NULL }; -//static PyThreadState *gtstate; -static PyThreadState *mainThreadState; - SWITCH_MOD_DECLARE(switch_status_t) switch_module_load(const switch_loadable_module_interface_t **module_interface, char *filename) { /* connect my internal structure to the blank pointer passed to me */ @@ -231,10 +232,9 @@ mainThreadState = PyThreadState_Get(); - PyEval_ReleaseLock(); + PyThreadState_Swap(NULL); - eval_some_python(NULL, "init_python.py"); - PyThreadState_Swap(NULL); + PyEval_ReleaseLock(); /* indicate that the module should continue to be loaded */ return SWITCH_STATUS_SUCCESS; @@ -244,19 +244,19 @@ Called when the system shuts down*/ SWITCH_MOD_DECLARE(switch_status_t) switch_module_shutdown(void) { + PyInterpreterState *mainInterpreterState; + PyThreadState *myThreadState; - PyInterpreterState *mainInterpreterState; - PyThreadState *myThreadState; + PyEval_AcquireLock(); + mainInterpreterState = mainThreadState->interp; + myThreadState = PyThreadState_New(mainInterpreterState); + PyThreadState_Swap(myThreadState); + PyEval_ReleaseLock(); + + Py_Finalize(); + PyEval_ReleaseLock(); + return SWITCH_STATUS_SUCCESS; - PyEval_AcquireLock(); - mainInterpreterState = mainThreadState->interp; - myThreadState = PyThreadState_New(mainInterpreterState); - PyThreadState_Swap(myThreadState); - PyEval_ReleaseLock(); - - Py_Finalize(); - PyEval_ReleaseLock(); - return SWITCH_STATUS_SUCCESS; }

1 0

[commit] r5129 - freeswitch/trunk/src/mod/applications/mod_esf
by Freeswitch SVN 10 May '07

10 May '07

Author: mikej Date: Thu May 10 14:46:28 2007 New Revision: 5129 Modified: freeswitch/trunk/src/mod/applications/mod_esf/ (props changed) Log: svn:ignore

1 0

[commit] r5127 - freeswitch/trunk/build
by Freeswitch SVN 10 May '07

10 May '07

Author: anthm Date: Thu May 10 14:23:56 2007 New Revision: 5127 Added: freeswitch/trunk/build/ignore_helper.pl Log: add ignore_helper.pl Added: freeswitch/trunk/build/ignore_helper.pl ============================================================================== --- (empty file) +++ freeswitch/trunk/build/ignore_helper.pl Thu May 10 14:23:56 2007 @@ -0,0 +1,74 @@ +################################################################################ +# ignore_helper.pl +# Copyright (c) 2007 Anthony Minessale II <anthmct(a)yahoo.com> +# +# Permission is hereby granted, free of charge, to any person +# obtaining a copy of this software and associated documentation +# files (the "Software"), to deal in the Software without +# restriction, including without limitation the rights to use, +# copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the +# Software is furnished to do so, subject to the following +# conditions: +# +# The above copyright notice and this permission notice shall be +# included in all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES +# OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT +# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +# OTHER DEALINGS IN THE SOFTWARE. +# +# Usage: cat <file with list of things to ignore (full path from trunk root) > | ignore_helper.pl +# +################################################################################ + +while (<>) { + my $path = $_; + my ($dir, $file) = $path =~ /(.*)\/([^\/]+)$/; + if (!$dir) { + $dir = "."; + $file = $path; + } + + my $props = $PROP_HASH{$dir}; + if (!$props) { + my @prop_tmp = `svn propget svn:ignore $dir`; + my @prop_tmp2; + foreach (@prop_tmp) { + $_ =~ s/[\r\n]//g; + if ($_) { + push @prop_tmp2, $_; + } + } + $props = \@prop_tmp2; + + $PROP_HASH{$dir} = $props; + } + if ($props) { + push @{$props}, "$file"; + } +} + +foreach (keys %PROP_HASH) { + my $dir = $_; + my @list = @{$PROP_HASH{$dir}}; + my $path = $dir; + $path =~ s/\//_/g; + $path = "/tmp/$path.tmp"; + + print "Setting Properties on $dir\n"; + + open O, ">$path"; + foreach (@list) { + print O "$_\n"; + } + close O; + my $cmd = "svn propset svn:ignore -F $path $dir"; + system($cmd); + unlink($path); +}

1 0

[commit] r5123 - in freeswitch/trunk: . conf src src/include src/include/private
by Freeswitch SVN 10 May '07

10 May '07

Author: anthm Date: Thu May 10 12:56:29 2007 New Revision: 5123 Modified: freeswitch/trunk/Makefile.am freeswitch/trunk/conf/switch.conf.xml freeswitch/trunk/configure.in freeswitch/trunk/src/include/private/switch_core.h freeswitch/trunk/src/include/switch_utils.h freeswitch/trunk/src/switch_core.c freeswitch/trunk/src/switch_core_memory.c freeswitch/trunk/src/switch_core_session.c freeswitch/trunk/src/switch_core_sqldb.c freeswitch/trunk/src/switch_core_state_machine.c Log: make crash protection a runtime option instead of a compile-time option Modified: freeswitch/trunk/Makefile.am ============================================================================== --- freeswitch/trunk/Makefile.am (original) +++ freeswitch/trunk/Makefile.am Thu May 10 12:56:29 2007 @@ -10,10 +10,6 @@ BASE = $(switch_srcdir) OSARCH=`uname -s` -if CRASHPROT -AM_CFLAGS += -DCRASH_PROT -endif - .DEFAULT: @cd src/mod && $(MAKE) $(AM_MAKEFLAGS) $@ Modified: freeswitch/trunk/conf/switch.conf.xml ============================================================================== --- freeswitch/trunk/conf/switch.conf.xml (original) +++ freeswitch/trunk/conf/switch.conf.xml Thu May 10 12:56:29 2007 @@ -2,6 +2,8 @@ <settings>  <param name="max-sessions" value="1000"/> +  + <param name="crash-protection" value="false"/>    Modified: freeswitch/trunk/configure.in ============================================================================== --- freeswitch/trunk/configure.in (original) +++ freeswitch/trunk/configure.in Thu May 10 12:56:29 2007 @@ -311,9 +311,6 @@ LIBCURL_CHECK_CONFIG([yes], [7.13.0], [LIBCURL_DEPS=''], [LIBCURL_DEPS='${switch_srcdir}/libs/curl/lib/libcurl.la';LIBCURL='${switch_srcdir}/libs/curl/lib/libcurl.la';LIBCURL_CPPFLAGS='-I${switch_srcdir}/libs/curl/include']) AC_SUBST(LIBCURL_DEPS) -AC_ARG_ENABLE(crash-protection, - [ --enable-crash-protection Compile with CRASH Protection],,[enable_crash_prot="no"]) - AC_ARG_ENABLE(core-odbc-support, [ --enable-core-odbc-support Compile with ODBC Support],,[enable_core_odbc_support="no"]) @@ -323,7 +320,6 @@ #AX_LIB_MYSQL([MINIMUM-VERSION]) AX_LIB_MYSQL -AM_CONDITIONAL([CRASHPROT],[test "x$enable_crash_prot" != "xno"]) AM_CONDITIONAL([ADD_ODBC],[test "x$enable_core_odbc_support" != "xno"]) AM_CONDITIONAL([ADD_LIBEDIT],[test "x$enable_core_libedit_support" != "xno"]) AM_CONDITIONAL([HAVE_MYSQL],[test "$found_mysql" = "yes"]) Modified: freeswitch/trunk/src/include/private/switch_core.h ============================================================================== --- freeswitch/trunk/src/include/private/switch_core.h (original) +++ freeswitch/trunk/src/include/private/switch_core.h Thu May 10 12:56:29 2007 @@ -63,12 +63,6 @@ /* #define DEBUG_ALLOC */ #define DO_EVENTS -#ifdef CRASH_PROT -#define __CP "ENABLED" -#else -#define __CP "DISABLED" -#endif - #define SWITCH_EVENT_QUEUE_LEN 256 #define SWITCH_MESSAGE_QUEUE_LEN 256 #define SWITCH_SQL_QUEUE_LEN 2000 @@ -145,6 +139,22 @@ struct switch_media_bug *next; }; +struct switch_runtime { + switch_time_t initiated; + switch_hash_t *global_vars; + switch_memory_pool_t *memory_pool; + const switch_state_handler_table_t *state_handlers[SWITCH_MAX_STATE_HANDLERS]; + int state_handler_index; + FILE *console; + uint8_t running; + char uuid_str[SWITCH_UUID_FORMATTED_LENGTH + 1]; + uint32_t no_new_sessions; + uint32_t shutting_down; + uint32_t crash_prot; +}; + +extern struct switch_runtime runtime; + void switch_core_sqldb_start(switch_memory_pool_t *pool); void switch_core_sqldb_stop(void); void switch_core_session_init(switch_memory_pool_t *pool); Modified: freeswitch/trunk/src/include/switch_utils.h ============================================================================== --- freeswitch/trunk/src/include/switch_utils.h (original) +++ freeswitch/trunk/src/include/switch_utils.h Thu May 10 12:56:29 2007 @@ -76,6 +76,8 @@ (expr && ( !strcasecmp(expr, "yes") ||\ !strcasecmp(expr, "on") ||\ !strcasecmp(expr, "true") ||\ +!strcasecmp(expr, "enabled") ||\ +!strcasecmp(expr, "active") ||\ atoi(expr))) ? SWITCH_TRUE : SWITCH_FALSE /*! \brief find local ip of the box Modified: freeswitch/trunk/src/switch_core.c ============================================================================== --- freeswitch/trunk/src/switch_core.c (original) +++ freeswitch/trunk/src/switch_core.c Thu May 10 12:56:29 2007 @@ -40,19 +40,7 @@ SWITCH_DECLARE_DATA switch_directories SWITCH_GLOBAL_dirs = { 0 }; /* The main runtime obj we keep this hidden for ourselves */ -static struct { - switch_time_t initiated; - switch_hash_t *global_vars; - switch_memory_pool_t *memory_pool; - const switch_state_handler_table_t *state_handlers[SWITCH_MAX_STATE_HANDLERS]; - int state_handler_index; - FILE *console; - uint8_t running; - char uuid_str[SWITCH_UUID_FORMATTED_LENGTH + 1]; - uint32_t no_new_sessions; - uint32_t shutting_down; -} runtime; - +struct switch_runtime runtime; static void send_heartbeat(void) { @@ -424,7 +412,6 @@ switch_core_set_globals(); switch_core_session_init(runtime.memory_pool); - switch_core_state_machine_init(runtime.memory_pool); switch_core_hash_init(&runtime.global_vars, runtime.memory_pool); @@ -443,7 +430,9 @@ const char *var = switch_xml_attr_soft(param, "name"); const char *val = switch_xml_attr_soft(param, "value"); - if (!strcasecmp(var, "max-sessions")) { + if (!strcasecmp(var, "crash-protection")) { + runtime.crash_prot = switch_true(val); + } else if (!strcasecmp(var, "max-sessions")) { switch_core_session_limit(atoi(val)); } else if (!strcasecmp(var, "rtp-start-port")) { @@ -469,6 +458,8 @@ switch_xml_free(xml); } + switch_core_state_machine_init(runtime.memory_pool); + *err = NULL; if (console) { @@ -583,7 +574,8 @@ } switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, - "\nFreeSWITCH Version %s Started.\nCrash Protection [%s]\nMax Sessions[%u]\n\n", SWITCH_VERSION_FULL, __CP, + "\nFreeSWITCH Version %s Started.\nCrash Protection [%s]\nMax Sessions[%u]\n\n", SWITCH_VERSION_FULL, + runtime.crash_prot ? "Enabled" : "Disabled", switch_core_session_limit(0)); return SWITCH_STATUS_SUCCESS; Modified: freeswitch/trunk/src/switch_core_memory.c ============================================================================== --- freeswitch/trunk/src/switch_core_memory.c (original) +++ freeswitch/trunk/src/switch_core_memory.c Thu May 10 12:56:29 2007 @@ -36,7 +36,7 @@ static struct { switch_memory_pool_t *memory_pool; -} runtime; +} memory_manager; SWITCH_DECLARE(switch_memory_pool_t *) switch_core_session_get_pool(switch_core_session_t *session) { @@ -68,14 +68,14 @@ SWITCH_DECLARE(void *) switch_core_permanent_alloc(switch_size_t memory) { void *ptr = NULL; - assert(runtime.memory_pool != NULL); + assert(memory_manager.memory_pool != NULL); #ifdef DEBUG_ALLOC switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Perm Allocate %d\n", memory); #endif - if ((ptr = apr_palloc(runtime.memory_pool, memory)) != 0) { + if ((ptr = apr_palloc(memory_manager.memory_pool, memory)) != 0) { memset(ptr, 0, memory); } return ptr; @@ -85,7 +85,7 @@ { char *duped = NULL; switch_size_t len; - assert(runtime.memory_pool != NULL); + assert(memory_manager.memory_pool != NULL); if (!todup) return NULL; @@ -96,7 +96,7 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Perm Allocate %d\n", len); #endif - if (todup && (duped = apr_palloc(runtime.memory_pool, len)) != 0) { + if (todup && (duped = apr_palloc(memory_manager.memory_pool, len)) != 0) { strncpy(duped, todup, len); } return duped; @@ -214,8 +214,8 @@ switch_memory_pool_t *switch_core_memory_init(void) { - memset(&runtime, 0, sizeof(runtime)); + memset(&memory_manager, 0, sizeof(memory_manager)); - apr_pool_create(&runtime.memory_pool, NULL); - return runtime.memory_pool; + apr_pool_create(&memory_manager.memory_pool, NULL); + return memory_manager.memory_pool; } Modified: freeswitch/trunk/src/switch_core_session.c ============================================================================== --- freeswitch/trunk/src/switch_core_session.c (original) +++ freeswitch/trunk/src/switch_core_session.c Thu May 10 12:56:29 2007 @@ -41,7 +41,7 @@ uint32_t session_count; uint32_t session_limit; switch_size_t session_id; -} runtime; +} session_manager; #ifdef SWITCH_DEBUG_RWLOCKS @@ -53,8 +53,8 @@ switch_core_session_t *session = NULL; if (uuid_str) { - switch_mutex_lock(runtime.session_table_mutex); - if ((session = switch_core_hash_find(runtime.session_table, uuid_str))) { + switch_mutex_lock(session_manager.session_table_mutex); + if ((session = switch_core_hash_find(session_manager.session_table, uuid_str))) { /* Acquire a read lock on the session */ #ifdef SWITCH_DEBUG_RWLOCKS if (switch_core_session_perform_read_lock(session, file, func, line) != SWITCH_STATUS_SUCCESS) { @@ -65,7 +65,7 @@ session = NULL; } } - switch_mutex_unlock(runtime.session_table_mutex); + switch_mutex_unlock(session_manager.session_table_mutex); } /* if its not NULL, now it's up to you to rwunlock this */ @@ -80,8 +80,8 @@ switch_channel_t *channel; uint32_t loops = 0; - switch_mutex_lock(runtime.session_table_mutex); - for (hi = switch_hash_first(runtime.memory_pool, runtime.session_table); hi; hi = switch_hash_next(hi)) { + switch_mutex_lock(session_manager.session_table_mutex); + for (hi = switch_hash_first(session_manager.memory_pool, session_manager.session_table); hi; hi = switch_hash_next(hi)) { switch_hash_this(hi, NULL, NULL, &val); if (val) { session = (switch_core_session_t *) val; @@ -90,13 +90,13 @@ switch_core_session_kill_channel(session, SWITCH_SIG_KILL); } } - switch_mutex_unlock(runtime.session_table_mutex); + switch_mutex_unlock(session_manager.session_table_mutex); - while (runtime.session_count > 0) { + while (session_manager.session_count > 0) { switch_yield(100000); if (++loops == 100) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Giving up with %d session%s remaining\n", - runtime.session_count, runtime.session_count == 1 ? "" : "s"); + session_manager.session_count, session_manager.session_count == 1 ? "" : "s"); break; } } @@ -107,8 +107,8 @@ switch_core_session_t *session = NULL; switch_status_t status = SWITCH_STATUS_FALSE; - switch_mutex_lock(runtime.session_table_mutex); - if ((session = switch_core_hash_find(runtime.session_table, uuid_str)) != 0) { + switch_mutex_lock(session_manager.session_table_mutex); + if ((session = switch_core_hash_find(session_manager.session_table, uuid_str)) != 0) { /* Acquire a read lock on the session or forget it the channel is dead */ if (switch_core_session_read_lock(session) == SWITCH_STATUS_SUCCESS) { if (switch_channel_get_state(session->channel) < CS_HANGUP) { @@ -117,7 +117,7 @@ switch_core_session_rwunlock(session); } } - switch_mutex_unlock(runtime.session_table_mutex); + switch_mutex_unlock(session_manager.session_table_mutex); return status; } @@ -127,8 +127,8 @@ switch_core_session_t *session = NULL; switch_status_t status = SWITCH_STATUS_FALSE; - switch_mutex_lock(runtime.session_table_mutex); - if ((session = switch_core_hash_find(runtime.session_table, uuid_str)) != 0) { + switch_mutex_lock(session_manager.session_table_mutex); + if ((session = switch_core_hash_find(session_manager.session_table, uuid_str)) != 0) { /* Acquire a read lock on the session or forget it the channel is dead */ if (switch_core_session_read_lock(session) == SWITCH_STATUS_SUCCESS) { if (switch_channel_get_state(session->channel) < CS_HANGUP) { @@ -137,7 +137,7 @@ switch_core_session_rwunlock(session); } } - switch_mutex_unlock(runtime.session_table_mutex); + switch_mutex_unlock(session_manager.session_table_mutex); return status; } @@ -662,12 +662,12 @@ switch_scheduler_del_task_group((*session)->uuid_str); - switch_mutex_lock(runtime.session_table_mutex); - switch_core_hash_delete(runtime.session_table, (*session)->uuid_str); - if (runtime.session_count) { - runtime.session_count--; + switch_mutex_lock(session_manager.session_table_mutex); + switch_core_hash_delete(session_manager.session_table, (*session)->uuid_str); + if (session_manager.session_count) { + session_manager.session_count--; } - switch_mutex_unlock(runtime.session_table_mutex); + switch_mutex_unlock(session_manager.session_table_mutex); if (switch_event_create(&event, SWITCH_EVENT_CHANNEL_DESTROY) == SWITCH_STATUS_SUCCESS) { switch_channel_event_set_data((*session)->channel, event); @@ -750,11 +750,11 @@ assert(endpoint_interface != NULL); - switch_mutex_lock(runtime.session_table_mutex); - count = runtime.session_count; - switch_mutex_unlock(runtime.session_table_mutex); + switch_mutex_lock(session_manager.session_table_mutex); + count = session_manager.session_count; + switch_mutex_unlock(session_manager.session_table_mutex); - if ((count + 1) > runtime.session_limit) { + if ((count + 1) > session_manager.session_limit) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Over Session Limit!\n"); return NULL; } @@ -812,23 +812,23 @@ switch_thread_rwlock_create(&session->rwlock, session->pool); snprintf(session->name, sizeof(session->name), "%"SWITCH_SIZE_T_FMT, session->id); - switch_mutex_lock(runtime.session_table_mutex); - session->id = runtime.session_id++; - switch_core_hash_insert(runtime.session_table, session->uuid_str, session); - runtime.session_count++; - switch_mutex_unlock(runtime.session_table_mutex); + switch_mutex_lock(session_manager.session_table_mutex); + session->id = session_manager.session_id++; + switch_core_hash_insert(session_manager.session_table, session->uuid_str, session); + session_manager.session_count++; + switch_mutex_unlock(session_manager.session_table_mutex); return session; } SWITCH_DECLARE(uint32_t) switch_core_session_count(void) { - return runtime.session_count; + return session_manager.session_count; } SWITCH_DECLARE(switch_size_t) switch_core_session_id(void) { - return runtime.session_id; + return session_manager.session_id; } @@ -867,21 +867,21 @@ SWITCH_DECLARE(uint32_t) switch_core_session_limit(uint32_t new_limit) { if (new_limit) { - runtime.session_limit = new_limit; + session_manager.session_limit = new_limit; } - return runtime.session_limit; + return session_manager.session_limit; } void switch_core_session_init(switch_memory_pool_t *pool) { - memset(&runtime, 0, sizeof(runtime)); - runtime.session_limit = 1000; - runtime.session_id = 1; - runtime.memory_pool = pool; - switch_core_hash_init(&runtime.session_table, runtime.memory_pool); - switch_mutex_init(&runtime.session_table_mutex, SWITCH_MUTEX_NESTED, runtime.memory_pool); + memset(&session_manager, 0, sizeof(session_manager)); + session_manager.session_limit = 1000; + session_manager.session_id = 1; + session_manager.memory_pool = pool; + switch_core_hash_init(&session_manager.session_table, session_manager.memory_pool); + switch_mutex_init(&session_manager.session_table_mutex, SWITCH_MUTEX_NESTED, session_manager.memory_pool); } Modified: freeswitch/trunk/src/switch_core_sqldb.c ============================================================================== --- freeswitch/trunk/src/switch_core_sqldb.c (original) +++ freeswitch/trunk/src/switch_core_sqldb.c Thu May 10 12:56:29 2007 @@ -40,7 +40,7 @@ switch_queue_t *sql_queue; switch_memory_pool_t *memory_pool; int thread_running; -} runtime; +} sql_manager; static switch_status_t switch_core_db_persistant_execute_trans(switch_core_db_t *db, char *sql, uint32_t retries) { @@ -157,14 +157,14 @@ char *sql; switch_size_t newlen; - if (!runtime.event_db) { - runtime.event_db = switch_core_db_handle(); + if (!sql_manager.event_db) { + sql_manager.event_db = switch_core_db_handle(); } - runtime.thread_running = 1; + sql_manager.thread_running = 1; for (;;) { - if (switch_queue_trypop(runtime.sql_queue, &pop) == SWITCH_STATUS_SUCCESS) { + if (switch_queue_trypop(sql_manager.sql_queue, &pop) == SWITCH_STATUS_SUCCESS) { sql = (char *) pop; if (sql) { @@ -199,7 +199,7 @@ if (trans && ((itterations == target) || nothing_in_queue)) { - if (switch_core_db_persistant_execute_trans(runtime.event_db, sqlbuf, 1000) != SWITCH_STATUS_SUCCESS) { + if (switch_core_db_persistant_execute_trans(sql_manager.event_db, sqlbuf, 1000) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "SQL thread unable to commit transaction, records lost!\n"); } itterations = 0; @@ -228,7 +228,7 @@ sql = switch_mprintf("insert into tasks values('%q','%q','%q','%q')", switch_event_get_header(event, "task-id"), switch_event_get_header(event, "task-desc"), - switch_event_get_header(event, "task-group"), switch_event_get_header(event, "task-runtime") + switch_event_get_header(event, "task-group"), switch_event_get_header(event, "task-sql_manager") ); break; case SWITCH_EVENT_DEL_SCHEDULE: @@ -236,8 +236,8 @@ sql = switch_mprintf("delete from tasks where task_id=%q", switch_event_get_header(event, "task-id")); break; case SWITCH_EVENT_RE_SCHEDULE: - sql = switch_mprintf("update tasks set task_runtime='%q' where task_id=%q", - switch_event_get_header(event, "task-runtime"), switch_event_get_header(event, "task-id")); + sql = switch_mprintf("update tasks set task_sql_manager='%q' where task_id=%q", + switch_event_get_header(event, "task-sql_manager"), switch_event_get_header(event, "task-id")); break; case SWITCH_EVENT_CHANNEL_DESTROY: sql = switch_mprintf("delete from channels where uuid='%q'", switch_event_get_header(event, "unique-id")); @@ -334,7 +334,7 @@ } if (sql) { - switch_queue_push(runtime.sql_queue, sql); + switch_queue_push(sql_manager.sql_queue, sql); sql = NULL; } } @@ -345,10 +345,10 @@ switch_thread_t *thread; switch_threadattr_t *thd_attr;; - runtime.memory_pool = pool; + sql_manager.memory_pool = pool; /* Activate SQL database */ - if ((runtime.db = switch_core_db_handle()) == 0) { + if ((sql_manager.db = switch_core_db_handle()) == 0) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error Opening DB!\n"); } else { char create_channels_sql[] = @@ -382,43 +382,43 @@ char create_tasks_sql[] = "CREATE TABLE tasks (\n" " task_id INTEGER(4),\n" - " task_desc VARCHAR(255),\n" " task_group VARCHAR(255),\n" " task_runtime INTEGER(8)\n" ");\n"; + " task_desc VARCHAR(255),\n" " task_group VARCHAR(255),\n" " task_sql_manager INTEGER(8)\n" ");\n"; switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Opening DB\n"); - switch_core_db_exec(runtime.db, "drop table channels", NULL, NULL, NULL); - switch_core_db_exec(runtime.db, "drop table calls", NULL, NULL, NULL); - switch_core_db_exec(runtime.db, "drop table interfaces", NULL, NULL, NULL); - switch_core_db_exec(runtime.db, "drop table tasks", NULL, NULL, NULL); - switch_core_db_exec(runtime.db, create_channels_sql, NULL, NULL, NULL); - switch_core_db_exec(runtime.db, create_calls_sql, NULL, NULL, NULL); - switch_core_db_exec(runtime.db, create_interfaces_sql, NULL, NULL, NULL); - switch_core_db_exec(runtime.db, create_tasks_sql, NULL, NULL, NULL); + switch_core_db_exec(sql_manager.db, "drop table channels", NULL, NULL, NULL); + switch_core_db_exec(sql_manager.db, "drop table calls", NULL, NULL, NULL); + switch_core_db_exec(sql_manager.db, "drop table interfaces", NULL, NULL, NULL); + switch_core_db_exec(sql_manager.db, "drop table tasks", NULL, NULL, NULL); + switch_core_db_exec(sql_manager.db, create_channels_sql, NULL, NULL, NULL); + switch_core_db_exec(sql_manager.db, create_calls_sql, NULL, NULL, NULL); + switch_core_db_exec(sql_manager.db, create_interfaces_sql, NULL, NULL, NULL); + switch_core_db_exec(sql_manager.db, create_tasks_sql, NULL, NULL, NULL); if (switch_event_bind("core_db", SWITCH_EVENT_ALL, SWITCH_EVENT_SUBCLASS_ANY, core_event_handler, NULL) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Couldn't bind event handler!\n"); } } - switch_queue_create(&runtime.sql_queue, SWITCH_SQL_QUEUE_LEN, runtime.memory_pool); + switch_queue_create(&sql_manager.sql_queue, SWITCH_SQL_QUEUE_LEN, sql_manager.memory_pool); - switch_threadattr_create(&thd_attr, runtime.memory_pool); + switch_threadattr_create(&thd_attr, sql_manager.memory_pool); switch_threadattr_detach_set(thd_attr, 1); switch_threadattr_stacksize_set(thd_attr, SWITCH_THREAD_STACKSIZE); - switch_thread_create(&thread, thd_attr, switch_core_sql_thread, NULL, runtime.memory_pool); - while (!runtime.thread_running) { + switch_thread_create(&thread, thd_attr, switch_core_sql_thread, NULL, sql_manager.memory_pool); + while (!sql_manager.thread_running) { switch_yield(10000); } } void switch_core_sqldb_stop(void) { - switch_queue_push(runtime.sql_queue, NULL); + switch_queue_push(sql_manager.sql_queue, NULL); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "Waiting for unfinished SQL transactions\n"); - while (switch_queue_size(runtime.sql_queue) > 0) { + while (switch_queue_size(sql_manager.sql_queue) > 0) { switch_yield(10000); } - switch_core_db_close(runtime.db); - switch_core_db_close(runtime.event_db); + switch_core_db_close(sql_manager.db); + switch_core_db_close(sql_manager.event_db); } Modified: freeswitch/trunk/src/switch_core_state_machine.c ============================================================================== --- freeswitch/trunk/src/switch_core_state_machine.c (original) +++ freeswitch/trunk/src/switch_core_state_machine.c Thu May 10 12:56:29 2007 @@ -204,9 +204,7 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Standard HIBERNATE\n"); } - -#ifdef CRASH_PROT -static switch_hash_t *stack_table; +static switch_hash_t *stack_table = NULL; #if defined (__GNUC__) && defined (LINUX) #include <execinfo.h> #include <stdio.h> @@ -254,14 +252,13 @@ abort(); } } -#endif + void switch_core_state_machine_init(switch_memory_pool_t *pool) { - (void)0; -#ifdef CRASH_PROT - switch_core_hash_init(&stack_table, pool); -#endif + if (runtime.crash_prot) { + switch_core_hash_init(&stack_table, pool); + } } SWITCH_DECLARE(void) switch_core_session_run(switch_core_session_t *session) @@ -270,31 +267,33 @@ const switch_endpoint_interface_t *endpoint_interface; const switch_state_handler_table_t *driver_state_handler = NULL; const switch_state_handler_table_t *application_state_handler = NULL; - -#ifdef CRASH_PROT - switch_thread_id_t thread_id = switch_thread_self(); + switch_thread_id_t thread_id; jmp_buf env; int sig; - signal(SIGSEGV, handle_fatality); - signal(SIGFPE, handle_fatality); + if (runtime.crash_prot) { + thread_id = switch_thread_self(); + signal(SIGSEGV, handle_fatality); + signal(SIGFPE, handle_fatality); #ifndef WIN32 - signal(SIGBUS, handle_fatality); + signal(SIGBUS, handle_fatality); #endif - if ((sig = setjmp(env)) != 0) { - switch_event_t *event; + if ((sig = setjmp(env)) != 0) { + switch_event_t *event; - if (switch_event_create(&event, SWITCH_EVENT_SESSION_CRASH) == SWITCH_STATUS_SUCCESS) { - switch_channel_event_set_data(session->channel, event); - switch_event_fire(&event); + if (switch_event_create(&event, SWITCH_EVENT_SESSION_CRASH) == SWITCH_STATUS_SUCCESS) { + switch_channel_event_set_data(session->channel, event); + switch_event_fire(&event); + } + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Thread has crashed for channel %s\n", switch_channel_get_name(session->channel)); + switch_channel_hangup(session->channel, SWITCH_CAUSE_CRASH); + } else { + apr_hash_set(stack_table, &thread_id, sizeof(thread_id), &env); } - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Thread has crashed for channel %s\n", switch_channel_get_name(session->channel)); - switch_channel_hangup(session->channel, SWITCH_CAUSE_CRASH); - } else { - apr_hash_set(stack_table, &thread_id, sizeof(thread_id), &env); } -#endif + + /* Life of the channel. you have channel and pool in your session everywhere you go you use the session to malloc with @@ -646,9 +645,9 @@ done: switch_mutex_unlock(session->mutex); -#ifdef CRASH_PROT - apr_hash_set(stack_table, &thread_id, sizeof(thread_id), NULL); -#endif + if (runtime.crash_prot) { + apr_hash_set(stack_table, &thread_id, sizeof(thread_id), NULL); + } session->thread_running = 0; }

1 0

[commit] r5122 - in freeswitch/trunk: conf src/mod/endpoints/mod_sofia
by Freeswitch SVN 10 May '07

10 May '07

Author: anthm Date: Thu May 10 12:15:07 2007 New Revision: 5122 Modified: freeswitch/trunk/conf/sofia.conf.xml freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c Log: fix sofia register stuff (update to this one if you use gateways) Modified: freeswitch/trunk/conf/sofia.conf.xml ============================================================================== --- freeswitch/trunk/conf/sofia.conf.xml (original) +++ freeswitch/trunk/conf/sofia.conf.xml Thu May 10 12:15:07 2007 @@ -24,6 +24,8 @@    +  +   </gateways> 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 Thu May 10 12:15:07 2007 @@ -1060,8 +1060,11 @@ for (gp = profile->gateways; gp; gp = gp->next) { assert(gp->state < REG_STATE_LAST); - stream->write_function(stream, "%25s\t%s\t %32s\t%s\n", gp->name, "gateway", gp->register_to, sofia_state_names[gp->state]); - + stream->write_function(stream, "%25s\t%s\t %32s\t%s", gp->name, "gateway", gp->register_to, sofia_state_names[gp->state]); + if (gp->state == REG_STATE_FAILED || gp->state == REG_STATE_TRYING) { + stream->write_function(stream, " (retry: %ds)", gp->retry - time(NULL)); + } + stream->write_function(stream, "\n"); } } @@ -1087,6 +1090,7 @@ return SWITCH_STATUS_SUCCESS; } + if (!strcasecmp(argv[1], "start")) { if (argc > 2 && !strcasecmp(argv[2], "reloadxml")) { if ((xml_root = switch_xml_open_root(1, &err))) { @@ -1107,6 +1111,34 @@ return SWITCH_STATUS_SUCCESS; } + if (!strcasecmp(argv[1], "register")) { + char *gname = argv[2]; + sofia_gateway_t *gateway_ptr; + + if (switch_strlen_zero(gname)) { + stream->write_function(stream, "No gateway name provided!\n"); + goto done; + } + + if (!strcasecmp(gname, "all")) { + for (gateway_ptr = profile->gateways; gateway_ptr; gateway_ptr = gateway_ptr->next) { + gateway_ptr->retry = 0; + gateway_ptr->state = REG_STATE_UNREGED; + } + stream->write_function(stream, "+OK\n"); + } else if ((gateway_ptr = sofia_reg_find_gateway(gname))) { + gateway_ptr->retry = 0; + gateway_ptr->state = REG_STATE_UNREGED; + stream->write_function(stream, "+OK\n"); + sofia_reg_release_gateway(gateway_ptr); + } else { + stream->write_function(stream, "Invalid gateway!\n"); + } + + goto done; + } + + if (!strcasecmp(argv[1], "stop") || !strcasecmp(argv[1], "restart")) { int rsec = 30; int diff = (int) (time(NULL) - profile->started); @@ -1134,6 +1166,8 @@ } } + done: + if (profile) { sofia_glue_release_profile(profile); } Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h Thu May 10 12:15:07 2007 @@ -192,6 +192,7 @@ time_t expires; time_t retry; uint32_t flags; + int32_t retry_seconds; reg_state_t state; switch_memory_pool_t *pool; struct sofia_gateway *next; 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 Thu May 10 12:15:07 2007 @@ -480,8 +480,9 @@ *extension = NULL, *proxy = NULL, *context = "default", - *expire_seconds = "3600"; - + *expire_seconds = "3600", + *retry_seconds = "30"; + gateway->pool = profile->pool; gateway->profile = profile; gateway->name = switch_core_strdup(gateway->pool, name); @@ -512,6 +513,8 @@ context = val; } else if (!strcmp(var, "expire-seconds")) { expire_seconds = val; + } else if (!strcmp(var, "retry-seconds")) { + retry_seconds = val; } } @@ -540,6 +543,12 @@ if (!switch_true(register_str)) { gateway->state = REG_STATE_NOREG; } + + gateway->retry_seconds = atoi(retry_seconds); + if (gateway->retry_seconds < 10) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "INVALID: retry_seconds correcting the value to 30\n"); + gateway->retry_seconds = 30; + } gateway->register_scheme = switch_core_strdup(gateway->pool, scheme); gateway->register_context = switch_core_strdup(gateway->pool, context); gateway->register_realm = switch_core_strdup(gateway->pool, realm); @@ -568,9 +577,7 @@ } gateway->freq -= 2; - gateway->next = profile->gateways; - profile->gateways = gateway; - + if ((gp = sofia_reg_find_gateway(gateway->name))) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Ignoring duplicate gateway '%s'\n", gateway->name); sofia_reg_release_gateway(gp); @@ -581,6 +588,8 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Ignoring duplicate contact '%s'\n", gateway->register_from); sofia_reg_release_gateway(gp); } else { + gateway->next = profile->gateways; + profile->gateways = gateway; sofia_reg_add_gateway(gateway->name, gateway); sofia_reg_add_gateway(gateway->register_from, gateway); sofia_reg_add_gateway(gateway->register_contact, gateway); Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c Thu May 10 12:15:07 2007 @@ -92,7 +92,7 @@ SIPTAG_EXPIRES_STR(gateway_ptr->expires_str), NUTAG_REGISTRAR(gateway_ptr->register_proxy), NUTAG_OUTBOUND("no-options-keepalive"), NUTAG_OUTBOUND("no-validate"), NUTAG_KEEPALIVE(0), TAG_NULL()); - gateway_ptr->retry = now + 10; + gateway_ptr->retry = now + gateway_ptr->retry_seconds; } else { nua_unregister(gateway_ptr->nh, SIPTAG_FROM_STR(gateway_ptr->register_from), @@ -102,7 +102,6 @@ NUTAG_OUTBOUND("no-options-keepalive"), NUTAG_OUTBOUND("no-validate"), NUTAG_KEEPALIVE(0), TAG_NULL()); } - gateway_ptr->retry = now + time(NULL); gateway_ptr->state = REG_STATE_TRYING; } else { @@ -111,6 +110,7 @@ } break; + case REG_STATE_FAILED: case REG_STATE_TRYING: if (gateway_ptr->retry && now >= gateway_ptr->retry) { gateway_ptr->state = REG_STATE_UNREGED;

1 0

[commit] r5120 - in freeswitch/trunk: . src/include src/mod/endpoints/mod_sofia
by Freeswitch SVN 10 May '07

10 May '07

Author: mikej Date: Thu May 10 11:23:07 2007 New Revision: 5120 Added: freeswitch/trunk/src/mod/endpoints/mod_sofia/Makefile.am Removed: freeswitch/trunk/src/mod/endpoints/mod_sofia/Makefile Modified: freeswitch/trunk/configure.in freeswitch/trunk/src/include/switch.h Log: switch mod_sofia to use a Makefile.am instead of Makefile for better dependency tracking.. you may need to re-bootstrap after this update Modified: freeswitch/trunk/configure.in ============================================================================== --- freeswitch/trunk/configure.in (original) +++ freeswitch/trunk/configure.in Thu May 10 11:23:07 2007 @@ -332,6 +332,7 @@ src/Makefile src/mod/Makefile src/mod/event_handlers/mod_cdr/Makefile + src/mod/endpoints/mod_sofia/Makefile src/include/switch_am_config.h build/getlib.sh build/modmake.rules]) Modified: freeswitch/trunk/src/include/switch.h ============================================================================== --- freeswitch/trunk/src/include/switch.h (original) +++ freeswitch/trunk/src/include/switch.h Thu May 10 11:23:07 2007 @@ -51,6 +51,7 @@ #define FREESWITCH_OID_PREFIX ".1.3.6.1.4.1." FREESWITCH_PEN #define FREESWITCH_ITAD "543" #define __EXTENSIONS__ 1 +#define _XOPEN_SOURCE 600 #include <stdlib.h> #include <stdio.h> #include <stdarg.h> Added: freeswitch/trunk/src/mod/endpoints/mod_sofia/Makefile.am ============================================================================== --- (empty file) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/Makefile.am Thu May 10 11:23:07 2007 @@ -0,0 +1,62 @@ +AM_CFLAGS = $(SWITCH_AM_CFLAGS) +AM_CPPFLAGS = $(SWITCH_AM_CXXFLAGS) +AM_LDFLAGS = $(SWITCH_AM_LDFLAGS) +#we should set all these vars from configure, no reason to have these in each Makefile.am +LIBTOOL = echo "`link=\`echo $@|grep .la;echo $@|grep .so;echo $@|grep .dll\`;if test -n "$$link"; then echo Creating $@;fi`";`if test -z "$(VERBOSE)" ; \ +then echo $(SHELL) $(switch_builddir)/quiet_libtool ;else echo $(SHELL) $(switch_builddir)/libtool; fi` +AM_MAKEFLAGS=`test -n "$(VERBOSE)" || echo -s` +# Dirty trick to override the link output +LIBS+=> $(MODNAME).log || error="yes";if test -n "$(VERBOSE)" -o "$$error" = "yes";then cat $(MODNAME).log;fi;if test "$$error" = "yes";then exit 1;fi + +moddir=$(prefix)/mod + +MODNAME=mod_sofia + +BASE=../../../.. + +SOFIA_DIR=$(BASE)/libs/sofia-sip +SOFIAUA_DIR=$(SOFIA_DIR)/libsofia-sip-ua +SOFIALA=$(SOFIAUA_DIR)/libsofia-sip-ua.la + +mod_LTLIBRARIES = mod_sofia.la +mod_sofia_la_SOURCES = mod_sofia.c sofia.c sofia_glue.c sofia_presence.c sofia_reg.c mod_sofia.h +mod_sofia_la_CFLAGS = $(AM_CFLAGS) +mod_sofia_la_CFLAGS += -I. -I$(SOFIAUA_DIR)/bnf -I$(SOFIAUA_DIR)/features +mod_sofia_la_CFLAGS += -I$(SOFIAUA_DIR)/http -I$(SOFIAUA_DIR)/ipt +mod_sofia_la_CFLAGS += -I$(SOFIAUA_DIR)/iptsec -I$(SOFIAUA_DIR)/msg +mod_sofia_la_CFLAGS += -I$(SOFIAUA_DIR)/nea -I$(SOFIAUA_DIR)/nta +mod_sofia_la_CFLAGS += -I$(SOFIAUA_DIR)/nth -I$(SOFIAUA_DIR)/nua +mod_sofia_la_CFLAGS += -I$(SOFIAUA_DIR)/sdp -I$(SOFIAUA_DIR)/sip +mod_sofia_la_CFLAGS += -I$(SOFIAUA_DIR)/soa -I$(SOFIAUA_DIR)/sresolv +mod_sofia_la_CFLAGS += -I$(SOFIAUA_DIR)/stun -I$(SOFIAUA_DIR)/su +mod_sofia_la_CFLAGS += -I$(SOFIAUA_DIR)/tport -I$(SOFIAUA_DIR)/url +mod_sofia_la_LIBADD = $(SOFIALA) $(switch_builddir)/libfreeswitch.la +mod_sofia_la_LDFLAGS = -module -avoid-version -no-undefined + +if ADD_ODBC +mod_sofia_la_CFLAGS += -DSWITCH_HAVE_ODBC +endif + +if ISMAC +mod_sofia_la_LDFLAGS += -framework CoreFoundation -framework SystemConfiguration +endif + +BUILT_SOURCES = $(SOFIALA) + +$(mod_sofia_la_SOURCES) : $(BUILT_SOURCES) + +$(SOFIALA): $(SOFIA_DIR) $(SOFIA_DIR)/.update + cd $(SOFIA_DIR) && $(MAKE) + $(TOUCH_TARGET) + +../../../../libs/sofia-sip/libsofia-sip-ua/nua/sofia-sip/nua_tag.h: $(SOFIALA) + +install-data-am: $(DESTDIR)$(PREFIX)/$(moddir)/$(MODNAME).$(DYNAMIC_LIB_EXTEN) + +$(DESTDIR)$(PREFIX)/$(moddir)/$(MODNAME).$(DYNAMIC_LIB_EXTEN): $(MODNAME).la + @echo installing $(MODNAME).$(DYNAMIC_LIB_EXTEN) + @if [ -f .libs/$(MODNAME).$(DYNAMIC_LIB_EXTEN) ] ; then \ + $(LIBTOOL) --mode=install $(INSTALL) .libs/$(MODNAME).$(DYNAMIC_LIB_EXTEN) $(DESTDIR)$(PREFIX)/$(moddir) >/dev/null ; \ + else \ + $(LIBTOOL) --mode=install $(INSTALL) $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(DESTDIR)$(PREFIX)/$(moddir) >/dev/null ; \ + fi

1 0

[commit] r5118 - in freeswitch/trunk/src: . mod/applications/mod_dptools mod/endpoints/mod_sofia
by Freeswitch SVN 10 May '07

10 May '07

Author: anthm Date: Thu May 10 10:11:26 2007 New Revision: 5118 Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c freeswitch/trunk/src/mod/endpoints/mod_sofia/Makefile freeswitch/trunk/src/switch_core_session.c Log: update Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c (original) +++ freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c Thu May 10 10:11:26 2007 @@ -340,7 +340,7 @@ static void export_function(switch_core_session_t *session, char *data) { switch_channel_t *channel; - char *exports, *new_exports = NULL, *new_exports_d = NULL, *var, *val = NULL; + char *exports, *new_exports = NULL, *new_exports_d = NULL, *var, *val = NULL, *var_name = NULL; int local = 1; channel = switch_core_session_get_channel(session); @@ -361,11 +361,13 @@ } if (!strncasecmp(var, "nolocal:", 8)) { - var += 8; + var_name = var + 8; local = 0; + } else { + var_name = var; } - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "EXPORT %s[%s]=[%s]\n", local ? "" : "(REMOTE ONLY) ", var, val ? val : "UNDEF"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "EXPORT %s[%s]=[%s]\n", local ? "" : "(REMOTE ONLY) ", var_name, val ? val : "UNDEF"); switch_channel_set_variable(channel, var, val); if (var && val) { @@ -375,9 +377,9 @@ } else { new_exports = var; } - if (local) { - switch_channel_set_variable(channel, SWITCH_EXPORT_VARS_VARIABLE, new_exports); - } + + switch_channel_set_variable(channel, SWITCH_EXPORT_VARS_VARIABLE, new_exports); + switch_safe_free(new_exports_d); } } Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/Makefile ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/Makefile (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/Makefile Thu May 10 10:11:26 2007 @@ -15,7 +15,7 @@ LOCAL_CFLAGS += `if test -f $(BASE)/.libs/libfreeswitch_la-switch_odbc.o ; then echo -DSWITCH_HAVE_ODBC; fi ;` LOCAL_OBJS=sofia.o sofia_glue.o sofia_presence.o sofia_reg.o -LOCAL_SOURCES=sofia.c sofia_glue.c sofia_presense.c sofia_reg.c mod_sofia.c +LOCAL_SOURCES=sofia.c sofia_glue.c sofia_presense.c sofia_reg.c mod_sofia.c mod_sofia.h SOFIALA=$(SOFIAUA_DIR)/libsofia-sip-ua.la Modified: freeswitch/trunk/src/switch_core_session.c ============================================================================== --- freeswitch/trunk/src/switch_core_session.c (original) +++ freeswitch/trunk/src/switch_core_session.c Thu May 10 10:11:26 2007 @@ -282,7 +282,11 @@ for (x = 0; x < argc; x++) { char *val; if ((val = switch_channel_get_variable(channel, argv[x]))) { - switch_channel_set_variable(peer_channel, argv[x], val); + char *var = argv[x]; + if (!strncasecmp(var, "nolocal:", 8)) { + var += 8; + } + switch_channel_set_variable(peer_channel, var, val); } } }

1 0

[commit] r5117 - freeswitch/trunk/src/mod/applications/mod_dptools
by Freeswitch SVN 09 May '07

09 May '07

Author: anthm Date: Wed May 9 18:13:18 2007 New Revision: 5117 Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c Log: update Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c (original) +++ freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c Wed May 9 18:13:18 2007 @@ -341,6 +341,7 @@ { switch_channel_t *channel; char *exports, *new_exports = NULL, *new_exports_d = NULL, *var, *val = NULL; + int local = 1; channel = switch_core_session_get_channel(session); assert(channel != NULL); @@ -359,7 +360,12 @@ } } - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "EXPORT [%s]=[%s]\n", var, val ? val : "UNDEF"); + if (!strncasecmp(var, "nolocal:", 8)) { + var += 8; + local = 0; + } + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "EXPORT %s[%s]=[%s]\n", local ? "" : "(REMOTE ONLY) ", var, val ? val : "UNDEF"); switch_channel_set_variable(channel, var, val); if (var && val) { @@ -369,7 +375,9 @@ } else { new_exports = var; } - switch_channel_set_variable(channel, SWITCH_EXPORT_VARS_VARIABLE, new_exports); + if (local) { + switch_channel_set_variable(channel, SWITCH_EXPORT_VARS_VARIABLE, new_exports); + } switch_safe_free(new_exports_d); } }

1 0