- Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r4279 - freeswitch/trunk/src
by Freeswitch SVN 14 Feb '07

14 Feb '07

Author: anthm Date: Wed Feb 14 18:08:10 2007 New Revision: 4279 Modified: freeswitch/trunk/src/switch_core.c Log: update Modified: freeswitch/trunk/src/switch_core.c ============================================================================== --- freeswitch/trunk/src/switch_core.c (original) +++ freeswitch/trunk/src/switch_core.c Wed Feb 14 18:08:10 2007 @@ -1895,6 +1895,7 @@ if (session->private_event_queue) { if (switch_queue_trypush(session->private_event_queue, *event) == SWITCH_STATUS_SUCCESS) { *event = NULL; + switch_core_session_kill_channel(session, SWITCH_SIG_BREAK); status = SWITCH_STATUS_SUCCESS; } }

1 0

[commit] r4278 - in freeswitch/trunk/libs/sofia-sip: . m4
by Freeswitch SVN 14 Feb '07

14 Feb '07

Author: anthm Date: Wed Feb 14 17:48:54 2007 New Revision: 4278 Modified: freeswitch/trunk/libs/sofia-sip/configure freeswitch/trunk/libs/sofia-sip/m4/sac-general.m4 Log: detect __func__ properly even if CFLAGS has -Werror in it Modified: freeswitch/trunk/libs/sofia-sip/configure ============================================================================== --- freeswitch/trunk/libs/sofia-sip/configure (original) +++ freeswitch/trunk/libs/sofia-sip/configure Wed Feb 14 17:48:54 2007 @@ -20453,7 +20453,7 @@ int main () { -char *s = __func__; +const char *s = __func__; ; return 0; @@ -26933,7 +26933,7 @@ int main () { -char *s = __func__; +const char *s = __func__; ; return 0; Modified: freeswitch/trunk/libs/sofia-sip/m4/sac-general.m4 ============================================================================== --- freeswitch/trunk/libs/sofia-sip/m4/sac-general.m4 (original) +++ freeswitch/trunk/libs/sofia-sip/m4/sac-general.m4 Wed Feb 14 17:48:54 2007 @@ -276,7 +276,7 @@ AC_DEFUN([AC_C_VAR_FUNC], [AC_REQUIRE([AC_PROG_CC]) AC_CACHE_CHECK(whether $CC recognizes __func__, ac_cv_c_var_func, -AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[char *s = __func__; +AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[const char *s = __func__; ]])],[ac_cv_c_var_func=yes],[ac_cv_c_var_func=no])) if test $ac_cv_c_var_func = "yes"; then AC_DEFINE([HAVE_FUNC], 1, [Define to 1 if the C compiler supports __func__])

1 0

[commit] r4277 - freeswitch/trunk/src
by Freeswitch SVN 14 Feb '07

14 Feb '07

Author: anthm Date: Wed Feb 14 17:41:03 2007 New Revision: 4277 Modified: freeswitch/trunk/src/switch_core.c freeswitch/trunk/src/switch_ivr.c Log: add resets to a few places Modified: freeswitch/trunk/src/switch_core.c ============================================================================== --- freeswitch/trunk/src/switch_core.c (original) +++ freeswitch/trunk/src/switch_core.c Wed Feb 14 17:41:03 2007 @@ -2177,10 +2177,13 @@ SWITCH_DECLARE(void) switch_core_session_reset(switch_core_session_t *session) { + switch_channel_t *channel; + char buf[256]; + switch_size_t has; + /* sweep theese under the rug, they wont be leaked they will be reclaimed when the session ends. */ - session->read_resampler = NULL; session->write_resampler = NULL; @@ -2190,6 +2193,15 @@ /* wipe theese, they will be recreated if need be */ switch_buffer_destroy(&session->raw_read_buffer); switch_buffer_destroy(&session->raw_write_buffer); + + /* reset state handlers and flush dtmf */ + channel = switch_core_session_get_channel(session); + switch_channel_clear_state_handler(channel, NULL); + + if ((has = switch_channel_has_dtmf(channel))) { + switch_channel_dequeue_dtmf(channel, buf, has); + } + } SWITCH_DECLARE(switch_status_t) switch_core_session_write_frame(switch_core_session_t *session, switch_frame_t *frame, Modified: freeswitch/trunk/src/switch_ivr.c ============================================================================== --- freeswitch/trunk/src/switch_ivr.c (original) +++ freeswitch/trunk/src/switch_ivr.c Wed Feb 14 17:41:03 2007 @@ -2076,6 +2076,7 @@ switch_channel_set_variable(chan_a, SWITCH_BRIDGE_VARIABLE, NULL); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "BRIDGE THREAD DONE [%s]\n", switch_channel_get_name(chan_a)); + switch_core_session_reset(session_a); switch_channel_clear_flag(chan_a, CF_BRIDGED); switch_mutex_lock(data->mutex); @@ -3642,6 +3643,8 @@ assert(session != NULL); assert(extension != NULL); + switch_core_session_reset(session); + channel = switch_core_session_get_channel(session); assert(channel != NULL);

1 0

[commit] r4276 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 14 Feb '07

14 Feb '07

Author: anthm Date: Wed Feb 14 17:14:32 2007 New Revision: 4276 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Log: fix codec neg 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 Wed Feb 14 17:14:32 2007 @@ -802,7 +802,9 @@ codec_string = abs; } else { if (!(codec_string = switch_channel_get_variable(channel, "codec_string"))) { - codec_string = tech_pvt->profile->codec_string; + if (tech_pvt->profile->codec_string) { + codec_string = switch_core_session_strdup(tech_pvt->session, tech_pvt->profile->codec_string); + } } if ((ocodec = switch_channel_get_variable(channel, SWITCH_ORIGINATOR_CODEC_VARIABLE))) { @@ -2373,7 +2375,7 @@ if (!strcasecmp(map->rm_encoding, "telephone-event")) { tech_pvt->te = (switch_payload_t)map->rm_pt; } - + for (i = 0; i < tech_pvt->num_codecs; i++) { const switch_codec_implementation_t *imp = tech_pvt->codecs[i]; switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Codec Compare [%s:%d]/[%s:%d]\n",

1 0

[commit] r4275 - in freeswitch/trunk/libs/js: . src
by Freeswitch SVN 14 Feb '07

14 Feb '07

Author: mikej Date: Wed Feb 14 16:57:13 2007 New Revision: 4275 Modified: freeswitch/trunk/libs/js/.update freeswitch/trunk/libs/js/src/jsapi.c Log: fix js file object for good this time Modified: freeswitch/trunk/libs/js/.update ============================================================================== --- freeswitch/trunk/libs/js/.update (original) +++ freeswitch/trunk/libs/js/.update Wed Feb 14 16:57:13 2007 @@ -1 +1 @@ -Wed Feb 14 15:47:43 EST 2007 +Wed Feb 14 17:04:43 EST 2007 Modified: freeswitch/trunk/libs/js/src/jsapi.c ============================================================================== --- freeswitch/trunk/libs/js/src/jsapi.c (original) +++ freeswitch/trunk/libs/js/src/jsapi.c Wed Feb 14 16:57:13 2007 @@ -1215,10 +1215,10 @@ #if JS_HAS_XML_SUPPORT js_InitXMLClasses(cx, obj) && #endif -#ifndef OSSP #if defined(JS_HAS_FILE_OBJECT) && (JS_HAS_FILE_OBJECT - 0) /* OSSP BUGFIX */ js_InitFileClass(cx, obj) && #endif +#ifndef OSSP #if defined(JS_HAS_DSO_OBJECT) && (JS_HAS_DSO_OBJECT - 0) js_InitDSOClass(cx, obj) && #endif @@ -1262,7 +1262,7 @@ {js_InitNamespaceClass, ATOM_OFFSET(Namespace)}, {js_InitQNameClass, ATOM_OFFSET(QName)}, #endif -#if JS_HAS_FILE_OBJECT +#if defined(JS_HAS_FILE_OBJECT) && (JS_HAS_FILE_OBJECT - 0) /* OSSP BUGFIX */ {js_InitFileClass, ATOM_OFFSET(File)}, #endif #if defined(JS_HAS_DSO_OBJECT) && (JS_HAS_DSO_OBJECT - 0)

1 0

[commit] r4274 - freeswitch/trunk/libs/js
by Freeswitch SVN 14 Feb '07

14 Feb '07

Author: anthm Date: Wed Feb 14 15:48:15 2007 New Revision: 4274 Modified: freeswitch/trunk/libs/js/.update freeswitch/trunk/libs/js/configure freeswitch/trunk/libs/js/configure.ac Log: yet another attempt to properly build with the file object again Modified: freeswitch/trunk/libs/js/.update ============================================================================== --- freeswitch/trunk/libs/js/.update (original) +++ freeswitch/trunk/libs/js/.update Wed Feb 14 15:48:15 2007 @@ -1 +1 @@ -Wed Feb 14 15:20:38 EST 2007 +Wed Feb 14 15:47:43 EST 2007 Modified: freeswitch/trunk/libs/js/configure ============================================================================== --- freeswitch/trunk/libs/js/configure (original) +++ freeswitch/trunk/libs/js/configure Wed Feb 14 15:48:15 2007 @@ -4645,7 +4645,7 @@ echo "$as_me:$LINENO: result: $ac_cv_with_file" >&5 echo "${ECHO_T}$ac_cv_with_file" >&6 if test ".$ac_cv_with_file" = ".yes"; then - CPPFLAGS="$CPPFLAGS -DJS_HAS_FILE_OBJECT" + CPPFLAGS="$CPPFLAGS -DJS_HAS_FILE_OBJECT=1" fi @@ -5482,7 +5482,7 @@ fi done - CPPFLAGS="$CPPFLAGS -DJS_HAS_DSO_OBJECT" + CPPFLAGS="$CPPFLAGS -DJS_HAS_DSO_OBJECT=1" CLI_LDFLAGS="$CLI_LDFLAGS -export-dynamic" fi @@ -5504,7 +5504,7 @@ echo "$as_me:$LINENO: result: $ac_cv_with_utf8" >&5 echo "${ECHO_T}$ac_cv_with_utf8" >&6 if test ".$ac_cv_with_utf8" = ".yes"; then - CPPFLAGS="$CPPFLAGS -DJS_C_STRINGS_ARE_UTF8" + CPPFLAGS="$CPPFLAGS -DJS_C_STRINGS_ARE_UTF8=1" fi @@ -5532,7 +5532,7 @@ - CPPFLAGS="$CPPFLAGS -DJS_THREADSAFE -Insprpub/dist/include/nspr" + CPPFLAGS="$CPPFLAGS -DJS_THREADSAFE=1 -Insprpub/dist/include/nspr" LDFLAGS="$LDFLAGS -L$prefix/lib -lnspr4" fi Modified: freeswitch/trunk/libs/js/configure.ac ============================================================================== --- freeswitch/trunk/libs/js/configure.ac (original) +++ freeswitch/trunk/libs/js/configure.ac Wed Feb 14 15:48:15 2007 @@ -135,7 +135,7 @@ [ac_cv_with_file=$withval], [ac_cv_with_file=yes]) AC_CACHE_CHECK([whether to build with the File object], [ac_cv_with_file], [ac_cv_with_file=yes]) if test ".$ac_cv_with_file" = ".yes"; then - CPPFLAGS="$CPPFLAGS -DJS_HAS_FILE_OBJECT" + CPPFLAGS="$CPPFLAGS -DJS_HAS_FILE_OBJECT=1" fi dnl # configure option --with-dso @@ -147,7 +147,7 @@ AC_CHECK_LIB(dl, dlopen) AC_CHECK_HEADER(dlfcn.h, , AC_ERROR([dlopen(3) header <dlfcn.h> required])) AC_CHECK_FUNCS(dlopen dlclose dlerror, , AC_ERROR([dlopen(3) API functions dlopen/dlclose/dlerror required])) - CPPFLAGS="$CPPFLAGS -DJS_HAS_DSO_OBJECT" + CPPFLAGS="$CPPFLAGS -DJS_HAS_DSO_OBJECT=1" CLI_LDFLAGS="$CLI_LDFLAGS -export-dynamic" fi @@ -157,7 +157,7 @@ [ac_cv_with_utf8=$withval], [ac_cv_with_utf8=no]) AC_CACHE_CHECK([whether to build with exclusive UTF-8 C string], [ac_cv_with_utf8], [ac_cv_with_utf8=no]) if test ".$ac_cv_with_utf8" = ".yes"; then - CPPFLAGS="$CPPFLAGS -DJS_C_STRINGS_ARE_UTF8" + CPPFLAGS="$CPPFLAGS -DJS_C_STRINGS_ARE_UTF8=1" fi AC_ARG_WITH(nspr, @@ -166,7 +166,7 @@ AC_CACHE_CHECK([whether to build with NSPR], [ac_cv_with_nspr], [ac_cv_with_nspr=no]) if test ".$ac_cv_with_nspr" = ".yes"; then sinclude(nsprpub/config/nspr.m4) - CPPFLAGS="$CPPFLAGS -DJS_THREADSAFE -Insprpub/dist/include/nspr" + CPPFLAGS="$CPPFLAGS -DJS_THREADSAFE=1 -Insprpub/dist/include/nspr" LDFLAGS="$LDFLAGS -L$prefix/lib -lnspr4" fi

1 0

[commit] r4273 - freeswitch/trunk/libs/js
by Freeswitch SVN 14 Feb '07

14 Feb '07

Author: anthm Date: Wed Feb 14 15:21:12 2007 New Revision: 4273 Added: freeswitch/trunk/libs/js/.update Log: .update Added: freeswitch/trunk/libs/js/.update ============================================================================== --- (empty file) +++ freeswitch/trunk/libs/js/.update Wed Feb 14 15:21:12 2007 @@ -0,0 +1 @@ +Wed Feb 14 15:20:38 EST 2007

1 0

[commit] r4272 - freeswitch/trunk/src/mod/event_handlers/mod_cdr
by Freeswitch SVN 14 Feb '07

14 Feb '07

Author: mikej Date: Wed Feb 14 15:15:51 2007 New Revision: 4272 Modified: freeswitch/trunk/src/mod/event_handlers/mod_cdr/csvcdr.cpp Log: %d can't take the long long result. Modified: freeswitch/trunk/src/mod/event_handlers/mod_cdr/csvcdr.cpp ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_cdr/csvcdr.cpp (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_cdr/csvcdr.cpp Wed Feb 14 15:15:51 2007 @@ -182,7 +182,7 @@ if(outputfile.good()) { activated = 1; - switch_console_printf(SWITCH_CHANNEL_LOG,"CsvCDR activated, log rotation will occur at or after %d MB\n",(filesize_limit/1024/1024)); + switch_console_printf(SWITCH_CHANNEL_LOG,"CsvCDR activated, log rotation will occur at or after %d MB\n",(int)(filesize_limit >> 20)); } } else

1 0

[commit] r4271 - freeswitch/trunk/src/mod/endpoints/mod_wanpipe
by Freeswitch SVN 14 Feb '07

14 Feb '07

Author: anthm Date: Wed Feb 14 15:06:39 2007 New Revision: 4271 Modified: freeswitch/trunk/src/mod/endpoints/mod_wanpipe/mod_wanpipe.c Log: fix Modified: freeswitch/trunk/src/mod/endpoints/mod_wanpipe/mod_wanpipe.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_wanpipe/mod_wanpipe.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_wanpipe/mod_wanpipe.c Wed Feb 14 15:06:39 2007 @@ -527,7 +527,6 @@ return SWITCH_STATUS_GENERR; } - if (sangoma_socket_waitfor(tech_pvt->wpsock->fd, 1000, POLLIN | POLLERR | POLLHUP) <= 0) { return SWITCH_STATUS_GENERR; } @@ -1150,7 +1149,6 @@ switch_core_session_t *session; switch_channel_t *channel; struct channel_map *chanmap; - private_object_t *tech_pvt; switch_core_session_message_t *msg; chanmap = spri->private_info; @@ -1160,7 +1158,7 @@ channel = switch_core_session_get_channel(session); assert(channel != NULL); - switch_core_session_queue_indication(tech_pvt->session, SWITCH_MESSAGE_INDICATE_RINGING); + switch_core_session_queue_indication(session, SWITCH_MESSAGE_INDICATE_RINGING); switch_channel_mark_ring_ready(channel); switch_core_session_rwunlock(session);

1 0

[commit] r4270 - freeswitch/trunk/src/mod/endpoints/mod_dingaling
by Freeswitch SVN 14 Feb '07

14 Feb '07

Author: anthm Date: Wed Feb 14 14:47:16 2007 New Revision: 4270 Modified: freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c Log: add var that can set gmail greeting Modified: freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c Wed Feb 14 14:47:16 2007 @@ -1529,7 +1529,7 @@ char *dnis = NULL; char workspace[1024] = ""; char *p, *u, ubuf[512] = "", *user = NULL; - char *cid_msg = NULL; + char *cid_msg = NULL, *f_cid_msg = NULL; switch_copy_string(workspace, outbound_profile->destination_number, sizeof(workspace)); profile_name = workspace; @@ -1631,10 +1631,22 @@ tech_pvt->us = switch_core_session_strdup(*new_session, user); tech_pvt->them = switch_core_session_strdup(*new_session, full_id); ldl_session_create(&dlsession, mdl_profile->handle, sess_id, full_id, user, LDL_FLAG_OUTBOUND); - if ((cid_msg = switch_mprintf("Incoming Call From %s %s\n", outbound_profile->caller_id_name, outbound_profile->caller_id_number))) { + + if (session) { + switch_channel_t *calling_channel = switch_core_session_get_channel(session); + cid_msg = switch_channel_get_variable(calling_channel, "dl_cid_msg"); + } + + if (!cid_msg) { + f_cid_msg = switch_mprintf("Incoming Call From %s %s\n", outbound_profile->caller_id_name, outbound_profile->caller_id_number); + cid_msg = f_cid_msg; + } + + if (cid_msg) { ldl_handle_send_msg(mdl_profile->handle, tech_pvt->them, tech_pvt->us, "", cid_msg); - free(cid_msg); } + switch_safe_free(f_cid_msg); + tech_pvt->profile = mdl_profile; ldl_session_set_private(dlsession, *new_session); ldl_session_set_value(dlsession, "dnis", dnis);

1 0