May 2007 - Freeswitch-svn - FreeSWITCH Mailing Lists

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

10 May '07

Author: anthm Date: Thu May 10 16:31:23 2007 New Revision: 5136 Modified: freeswitch/trunk/Makefile.am Log: fix build Modified: freeswitch/trunk/Makefile.am ============================================================================== --- freeswitch/trunk/Makefile.am (original) +++ freeswitch/trunk/Makefile.am Thu May 10 16:31:23 2007 @@ -139,7 +139,7 @@ libs/libedit/Makefile: - cd libs/libedit && ./configure --disable-shared --with-pic + cd libs/libedit && ./configure CFLAGS="-D_XOPEN_SOURCE=600 -D_BSD_SOURCE=1" --disable-shared --with-pic libs/libedit/src/.libs/libedit.a: libs/libedit/Makefile cd libs/libedit && $(MAKE)

1 0

[commit] r5135 - freeswitch/trunk/conf
by Freeswitch SVN 10 May '07

10 May '07

Author: anthm Date: Thu May 10 16:05:09 2007 New Revision: 5135 Modified: freeswitch/trunk/conf/sofia.conf.xml Log: update Modified: freeswitch/trunk/conf/sofia.conf.xml ============================================================================== --- freeswitch/trunk/conf/sofia.conf.xml (original) +++ freeswitch/trunk/conf/sofia.conf.xml Thu May 10 16:05:09 2007 @@ -26,6 +26,8 @@    +  +   </gateways>

1 0

[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] r5132 - freeswitch/branches/cparker/src/mod/event_handlers/mod_radius_cdr
by Freeswitch SVN 10 May '07

10 May '07

