October 2007 - Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r6024 - freeswitch/trunk/src
by Freeswitch SVN 23 Oct '07

23 Oct '07

Author: anthm Date: Mon Oct 22 22:59:46 2007 New Revision: 6024 Modified: freeswitch/trunk/src/switch_utils.c Log: fix return val in switch_stristr Modified: freeswitch/trunk/src/switch_utils.c ============================================================================== --- freeswitch/trunk/src/switch_utils.c (original) +++ freeswitch/trunk/src/switch_utils.c Mon Oct 22 22:59:46 2007 @@ -205,7 +205,7 @@ while(*a && *b) { if (tolower(*b) == tolower(*a)) { if (++x == score) { - return p; + return b - x + 1; } a++; } else {

1 0

[commit] r6023 - freeswitch/trunk/src
by Freeswitch SVN 23 Oct '07

23 Oct '07

Author: anthm Date: Mon Oct 22 21:29:37 2007 New Revision: 6023 Modified: freeswitch/trunk/src/switch_channel.c Log: sigh Modified: freeswitch/trunk/src/switch_channel.c ============================================================================== --- freeswitch/trunk/src/switch_channel.c (original) +++ freeswitch/trunk/src/switch_channel.c Mon Oct 22 21:29:37 2007 @@ -1264,30 +1264,46 @@ SWITCH_DECLARE(char *) switch_channel_expand_variables(switch_channel_t *channel, char *in) { - char *p, *c; + char *q, *p, *c = NULL; char *data, *indup; size_t sp = 0, len = 0, olen = 0, vtype = 0, br = 0, cpos, block = 128; char *sub_val = NULL, *func_val = NULL; int nv = 0; - if (in && (p = strchr(in, '$'))) { - if (!*(p + 1)) { - return in; + q = in; + while(q && *q) { + if (!(p = strchr(q, '$'))) { + break; } - } else { + + if (*(p-1) == '\\') { + q = p + 1; + continue; + } + + if (*(p+1) != '{') { + q = p + 1; + continue; + } + + nv = 1; + break; + } + + if (!nv) { return in; } - - olen = strlen(in); + nv = 0; + olen = strlen(in) + 1; indup = strdup(in); if ((data = malloc(olen))) { memset(data, 0, olen); c = data; - for (p = indup; *p; p++) { + for (p = indup; p && *p; p++) { vtype = 0; - + if (*p == '\\') { if (*(p + 1) == '$') { nv = 1;

1 0

[commit] r6022 - freeswitch/trunk/src
by Freeswitch SVN 23 Oct '07

23 Oct '07

Author: anthm Date: Mon Oct 22 20:11:03 2007 New Revision: 6022 Modified: freeswitch/trunk/src/switch_core_memory.c freeswitch/trunk/src/switch_core_session.c Log: vroom Modified: freeswitch/trunk/src/switch_core_memory.c ============================================================================== --- freeswitch/trunk/src/switch_core_memory.c (original) +++ freeswitch/trunk/src/switch_core_memory.c Mon Oct 22 20:11:03 2007 @@ -282,7 +282,7 @@ printf("Free Pool %s %s:%d\n", file, func, line); #endif - if (switch_queue_trypush(memory_manager.pool_queue, *pool) != SWITCH_STATUS_SUCCESS) { + if (switch_queue_push(memory_manager.pool_queue, *pool) != SWITCH_STATUS_SUCCESS) { apr_pool_destroy(*pool); } *pool = NULL; Modified: freeswitch/trunk/src/switch_core_session.c ============================================================================== --- freeswitch/trunk/src/switch_core_session.c (original) +++ freeswitch/trunk/src/switch_core_session.c Mon Oct 22 20:11:03 2007 @@ -768,35 +768,27 @@ if (pool && *pool) { usepool = *pool; *pool = NULL; - } else if (switch_core_new_memory_pool(&usepool) != SWITCH_STATUS_SUCCESS) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Could not allocate memory pool\n"); - return NULL; + } else { + switch_core_new_memory_pool(&usepool); } - if ((session = switch_core_alloc(usepool, sizeof(switch_core_session_t))) == 0) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Could not allocate session\n"); - switch_core_destroy_memory_pool(&usepool); - return NULL; - } - if (switch_channel_alloc(&session->channel, usepool) != SWITCH_STATUS_SUCCESS) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Could not allocate channel structure\n"); - switch_core_destroy_memory_pool(&usepool); - return NULL; + session = switch_core_alloc(usepool, sizeof(*session)); + session->pool = usepool; + + if (switch_channel_alloc(&session->channel, session->pool) != SWITCH_STATUS_SUCCESS) { + abort(); } - switch_channel_init(session->channel, session, CS_NEW, 0); + /* The session *IS* the pool you may not alter it because you have no idea how its all private it will be passed to the thread run function */ switch_uuid_get(&uuid); switch_uuid_format(session->uuid_str, &uuid); - - session->pool = usepool; session->endpoint_interface = endpoint_interface; - session->raw_write_frame.data = session->raw_write_buf; session->raw_write_frame.buflen = sizeof(session->raw_write_buf); session->raw_read_frame.data = session->raw_read_buf;

1 0

[commit] r6021 - freeswitch/trunk/src
by Freeswitch SVN 22 Oct '07

22 Oct '07

Author: anthm Date: Mon Oct 22 19:29:29 2007 New Revision: 6021 Modified: freeswitch/trunk/src/switch_apr.c Log: handle APR_EINTR response in queue push\trypop Modified: freeswitch/trunk/src/switch_apr.c ============================================================================== --- freeswitch/trunk/src/switch_apr.c (original) +++ freeswitch/trunk/src/switch_apr.c Mon Oct 22 19:29:29 2007 @@ -745,7 +745,13 @@ SWITCH_DECLARE(switch_status_t) switch_queue_push(switch_queue_t * queue, void *data) { - return apr_queue_push(queue, data); + apr_status_t s; + + do { + s = apr_queue_push(queue, data); + } while (s == APR_EINTR); + + return s; } SWITCH_DECLARE(switch_status_t) switch_queue_trypop(switch_queue_t * queue, void **data) @@ -755,7 +761,13 @@ SWITCH_DECLARE(switch_status_t) switch_queue_trypush(switch_queue_t * queue, void *data) { - return apr_queue_trypush(queue, data); + apr_status_t s; + + do { + s = apr_queue_trypush(queue, data); + } while (s == APR_EINTR); + + return s; } SWITCH_DECLARE(int) switch_vasprintf(char **ret, const char *fmt, va_list ap)

1 0

[commit] r6020 - freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua
by Freeswitch SVN 22 Oct '07

22 Oct '07

Author: anthm Date: Mon Oct 22 19:12:09 2007 New Revision: 6020 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua.c freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_stack.h Log: revert patch from sofia-sip darcs causing memory leak: Mon Oct 8 07:54:24 EDT 2007 Pekka.Pessi(a)nokia.com * nua.c: nua event callback does not use nua_t object after nua_destroy() call. sf.net bug #1803686 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 Mon Oct 22 19:12:09 2007 @@ -195,13 +195,6 @@ nua_signal(nua, NULL, NULL, 1, nua_r_shutdown, 0, NULL, TAG_END()); } -/** @internal Linked stack frames from nua event callback */ -struct nua_event_frame_s { - nua_event_frame_t *nf_next; - nua_t *nf_nua; - nua_saved_event_t nf_saved[1]; -}; - /** Destroy the @nua stack. * * Before calling nua_destroy() the application @@ -227,8 +220,6 @@ enter; if (nua) { - nua_event_frame_t *nf; - if (!nua->nua_shutdown_final) { SU_DEBUG_0(("nua_destroy(%p): FATAL: nua_shutdown not completed\n", (void *)nua)); @@ -236,13 +227,6 @@ return; } - nua->nua_callback = NULL; - - for (nf = nua->nua_current; nf; nf = nf->nf_next) { - nf->nf_nua = NULL; - } - nua->nua_current = NULL; - su_task_deinit(nua->nua_server); su_task_deinit(nua->nua_client); @@ -1000,9 +984,8 @@ { nua_t *nua; nua_handle_t *nh = e->e_nh; - enter; - e->e_nh = NULL; + enter; if (nh) { if (!nh->nh_ref_by_user && nh->nh_valid) { @@ -1030,40 +1013,40 @@ nua = nh->nh_nua; assert(nua); - if (NH_IS_DEFAULT(nh)) - nh = NULL; - if (e->e_event == nua_r_shutdown && e->e_status >= 200) nua->nua_shutdown_final = 1; - if (nua->nua_callback) { - nua_event_frame_t frame[1]; - - su_msg_remove_refs(sumsg); /* Remove references to tasks */ - su_msg_save(frame->nf_saved, sumsg); - frame->nf_nua = nua; - frame->nf_next = nua->nua_current, nua->nua_current = frame; - - nua->nua_callback(e->e_event, e->e_status, e->e_phrase, - nua, nua->nua_magic, - nh, nh ? nh->nh_magic : NULL, - e->e_msg ? sip_object(e->e_msg) : NULL, - e->e_tags); + if (!nua->nua_callback) + return; + + if (NH_IS_DEFAULT(nh)) + nh = NULL; - su_msg_destroy(frame->nf_saved); + su_msg_save(nua->nua_current, sumsg); - if (frame->nf_nua == NULL) - return; - nua->nua_current = frame->nf_next; - } + e->e_nh = NULL; + + nua->nua_callback(e->e_event, e->e_status, e->e_phrase, + nua, nua->nua_magic, + nh, nh ? nh->nh_magic : NULL, + e->e_msg ? sip_object(e->e_msg) : NULL, + e->e_tags); - if (nh && nua_handle_unref(nh)) { + if (nh && !NH_IS_DEFAULT(nh) && nua_handle_unref(nh)) { #if HAVE_NUA_HANDLE_DEBUG SU_DEBUG_0(("nua(%p): freed by application\n", (void *)nh)); #else SU_DEBUG_9(("nua(%p): freed by application\n", (void *)nh)); #endif } + + if (!su_msg_is_non_null(nua->nua_current)) + return; + + if (e->e_msg) + msg_destroy(e->e_msg), e->e_msg = NULL; + + su_msg_destroy(nua->nua_current); } /** Get current request message. @NEW_1_12_4. @@ -1074,9 +1057,7 @@ */ msg_t *nua_current_request(nua_t const *nua) { - if (nua && nua->nua_current && su_msg_is_non_null(nua->nua_current->nf_saved)) - return su_msg_data(nua->nua_current->nf_saved)->e_msg; - return NULL; + return nua && nua->nua_current ? su_msg_data(nua->nua_current)->e_msg : NULL; } /** Get request message from saved nua event. @NEW_1_12_4. @@ -1094,15 +1075,14 @@ */ int nua_save_event(nua_t *nua, nua_saved_event_t return_saved[1]) { - if (return_saved) { - if (nua && nua->nua_current) { - su_msg_save(return_saved, nua->nua_current->nf_saved); - return su_msg_is_non_null(return_saved); + if (nua && return_saved) { + su_msg_save(return_saved, nua->nua_current); + if (su_msg_is_non_null(return_saved)) { + /* Remove references to tasks */ + su_msg_remove_refs(return_saved); + return 1; } - else - *return_saved = NULL; } - return 0; } Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_stack.h ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_stack.h (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_stack.h Mon Oct 22 19:12:09 2007 @@ -197,8 +197,6 @@ return nh == NULL || nh->nh_special; } -typedef struct nua_event_frame_s nua_event_frame_t; - extern char const nua_internal_error[]; #define NUA_INTERNAL_ERROR 900, nua_internal_error @@ -216,7 +214,7 @@ nua_callback_f nua_callback; nua_magic_t *nua_magic; - nua_event_frame_t *nua_current; + nua_saved_event_t nua_current[1]; nua_saved_event_t nua_signal[1]; /* Engine state flags */

1 0

[commit] r6019 - freeswitch/trunk/scripts/socket/freepy
by Freeswitch SVN 22 Oct '07

22 Oct '07

Author: greenlizard Date: Mon Oct 22 15:50:34 2007 New Revision: 6019 Modified: freeswitch/trunk/scripts/socket/freepy/INSTALL freeswitch/trunk/scripts/socket/freepy/__init__.py freeswitch/trunk/scripts/socket/freepy/fshelper.py Log: broadcast wav functionality Modified: freeswitch/trunk/scripts/socket/freepy/INSTALL ============================================================================== --- freeswitch/trunk/scripts/socket/freepy/INSTALL (original) +++ freeswitch/trunk/scripts/socket/freepy/INSTALL Mon Oct 22 15:50:34 2007 @@ -1,4 +1,22 @@ +DEPENDENCIES +============ + +The State Machine Compiler is needed for the freepy connection library to function. + + * wget http://ufpr.dl.sourceforge.net/sourceforge/smc/smc_5_0_0.tgz + * tar xvfz smc_5_0_0.tgz + * cd smc_5_0_0 + * cd lib + * python setup.py install + +PYTHONPATH +========== + - Add /path/to/freeswitch/scripts/socket to your PYTHONPATH + +TESTING +======= + - Copy/Paste the code from test1() in fshelper.py to your own test module - Adapt code as needed and run \ No newline at end of file Modified: freeswitch/trunk/scripts/socket/freepy/__init__.py ============================================================================== --- freeswitch/trunk/scripts/socket/freepy/__init__.py (original) +++ freeswitch/trunk/scripts/socket/freepy/__init__.py Mon Oct 22 15:50:34 2007 @@ -312,7 +312,17 @@ self.transport.write("%s\n\n" % msg) return req.getDeferred() - + def broadcast(self, uuid, path, legs, bgapi = False): + if bgapi == True: + msg = "bgapi broadcast %s %s %s" % (uuid, path, legs) + req = request.BgApiRequest() + else: + msg = "api broadcast %s %s %s" % (uuid, path, legs) + req = request.ApiRequest() + self.requestq.put(req) + print "sending to fs: %s" % msg + self.transport.write("%s\n\n" % msg) + return req.getDeferred() def lineReceived(self, line): Modified: freeswitch/trunk/scripts/socket/freepy/fshelper.py ============================================================================== --- freeswitch/trunk/scripts/socket/freepy/fshelper.py (original) +++ freeswitch/trunk/scripts/socket/freepy/fshelper.py Mon Oct 22 15:50:34 2007 @@ -290,6 +290,19 @@ return d + def broadcast(self, uuid, path, legs="both", bgapi=True): + """ + @legs - one of the following strings: aleg|bleg|both + """ + def broadcast_inner(ignored): + df = self.freepyd.broadcast(uuid, path, legs, bgapi) + return df + + d = self.connect() + d.addCallback(broadcast_inner) + return d + + def sofia_profile_restart(self, profile_name, bgapi=True): def sofia_profile_restart_inner(ignored):

1 0

[commit] r6018 - freeswitch/trunk/scripts/contrib/trixter/xml-curl/templates/switch1/configuration
by Freeswitch SVN 22 Oct '07

22 Oct '07

Author: trixter Date: Mon Oct 22 14:03:00 2007 New Revision: 6018 Added: freeswitch/trunk/scripts/contrib/trixter/xml-curl/templates/switch1/configuration/voicemail.conf.tpl Log: this would be nice to have Added: freeswitch/trunk/scripts/contrib/trixter/xml-curl/templates/switch1/configuration/voicemail.conf.tpl ============================================================================== --- (empty file) +++ freeswitch/trunk/scripts/contrib/trixter/xml-curl/templates/switch1/configuration/voicemail.conf.tpl Mon Oct 22 14:03:00 2007 @@ -0,0 +1,50 @@ +<configuration name="voicemail.conf" description="Voicemail"> + <settings> + </settings> + <profiles> + <profile name="default"> + <param name="file-extension" value="wav"/> + <param name="terminator-key" value="#"/> + <param name="max-login-attempts" value="3"/> + <param name="digit-timeout" value="10000"/> + <param name="max-record-len" value="300"/> + <param name="tone-spec" value="%(1000, 0, 640)"/> + <param name="callback-dialplan" value="XML"/> + <param name="callback-context" value="default"/> + <param name="terminator-key" value="#"/> + <param name="play-new-messages-key" value="1"/> + <param name="play-saved-messages-key" value="2"/> + <param name="main-menu-key" value="0"/> + <param name="config-menu-key" value="5"/> + <param name="record-greeting-key" value="1"/> + <param name="choose-greeting-key" value="2"/> + <param name="record-name-key" value="3"/> + <param name="record-file-key" value="3"/> + <param name="listen-file-key" value="1"/> + <param name="save-file-key" value="2"/> + <param name="delete-file-key" value="7"/> + <param name="undelete-file-key" value="8"/> + <param name="email-key" value="4"/> + <param name="pause-key" value="0"/> + <param name="restart-key" value="1"/> + <param name="ff-key" value="6"/> + <param name="rew-key" value="4"/> + <email> + <body>{literal}<![CDATA[At ${voicemail_time} you were left a message from ${voicemail_caller_id_name} ${voicemail_caller_id_number} +to your account ${voicemail_account}@${voicemail_domain} +]]>{/literal}</body> + <headers>{literal}<![CDATA[From: FreeSWITCH mod_voicemail <${voicemail_account}@${voicemail_domain}> +To: <${voicemail_email}> +Subject: Voicemail from ${voicemail_caller_id_name} ${voicemail_caller_id_number} +X-Priority: ${voicemail_priority} +X-Mailer: FreeSWITCH +]]>{/literal}</headers> +  + <param name="date-fmt" value="%A, %B %d %Y, %I %M %p"/> + <param name="email-from" value="{literal}${voicemail_account}@${voicemail_domain}{/literal}"/> + </email> +  +  + </profile> + </profiles> +</configuration>

1 0

[commit] r6017 - freeswitch/trunk/scripts/contrib/trixter/xml-curl/templates/switch1/configuration
by Freeswitch SVN 22 Oct '07

22 Oct '07

Author: trixter Date: Mon Oct 22 14:02:47 2007 New Revision: 6017 Modified: freeswitch/trunk/scripts/contrib/trixter/xml-curl/templates/switch1/configuration/xml_cdr.conf.tpl Log: updated for new format Modified: freeswitch/trunk/scripts/contrib/trixter/xml-curl/templates/switch1/configuration/xml_cdr.conf.tpl ============================================================================== --- freeswitch/trunk/scripts/contrib/trixter/xml-curl/templates/switch1/configuration/xml_cdr.conf.tpl (original) +++ freeswitch/trunk/scripts/contrib/trixter/xml-curl/templates/switch1/configuration/xml_cdr.conf.tpl Mon Oct 22 14:02:47 2007 @@ -1,6 +1,3 @@ -<?xml version="1.0"?> -<document type="freeswitch/xml"> - <section name="configuration" description="Various Configuration"> <configuration name="xml_cdr.conf" description="XML CDR CURL logger"> <settings>  @@ -13,17 +10,22 @@   -  - -  -  +   -  -  - <param name="logDir" value=""/> +  + <param name="log-dir" value=""/> + +  +  + +  +  +  + +  +  +  </settings> </configuration> -</section> -</document>

1 0

[commit] r6016 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 22 Oct '07

22 Oct '07

Author: anthm Date: Mon Oct 22 10:30:21 2007 New Revision: 6016 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Log: avoiding segfault 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 Mon Oct 22 10:30:21 2007 @@ -1774,7 +1774,7 @@ #define check_decode(_var, _session) do { \ assert(_session); \ - if (strchr(_var, '%')) { \ + if (!switch_strlen_zero(_var) && strchr(_var, '%')) { \ char *tmp = switch_core_session_strdup(_session, _var); \ switch_url_decode(tmp); \ _var = tmp; \ @@ -1797,6 +1797,14 @@ port = url->url_port; } + if (switch_strlen_zero(user)) { + user = "nobody"; + } + + if (switch_strlen_zero(host)) { + host = "nowhere"; + } + check_decode(user, session); if (user) {

1 0

[commit] r6015 - freeswitch/trunk
by Freeswitch SVN 22 Oct '07

22 Oct '07

Author: mikej Date: Sun Oct 21 21:47:02 2007 New Revision: 6015 Modified: freeswitch/trunk/Makefile.am Log: do a little bit better dependency tracking with module targets when the core is modified. Fix for FSBUILD-19 Modified: freeswitch/trunk/Makefile.am ============================================================================== --- freeswitch/trunk/Makefile.am (original) +++ freeswitch/trunk/Makefile.am Sun Oct 21 21:47:02 2007 @@ -11,6 +11,8 @@ OSARCH=`uname -s` .DEFAULT: + @target=`echo $@ | sed -e 's|^.*-||'`; \ + if test "$$target" = "install"; then $(MAKE) $(AM_MAKEFLAGS) core_install; else $(MAKE) $(AM_MAKEFLAGS) core ; fi; @cd src/mod && $(MAKE) $(AM_MAKEFLAGS) $@ libfreeswitch_la_SOURCES = \

1 0