February 2009 - freeswitch-svn@lists.freeswitch.org

[Freeswitch-svn] [commit] r12336 - freeswitch/trunk/scripts/contrib/mrene/fshost
by FreeSWITCH SVN 27 Feb '09

27 Feb '09

Author: mrene Date: Fri Feb 27 15:48:06 2009 New Revision: 12336 Log: tweak Modified: freeswitch/trunk/scripts/contrib/mrene/fshost/main.c Modified: freeswitch/trunk/scripts/contrib/mrene/fshost/main.c ============================================================================== --- freeswitch/trunk/scripts/contrib/mrene/fshost/main.c (original) +++ freeswitch/trunk/scripts/contrib/mrene/fshost/main.c Fri Feb 27 15:48:06 2009 @@ -50,7 +50,8 @@ printf("Initializing core...\n"); /* Initialize the core and load modules, that will startup FS completely */ if (switch_core_init_and_modload(flags, console, &err) != SWITCH_STATUS_SUCCESS) { - fprintf(stderr, "Cannot Initialize [%s]\n", err); + fprintf(stderr, "Failed to initialize FreeSWITCH's core: %s\n", err); + return 1; } printf("Everything OK, Entering runtime loop.\n");

1 0

[Freeswitch-svn] [commit] r12335 - freeswitch/trunk/scripts/contrib/mrene/fshost
by FreeSWITCH SVN 27 Feb '09

27 Feb '09

Author: mrene Date: Fri Feb 27 15:45:31 2009 New Revision: 12335 Log: Example on how to host freeswitch within third party applications Added: freeswitch/trunk/scripts/contrib/mrene/fshost/ freeswitch/trunk/scripts/contrib/mrene/fshost/Makefile freeswitch/trunk/scripts/contrib/mrene/fshost/main.c Added: freeswitch/trunk/scripts/contrib/mrene/fshost/Makefile ============================================================================== --- (empty file) +++ freeswitch/trunk/scripts/contrib/mrene/fshost/Makefile Fri Feb 27 15:45:31 2009 @@ -0,0 +1,14 @@ +CC=gcc +FS_PATH=../../../../ +FS_INCLUDES=-I$(FS_PATH)/src/include -I$(FS_PATH)/libs/apr/include -I$(FS_PATH)/libs/libteletone/src +FS_LDFLAGS = -L$(FS_PATH)/.libs -lfreeswitch +CFLAGS=-ggdb3 $(FS_INCLUDES) -Wall -Werror +LIBS=$(FS_LDFLAGS) + +all: fshost + +clean: + rm -rf fshost fshost.dSYM + +fshost: main.c + $(CC) -o fshost main.c $(CFLAGS) $(LIBS) Added: freeswitch/trunk/scripts/contrib/mrene/fshost/main.c ============================================================================== --- (empty file) +++ freeswitch/trunk/scripts/contrib/mrene/fshost/main.c Fri Feb 27 15:45:31 2009 @@ -0,0 +1,97 @@ +/* + * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application + * Copyright (C) 2005-2009, Anthony Minessale II <anthm(a)freeswitch.org> + * + * Version: MPL 1.1 + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application + * + * The Initial Developer of the Original Code is + * Anthony Minessale II <anthm(a)freeswitch.org> + * Portions created by the Initial Developer are Copyright (C) + * the Initial Developer. All Rights Reserved. + * + * Contributor(s): + * + * Mathieu Rene <mathieu.rene(a)gmail.com> + * + * + * fshost - Example on how to host freeswitch within your own programs + * + */ + +#include <stdio.h> +#include <switch.h> + +int main(int argc, char *argv[]) +{ + switch_core_flag_t flags = SCF_USE_SQL; + const char *err = NULL; + switch_bool_t console = SWITCH_TRUE; + switch_status_t destroy_status; + int ret = 0; + + /* Initialize libs & globals */ + printf("Initializing globals...\n"); + switch_core_setrlimits(); + switch_core_set_globals(); + + /* If you need to override configuration directories, you need to change them in the SWITCH_GLOBAL_dirs global structure */ + printf("Initializing core...\n"); + /* Initialize the core and load modules, that will startup FS completely */ + if (switch_core_init_and_modload(flags, console, &err) != SWITCH_STATUS_SUCCESS) { + fprintf(stderr, "Cannot Initialize [%s]\n", err); + } + + printf("Everything OK, Entering runtime loop.\n"); + + fflush(stdout); + + /* Go into the runtime loop. If the argument is true, this basically sets runtime.running = 1 and loops while that is set + * If its false, it initializes the libedit for the console, then does the same thing + */ + switch_core_runtime_loop(!console); + + /* When the runtime loop exits, its time to shutdown */ + destroy_status = switch_core_destroy(); + + /* If we get SWITCH_STATUS_RESTART, it means the core received an fsctl shutdown restart command */ + if (destroy_status == SWITCH_STATUS_RESTART) { + char buf[1024] = ""; + int i = 0; + + switch_assert(argv[0]); + switch_sleep(1000000); + ret = (int)execv(argv[0], argv); + fprintf(stderr, "Restart Failed [%s] resorting to plan b\n", strerror(errno)); + + for(i = 0; i < argc; i++) { + switch_snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "%s ", argv[i]); + } + + ret = system(buf); + } + + return ret; +} + +/* For Emacs: + * Local Variables: + * mode:c + * indent-tabs-mode:t + * tab-width:4 + * c-basic-offset:4 + * End: + * For VIM: + * vim:set softtabstop=4 shiftwidth=4 tabstop=4: + */ \ No newline at end of file