Author: cparker Date: Thu May 10 15:28:39 2007 New Revision: 5132 Modified: freeswitch/branches/cparker/src/mod/event_handlers/mod_radius_cdr/mod_radius_cdr.c Log: make it actually work Modified: freeswitch/branches/cparker/src/mod/event_handlers/mod_radius_cdr/mod_radius_cdr.c ============================================================================== --- freeswitch/branches/cparker/src/mod/event_handlers/mod_radius_cdr/mod_radius_cdr.c (original) +++ freeswitch/branches/cparker/src/mod/event_handlers/mod_radius_cdr/mod_radius_cdr.c Thu May 10 15:28:39 2007 @@ -29,22 +29,26 @@ * mod_radius_cdr.c -- RADIUS CDR Module * */ -#include <sys/stat.h> + +#define _BSD_SOURCE 1 + #include <switch.h> +#include <sys/stat.h> #include <freeradius-client.h> #include "mod_radius_cdr.h" static const char modname[] = "mod_radius_cdr"; -static rc_handle *rad_config; static char cf[] = "mod_radius_cdr.conf"; -static char dictionary[PATH_MAX]; -static char * timeout; /* 5 */ -static char * retries; /* 3 */ +static char my_dictionary[PATH_MAX]; +static char * my_timeout; /* 5 */ +static char * my_retries; /* 3 */ +static char my_servers[SERVER_MAX][255]; static switch_status_t my_on_hangup(switch_core_session_t *session) { - switch_xml_t cdr; + switch_xml_t cdr; + rc_handle *rad_config; int retval = 0; VALUE_PAIR *send = NULL; UINT4 client_port = 0; @@ -53,58 +57,70 @@ char src[] = "8475551212"; char *uuid_str; - if (switch_ivr_generate_xml_cdr(session, &cdr) == SWITCH_STATUS_SUCCESS) { - /*switch_channel_t *channel = switch_core_session_get_channel(session);*/ - uuid_str = switch_core_session_get_uuid(session); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "[mod_radius_cdr] Entering my_on_hangup\n"); - rad_config = rc_new(); + rad_config = rc_new(); - if (rad_config == NULL) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "[mod_radius_cdr] Error initializing rc_handle!\n"); - return SWITCH_STATUS_TERM; - switch_xml_free(cdr); - } + if (rad_config == NULL) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "[mod_radius_cdr] Error initializing rc_handle!\n"); + return SWITCH_STATUS_TERM; + } - rad_config = rc_config_init(rad_config); + rad_config = rc_config_init(rad_config); - if (rad_config == NULL) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "[mod_radius_cdr] Error initializing radius config!\n"); - rc_destroy(rad_config); - switch_xml_free(cdr); - return SWITCH_STATUS_TERM; - } + if (rad_config == NULL) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "[mod_radius_cdr] Error initializing radius config!\n"); + rc_destroy(rad_config); + return SWITCH_STATUS_TERM; + } - if (rc_add_config(rad_config, "dictionary", dictionary, cf, 0) != 0) { + if (switch_ivr_generate_xml_cdr(session, &cdr) == SWITCH_STATUS_SUCCESS) { + /*switch_channel_t *channel = switch_core_session_get_channel(session);*/ + uuid_str = switch_core_session_get_uuid(session); + + /* Some hardcoded ( for now ) defaults needed to initialize radius */ + if (rc_add_config(rad_config, "auth_order", "radius", "internal radius config", 0) != 0) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, - "failed setting dictionary = %s failed\n", dictionary); + "failed setting auth_order = radius failed\n"); rc_destroy(rad_config); return SWITCH_STATUS_TERM; } - if (rc_add_config(rad_config, "radius_timeout", timeout, cf, 0) != 0) { + if (rc_add_config(rad_config, "seqfile", "/var/run/radius.seq", "internal radius config", 0) != 0) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, - "failed setting radius_timeout = %s failed\n", timeout); + "failed setting seqfile = /var/run/radius.seq\n"); rc_destroy(rad_config); return SWITCH_STATUS_TERM; } - if (rc_add_config(rad_config, "radius_timeout", timeout, cf, 0) != 0) { + + /* Add the module configs to initialize rad_config */ + + for (int i = 0; i < SERVER_MAX && my_servers[i][0] != '\0'; i++) { + if (rc_add_config(rad_config, "acctserver", my_servers[i], cf, 0) != 0) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "setting acctserver = %s failed\n", my_servers[i]); + rc_destroy(rad_config); + return SWITCH_STATUS_TERM; + } + } + + if (rc_add_config(rad_config, "dictionary", my_dictionary, cf, 0) != 0) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, - "failed setting radius_retries = %s failed\n", retries); + "failed setting dictionary = %s failed\n", my_dictionary); rc_destroy(rad_config); return SWITCH_STATUS_TERM; } - /* Some hardcoded ( for now ) defaults needed to initialize radius */ - if (rc_add_config(rad_config, "auth_order", "radius", "internal radius config", 0) != 0) { + if (rc_add_config(rad_config, "radius_timeout", my_timeout, cf, 0) != 0) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, - "failed setting auth_order = radius failed\n"); + "failed setting radius_timeout = %s failed\n", my_timeout); rc_destroy(rad_config); return SWITCH_STATUS_TERM; } - if (rc_add_config(rad_config, "seqfile", "/var/run/radius.seq", "internal radius config", 0) != 0) { + + if (rc_add_config(rad_config, "radius_retries", my_retries, cf, 0) != 0) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, - "failed setting seqfile = /var/run/radius.seq\n"); + "failed setting radius_retries = %s failed\n", my_retries); rc_destroy(rad_config); return SWITCH_STATUS_TERM; } @@ -112,7 +128,7 @@ /* Read the dictionary file(s) */ if (rc_read_dictionary(rad_config, rc_conf_str(rad_config, "dictionary")) != 0) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, - "failed reading dictionary file(s): %s\n", dictionary); + "failed reading dictionary file(s): %s\n", my_dictionary); rc_destroy(rad_config); return SWITCH_STATUS_TERM; } @@ -160,16 +176,14 @@ { switch_xml_t cfg, xml, settings, param; - /* Config Variables and Defaults */ - /*char *cf = "radius_cdr.conf.xml";*/ - /*char dictionary[PATH_MAX] = "/usr/local/freeswitch/conf/radius/dictionary";*/ - /*char *timeout = NULL;*/ - /*char *retries = NULL;*/ - int num_servers = 0; - timeout = "5"; - retries = "3"; + my_timeout = "5"; + my_retries = "3"; + + for( int i = 0; i < SERVER_MAX; i++ ) { + my_servers[i][0] = '\0'; + } if (!(xml = switch_xml_open_cfg(cf, &cfg, NULL))) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "open of %s failed\n", cf); @@ -183,12 +197,7 @@ if (!strcmp(var, "acctserver")) { if (num_servers < SERVER_MAX) { - if (rc_add_config(rad_config, var, val, cf, 0) != 0) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, - "failed setting %s = %s failed\n", var, val); - rc_destroy(rad_config); - return SWITCH_STATUS_TERM; - } + strncpy(my_servers[num_servers],val,255-1); num_servers++; } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, @@ -196,13 +205,13 @@ } } else if (!strcmp(var, "dictionary")) { - strncpy(dictionary,val,PATH_MAX-1); + strncpy(my_dictionary,val,PATH_MAX-1); } else if (!strcmp(var, "radius_timeout")) { - timeout = strdup(val); + my_timeout = strdup(val); } else if (!strcmp(var, "radius_retries")) { - retries = strdup(val); + my_retries = strdup(val); } } }

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] r5128 - freeswitch/branches/greenlizard/src/mod/languages/mod_python
by Freeswitch SVN 10 May '07

10 May '07

Author: greenlizard Date: Thu May 10 14:37:55 2007 New Revision: 5128 Modified: freeswitch/branches/greenlizard/src/mod/languages/mod_python/freeswitch_python.cpp Log: added Py_BEGIN_ALLOW_THREADS macro around switch_play_and_get_digits Modified: freeswitch/branches/greenlizard/src/mod/languages/mod_python/freeswitch_python.cpp ============================================================================== --- freeswitch/branches/greenlizard/src/mod/languages/mod_python/freeswitch_python.cpp (original) +++ freeswitch/branches/greenlizard/src/mod/languages/mod_python/freeswitch_python.cpp Thu May 10 14:37:55 2007 @@ -161,10 +161,11 @@ 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; }

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