1 0

[Freeswitch-svn] [commit] r12334 - in freeswitch/trunk/src/mod: event_handlers/mod_event_socket xml_int/mod_xml_rpc
by FreeSWITCH SVN 27 Feb '09

27 Feb '09

Author: mrene Date: Fri Feb 27 14:21:48 2009 New Revision: 12334 Log: More initial paradox of doom avoidement Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c Fri Feb 27 14:21:48 2009 @@ -920,6 +920,9 @@ if (!strcasecmp(api_command, "unload") && !strcasecmp(api_args, "mod_event_socket")) { api_command = "bgapi"; api_args = "unload mod_event_socket"; + } else if (!strcasecmp(api_command, "reload") && !strcasecmp(api_args, "mod_event_socket")) { + api_command = "bgapi"; + api_args = "reload mod_event_socket"; } switch_api_execute(api_command, api_args, NULL, stream); @@ -1351,13 +1354,16 @@ { switch_status_t status = SWITCH_STATUS_SUCCESS; char *cmd = switch_event_get_header(*event, "command"); - char cheat[] = "api bgapi unload mod_event_socket"; + char unload_cheat[] = "api bgapi unload mod_event_socket"; + char reload_cheat[] = "api bgapi reload mod_event_socket"; *reply = '\0'; if (switch_stristr("unload", cmd) && switch_stristr("mod_event_socket", cmd)) { - cmd = cheat; - } + cmd = unload_cheat; + } else if (switch_stristr("reload", cmd) && switch_stristr("mod_event_socket", cmd)) { + cmd = reload_cheat; + } if (!strncasecmp(cmd, "exit", 4)) { switch_clear_flag_locked(listener, LFLAG_RUNNING); Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c ============================================================================== --- freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c (original) +++ freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c Fri Feb 27 14:21:48 2009 @@ -685,6 +685,9 @@ if (switch_stristr("unload", command) && switch_stristr("mod_xml_rpc", r->requestInfo.query)) { command = "bgapi"; api_str = "unload mod_xml_rpc"; + } else if (switch_stristr("reload", command) && switch_stristr("mod_xml_rpc", r->requestInfo.query)) { + command = "bgapi"; + api_str = "reload mod_xml_rpc"; } else { api_str = r->requestInfo.query; } @@ -719,6 +722,7 @@ switch_stream_handle_t stream = { 0 }; xmlrpc_value *val = NULL; const char *x_command = "bgapi", x_arg= "unload mod_xml_rpc"; + switch_bool_t freed = 0; /* Parse our argument array. */ @@ -731,9 +735,16 @@ if (switch_stristr("unload", command) && switch_stristr("mod_xml_rpc", arg)) { switch_safe_free(command); - command = x_command; switch_safe_free(arg); - arg = x_arg; + freed = 1; + command = "bgapi"; + arg = "unload mod_xml_rpc"; + } else if (switch_stristr("reload", command) && switch_stristr("mod_xml_rpc", arg)) { + switch_safe_free(command); + switch_safe_free(arg); + freed = 1; + command = "bgapi"; + arg = "reload mod_xml_rpc"; } SWITCH_STANDARD_STREAM(stream); @@ -746,11 +757,8 @@ } /* xmlrpc-c requires us to free memory it malloced from xmlrpc_decompose_value */ - if (command != x_command) { + if (!freed) { switch_safe_free(command); - } - - if (arg != x_arg) { switch_safe_free(arg); }

1 0

[Freeswitch-svn] [commit] r12333 - freeswitch/trunk/src
by FreeSWITCH SVN 27 Feb '09

27 Feb '09

Author: anthm Date: Fri Feb 27 13:39:58 2009 New Revision: 12333 Log: reverse define to allow it to be passed in as positive from configure (no real change) Modified: freeswitch/trunk/src/switch_core_memory.c Modified: freeswitch/trunk/src/switch_core_memory.c ============================================================================== --- freeswitch/trunk/src/switch_core_memory.c (original) +++ freeswitch/trunk/src/switch_core_memory.c Fri Feb 27 13:39:58 2009 @@ -40,7 +40,9 @@ //#define DESTROY_POOLS //#define INSTANTLY_DESTROY_POOLS /*#define LOCK_MORE*/ +#ifndef SWITCH_POOL_RECYCLE #define PER_POOL_LOCK 1 +#endif static struct { switch_mutex_t *mem_lock;

1 0

[Freeswitch-svn] [commit] r12332 - freeswitch/trunk/src
by FreeSWITCH SVN 27 Feb '09

27 Feb '09

Author: mrene Date: Fri Feb 27 13:29:52 2009 New Revision: 12332 Log: fix leak Modified: freeswitch/trunk/src/switch_channel.c Modified: freeswitch/trunk/src/switch_channel.c ============================================================================== --- freeswitch/trunk/src/switch_channel.c (original) +++ freeswitch/trunk/src/switch_channel.c Fri Feb 27 13:29:52 2009 @@ -279,7 +279,9 @@ *dt = new_dtmf; while (switch_queue_trypush(channel->dtmf_queue, dt) != SWITCH_STATUS_SUCCESS) { - switch_queue_trypop(channel->dtmf_queue, &pop); + if (switch_queue_trypop(channel->dtmf_queue, &pop) == SWITCH_STATUS_SUCCESS) { + free(pop); + } if (++x > 100) { status = SWITCH_STATUS_FALSE; free(dt);

1 0

[Freeswitch-svn] [commit] r12331 - freeswitch/trunk/src
by FreeSWITCH SVN 27 Feb '09

27 Feb '09

Author: mrene Date: Fri Feb 27 13:24:56 2009 New Revision: 12331 Log: dont need safe_free here Modified: freeswitch/trunk/src/switch_ivr_async.c Modified: freeswitch/trunk/src/switch_ivr_async.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_async.c (original) +++ freeswitch/trunk/src/switch_ivr_async.c Fri Feb 27 13:24:56 2009 @@ -1133,7 +1133,7 @@ } pvt->ts.duration = duration; teletone_run(&pvt->ts, buf); - switch_safe_free(pop); + free(pop); } if (switch_buffer_inuse(pvt->audio_buffer) && (bytes = switch_buffer_read(pvt->audio_buffer, frame->data, frame->datalen))) {

1 0

[Freeswitch-svn] [commit] r12330 - freeswitch/trunk/src
by FreeSWITCH SVN 27 Feb '09

27 Feb '09

Author: mrene Date: Fri Feb 27 13:22:30 2009 New Revision: 12330 Log: Fix leak Modified: freeswitch/trunk/src/switch_ivr_async.c Modified: freeswitch/trunk/src/switch_ivr_async.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_async.c (original) +++ freeswitch/trunk/src/switch_ivr_async.c Fri Feb 27 13:22:30 2009 @@ -1133,6 +1133,7 @@ } pvt->ts.duration = duration; teletone_run(&pvt->ts, buf); + switch_safe_free(pop); } if (switch_buffer_inuse(pvt->audio_buffer) && (bytes = switch_buffer_read(pvt->audio_buffer, frame->data, frame->datalen))) {

1 0

[Freeswitch-svn] [commit] r12329 - freeswitch/trunk/src
by FreeSWITCH SVN 27 Feb '09

27 Feb '09

Author: anthm Date: Fri Feb 27 12:52:15 2009 New Revision: 12329 Log: gimmie back my 136 bytes Modified: freeswitch/trunk/src/switch_rtp.c Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Fri Feb 27 12:52:15 2009 @@ -1766,6 +1766,7 @@ *dtmf = *_dtmf; switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "RTP RECV DTMF %c:%d\n", dtmf->digit, dtmf->duration); bytes++; + free(pop); } switch_mutex_unlock(rtp_session->dtmf_data.dtmf_mutex);