10 May '07

Author: anthm Date: Thu May 10 14:17:34 2007 New Revision: 5126 Modified: freeswitch/trunk/libs/ (props changed) freeswitch/trunk/libs/curl/ (props changed) freeswitch/trunk/libs/libedit/ (props changed) freeswitch/trunk/libs/libedit/doc/ (props changed) freeswitch/trunk/libs/libedit/examples/ (props changed) freeswitch/trunk/libs/libedit/src/ (props changed) freeswitch/trunk/libs/portaudio/ (props changed) freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua-glib/su-glib/ (props changed) freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/bnf/ (props changed) freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/docs/ (props changed) freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/features/ (props changed) freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/http/ (props changed) freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/ipt/ (props changed) freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/iptsec/ (props changed) freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/msg/ (props changed) freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nea/ (props changed) freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/ (props changed) freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nth/ (props changed) freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/ (props changed) freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua.c freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_stack.c freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sdp/ (props changed) freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/ (props changed) freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/soa/ (props changed) freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/ (props changed) freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/stun/ (props changed) freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/ (props changed) freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/ (props changed) freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/url/ (props changed) freeswitch/trunk/libs/sofia-sip/utils/ (props changed) freeswitch/trunk/libs/xmlrpc-c/src/cpp/ (props changed) freeswitch/trunk/scripts/socket/socket2me/ (props changed) freeswitch/trunk/src/mod/endpoints/mod_sofia/ (props changed) freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Changes in other areas also in this revision: Modified: freeswitch/trunk/ (props changed) Log: props and sofia fix Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua.c Thu May 10 14:17:34 2007 @@ -927,7 +927,7 @@ size_t len, xtra, e_len, l_len = 0, l_xtra = 0; ta_list ta; - if (nua == NULL || (nua->nua_shutdown_started && event != nua_r_shutdown)) + if (nua == NULL) return; ta_start(ta, tag, value); Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_stack.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_stack.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_stack.c Thu May 10 14:17:34 2007 @@ -378,7 +378,8 @@ 901, "Stack is going down", NULL); } - else switch (event) { + + switch (event) { case nua_r_get_params: nua_stack_get_params(nua, nh ? nh : nua->nua_dhandle, event, tags); break; @@ -485,8 +486,7 @@ su_timer_set(t, nua_stack_timer, a); if (nua->nua_shutdown) { - nua_stack_shutdown(nua); - return; + nua_stack_shutdown(nua); } for (nh = nua->nua_handles; nh; nh = nh_next) { 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 14:17:34 2007 @@ -339,7 +339,7 @@ tech_pvt = (private_object_t *) switch_core_session_get_private(session); assert(tech_pvt != NULL); - if (switch_test_flag(tech_pvt, TFLAG_HUP) || !sofia_test_pflag(tech_pvt->profile, PFLAG_RUNNING)) { + if (switch_test_flag(tech_pvt, TFLAG_HUP)) { return SWITCH_STATUS_FALSE; } @@ -411,7 +411,7 @@ } } - if (switch_test_flag(tech_pvt, TFLAG_HUP) || !sofia_test_pflag(tech_pvt->profile, PFLAG_RUNNING)) { + if (switch_test_flag(tech_pvt, TFLAG_HUP)) { return SWITCH_STATUS_FALSE; } @@ -443,7 +443,7 @@ tech_pvt = (private_object_t *) switch_core_session_get_private(session); assert(tech_pvt != NULL); - if (switch_test_flag(tech_pvt, TFLAG_HUP) || !sofia_test_pflag(tech_pvt->profile, PFLAG_RUNNING)) { + if (switch_test_flag(tech_pvt, TFLAG_HUP)) { return SWITCH_STATUS_FALSE; } @@ -538,7 +538,7 @@ } } - if (switch_test_flag(tech_pvt, TFLAG_HUP) || !sofia_test_pflag(tech_pvt->profile, PFLAG_RUNNING)) { + if (switch_test_flag(tech_pvt, TFLAG_HUP)) { return SWITCH_STATUS_FALSE; } @@ -1140,7 +1140,7 @@ if (!strcasecmp(argv[1], "stop") || !strcasecmp(argv[1], "restart")) { - int rsec = 30; + int rsec = 3; int diff = (int) (time(NULL) - profile->started); int remain = rsec - diff; if (diff < rsec) { 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 14:17:34 2007 @@ -363,11 +363,6 @@ su_root_step(profile->s_root, 1000); } - while(profile->inuse) { - switch_yield(500000); - } - - //sofia_reg_check_expire(profile, 0); //sofia_reg_check_gateway(profile, 0); Diffs of changes in other areas also in this revision:

1 0