1 0

[Freeswitch-svn] [commit] r12328 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by FreeSWITCH SVN 27 Feb '09

27 Feb '09

Author: brian Date: Fri Feb 27 12:15:50 2009 New Revision: 12328 Log: move this debug line into profile debug Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c 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 Fri Feb 27 12:15:50 2009 @@ -866,7 +866,9 @@ } if (auth_res != AUTH_OK && !stale) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Send %s for [%s@%s]\n", forbidden ? "forbidden" : "challenge", to_user, to_host); + if (profile->debug) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Send %s for [%s@%s]\n", forbidden ? "forbidden" : "challenge", to_user, to_host); + } if (auth_res == AUTH_FORBIDDEN) { nua_respond(nh, SIP_403_FORBIDDEN, NUTAG_WITH_THIS(nua), TAG_END()); } else {

1 0

[Freeswitch-svn] [commit] r12327 - freeswitch/trunk/src/mod/event_handlers/mod_event_socket
by FreeSWITCH SVN 27 Feb '09

27 Feb '09

Author: mrene Date: Fri Feb 27 10:38:19 2009 New Revision: 12327 Log: Whitespace can be a bitch Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c Fri Feb 27 10:38:19 2009 @@ -1271,6 +1271,10 @@ acs->ack = 1; SWITCH_STANDARD_STREAM(stream); + + if (!strcasecmp(acs->api_cmd, "unload") || !strcasecmp(acs->arg, "mod_event_socket")) { + + } if ((status = switch_api_execute(acs->api_cmd, acs->arg, NULL, &stream)) == SWITCH_STATUS_SUCCESS) { reply = stream.data; @@ -1351,7 +1355,7 @@ *reply = '\0'; - if (switch_stristr("unload mod_event_socket", cmd)) { + if (switch_stristr("unload", cmd) && switch_stristr("mod_event_socket", cmd)) { cmd = cheat; }

1 0