- Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r2364 - in freeswitch/trunk/src: . mod/codecs/mod_g711 mod/endpoints/mod_exosip
by Freeswitch SVN 22 Aug '06

22 Aug '06

Author: anthm Date: Tue Aug 22 17:08:34 2006 New Revision: 2364 Modified: freeswitch/trunk/src/mod/codecs/mod_g711/mod_g711.c freeswitch/trunk/src/mod/endpoints/mod_exosip/mod_exosip.c freeswitch/trunk/src/switch_core.c Log: fix 183 on exosip Modified: freeswitch/trunk/src/mod/codecs/mod_g711/mod_g711.c ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_g711/mod_g711.c (original) +++ freeswitch/trunk/src/mod/codecs/mod_g711/mod_g711.c Tue Aug 22 17:08:34 2006 @@ -207,8 +207,8 @@ /*.decode */ switch_g711u_decode, /*.destroy */ switch_g711u_destroy }; -#endif + static const switch_codec_implementation_t g711u_8k_30ms_implementation = { /*.codec_type */ SWITCH_CODEC_TYPE_AUDIO, /*.ianacode */ 0, @@ -248,6 +248,7 @@ /*.destroy */ switch_g711u_destroy, /*.next */ &g711u_8k_30ms_implementation }; +#endif static const switch_codec_implementation_t g711u_8k_implementation = { /*.codec_type */ SWITCH_CODEC_TYPE_AUDIO, @@ -266,7 +267,7 @@ /*.encode */ switch_g711u_encode, /*.decode */ switch_g711u_decode, /*.destroy */ switch_g711u_destroy, - /*.next */ &g711u_16k_implementation + ///*.next */ &g711u_16k_implementation }; Modified: freeswitch/trunk/src/mod/endpoints/mod_exosip/mod_exosip.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_exosip/mod_exosip.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_exosip/mod_exosip.c Tue Aug 22 17:08:34 2006 @@ -77,7 +77,8 @@ TFLAG_VAD_OUT = ( 1 << 13), TFLAG_VAD = ( 1 << 14), TFLAG_TIMER = ( 1 << 15), - TFLAG_AA = (1 << 16) + TFLAG_AA = (1 << 16), + TFLAG_PRE_ANSWER = (1 << 17) } TFLAGS; @@ -349,13 +350,7 @@ tech_set_codecs(tech_pvt); - sprintf(dbuf, "%u", tech_pvt->te); - sdp_message_m_payload_add(tech_pvt->local_sdp, 0, osip_strdup(dbuf)); - sdp_add_codec(tech_pvt->sdp_config, SWITCH_CODEC_TYPE_AUDIO, tech_pvt->te, "telephone-event", 8000, 0); - sprintf(dbuf, "%u telephone-event/8000", tech_pvt->te); - sdp_message_a_attribute_add(tech_pvt->local_sdp, 0, "rtpmap", osip_strdup(dbuf)); - sprintf(dbuf, "%u 0-15", tech_pvt->te); - sdp_message_a_attribute_add(tech_pvt->local_sdp, 0, "fmtp", osip_strdup(dbuf)); + if (tech_pvt->num_codecs > 0) { int i, lastcode = -1; @@ -365,7 +360,7 @@ for (i = 0; i < tech_pvt->num_codecs; i++) { imp = tech_pvt->codecs[i]; - while(NULL != imp) { + if (imp) { uint32_t sps = imp->samples_per_second; if (lastcode != imp->ianacode) { @@ -381,14 +376,18 @@ snprintf(tmp, sizeof(tmp), "%u %s/%d", imp->ianacode, imp->iananame, sps); sdp_message_a_attribute_add(tech_pvt->local_sdp, 0, "rtpmap", osip_strdup(tmp)); memset(tmp, 0, sizeof(tmp)); - if (imp) { - imp = imp->next; - } } } } + sprintf(dbuf, "%u", tech_pvt->te); + sdp_message_m_payload_add(tech_pvt->local_sdp, 0, osip_strdup(dbuf)); + sdp_add_codec(tech_pvt->sdp_config, SWITCH_CODEC_TYPE_AUDIO, tech_pvt->te, "telephone-event", 8000, 0); + sprintf(dbuf, "%u telephone-event/8000", tech_pvt->te); + sdp_message_a_attribute_add(tech_pvt->local_sdp, 0, "rtpmap", osip_strdup(dbuf)); + sprintf(dbuf, "%u 0-15", tech_pvt->te); + sdp_message_a_attribute_add(tech_pvt->local_sdp, 0, "fmtp", osip_strdup(dbuf)); /* Setup our INVITE */ eXosip_lock(); @@ -1328,7 +1327,7 @@ static const switch_codec_implementation_t *imp = NULL; for (i = 0; i < tech_pvt->num_codecs; i++) { - for (imp = tech_pvt->codecs[i]; imp; imp = imp->next) { + if ((imp = tech_pvt->codecs[i])) { sdp_add_codec(tech_pvt->sdp_config, tech_pvt->codecs[i]->codec_type, imp->ianacode, @@ -1705,7 +1704,7 @@ } -static void handle_answer(eXosip_event_t * event) +static void handle_answer(eXosip_event_t *event) { osip_message_t *ack = NULL; sdp_message_t *remote_sdp = NULL; @@ -1715,12 +1714,24 @@ char *dpayload = NULL, *dname = NULL, *drate = NULL; switch_channel_t *channel; const switch_codec_implementation_t *imp = NULL; + uint8_t pre_answer = 0; + + if ((tech_pvt = get_pvt_by_call_id(event->cid)) == 0) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "cannot answer nonexistant call [%d]!\n", event->cid); return; } + if (event->type == EXOSIP_CALL_RINGING) { + pre_answer = 1; + if (switch_test_flag(tech_pvt, TFLAG_PRE_ANSWER)) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "one pre-answer is enough for call [%d]!\n", event->cid); + return; + } + switch_set_flag_locked(tech_pvt, TFLAG_PRE_ANSWER); + } + channel = switch_core_session_get_channel(tech_pvt->session); assert(channel != NULL); @@ -1755,6 +1766,13 @@ /* Assign them thar IDs */ tech_pvt->did = event->did; tech_pvt->tid = event->tid; + + if (switch_test_flag(tech_pvt, TFLAG_USING_CODEC)) { + switch_core_codec_destroy(&tech_pvt->read_codec); + switch_core_codec_destroy(&tech_pvt->write_codec); + switch_clear_flag_locked(tech_pvt, TFLAG_USING_CODEC); + } + { int rate = atoi(drate); int ms = globals.codec_ms; @@ -1823,11 +1841,17 @@ if (switch_test_flag(tech_pvt, TFLAG_RTP)) { channel = switch_core_session_get_channel(tech_pvt->session); assert(channel != NULL); - switch_channel_answer(channel); + if (pre_answer) { + switch_channel_pre_answer(channel); + } else { + switch_channel_answer(channel); + } } } + + static const char *event_names[] = { "EXOSIP_REGISTRATION_NEW", "EXOSIP_REGISTRATION_SUCCESS", @@ -2205,7 +2229,7 @@ /* This is like a 100 Trying... yeah */ break; case EXOSIP_CALL_RINGING: - //handle_ringing(event); + handle_answer(event); break; case EXOSIP_CALL_REDIRECTED: break; Modified: freeswitch/trunk/src/switch_core.c ============================================================================== --- freeswitch/trunk/src/switch_core.c (original) +++ freeswitch/trunk/src/switch_core.c Tue Aug 22 17:08:34 2006 @@ -3203,7 +3203,7 @@ mlockall(MCL_CURRENT|MCL_FUTURE); #endif - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "freeswitch Version %s Started. Crash Protection [%s] Max Sessions[%u]\n\n", SWITCH_VERSION_FULL, __CP, switch_core_session_limit(0)); + 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, switch_core_session_limit(0)); return SWITCH_STATUS_SUCCESS; }

1 0

[commit] r2363 - in freeswitch/trunk/libs/win32: . libresample pcre sqlite
by Freeswitch SVN 22 Aug '06

22 Aug '06

Author: mikej Date: Tue Aug 22 16:31:53 2006 New Revision: 2363 Added: freeswitch/trunk/libs/win32/libresample/cleancount freeswitch/trunk/libs/win32/pcre/cleancount freeswitch/trunk/libs/win32/sqlite/cleancount Modified: freeswitch/trunk/libs/win32/Download LIBRESAMPLE.vcproj freeswitch/trunk/libs/win32/Download PCRE.vcproj freeswitch/trunk/libs/win32/Download SQLITE.vcproj Log: Let msvc decide if it needs to re-run the download projects based upon the presence of the downloaded directory. This now works properly for these targets when it will scroll pass the target as "up-to-date" instead of running it and doing nothing. This should speed up the build process a bit. Modified: freeswitch/trunk/libs/win32/Download LIBRESAMPLE.vcproj ============================================================================== --- freeswitch/trunk/libs/win32/Download LIBRESAMPLE.vcproj (original) +++ freeswitch/trunk/libs/win32/Download LIBRESAMPLE.vcproj Tue Aug 22 16:31:53 2006 @@ -26,8 +26,6 @@ > <Tool Name="VCPreBuildEventTool" - Description="Downloading LIBRESAMPLE." - CommandLine="if not exist $(ProjectDir)..\libresample-0.1.3 cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://svn.freeswitch.org/downloads/libs/libresample-0.1.3.zip $(ProjectDir).." /> <Tool Name="VCCustomBuildTool" @@ -50,8 +48,6 @@ > <Tool Name="VCPreBuildEventTool" - Description="Downloading LIBRESAMPLE." - CommandLine="if not exist $(ProjectDir)..\libresample-0.1.3 cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://svn.freeswitch.org/downloads/libs/libresample-0.1.3.zip $(ProjectDir).." /> <Tool Name="VCCustomBuildTool" @@ -67,6 +63,30 @@ <References> </References> <Files> + <File + RelativePath=".\libresample\cleancount" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCustomBuildTool" + Description="Downloading LIBRESAMPLE." + CommandLine="if not exist $(ProjectDir)..\libresample-0.1.3 cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://svn.freeswitch.org/downloads/libs/libresample-0.1.3.zip $(ProjectDir)..
" + Outputs="$(ProjectDir)..\libresample-0.1.3" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCustomBuildTool" + Description="Downloading LIBRESAMPLE." + CommandLine="if not exist $(ProjectDir)..\libresample-0.1.3 cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://svn.freeswitch.org/downloads/libs/libresample-0.1.3.zip $(ProjectDir)..
" + Outputs="$(ProjectDir)..\libresample-0.1.3" + /> + </FileConfiguration> + </File> </Files> <Globals> </Globals> Modified: freeswitch/trunk/libs/win32/Download PCRE.vcproj ============================================================================== --- freeswitch/trunk/libs/win32/Download PCRE.vcproj (original) +++ freeswitch/trunk/libs/win32/Download PCRE.vcproj Tue Aug 22 16:31:53 2006 @@ -26,8 +26,6 @@ > <Tool Name="VCPreBuildEventTool" - Description="Downloading PCRE." - CommandLine="if not exist $(ProjectDir)..\pcre-6.4 cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://svn.freeswitch.org/downloads/libs/pcre-6.4.tar.gz $(ProjectDir).." /> <Tool Name="VCCustomBuildTool" @@ -50,8 +48,6 @@ > <Tool Name="VCPreBuildEventTool" - Description="Downloading PCRE." - CommandLine="if not exist $(ProjectDir)..\pcre-6.4 cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://svn.freeswitch.org/downloads/libs/pcre-6.4.tar.gz $(ProjectDir).." /> <Tool Name="VCCustomBuildTool" @@ -67,6 +63,30 @@ <References> </References> <Files> + <File + RelativePath=".\pcre\cleancount" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCustomBuildTool" + Description="Downloading PCRE." + CommandLine="if not exist $(ProjectDir)..\pcre-6.4 cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://svn.freeswitch.org/downloads/libs/pcre-6.4.tar.gz $(ProjectDir)..
" + Outputs="$(ProjectDir)..\pcre-6.4" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCustomBuildTool" + Description="Downloading PCRE." + CommandLine="if not exist $(ProjectDir)..\pcre-6.4 cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://svn.freeswitch.org/downloads/libs/pcre-6.4.tar.gz $(ProjectDir)..
" + Outputs="$(ProjectDir)..\pcre-6.4" + /> + </FileConfiguration> + </File> </Files> <Globals> </Globals> Modified: freeswitch/trunk/libs/win32/Download SQLITE.vcproj ============================================================================== --- freeswitch/trunk/libs/win32/Download SQLITE.vcproj (original) +++ freeswitch/trunk/libs/win32/Download SQLITE.vcproj Tue Aug 22 16:31:53 2006 @@ -26,8 +26,6 @@ > <Tool Name="VCPreBuildEventTool" - Description="Downloading SQLITE." - CommandLine="if not exist $(ProjectDir)..\sqlite-source-3_3_6 cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://svn.freeswitch.org/downloads/libs/sqlite-source-3_3_6.zip $(ProjectDir).." /> <Tool Name="VCCustomBuildTool" @@ -50,8 +48,6 @@ > <Tool Name="VCPreBuildEventTool" - Description="Downloading SQLITE." - CommandLine="if not exist $(ProjectDir)..\sqlite-source-3_3_6 cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://svn.freeswitch.org/downloads/libs/sqlite-source-3_3_6.zip $(ProjectDir).." /> <Tool Name="VCCustomBuildTool" @@ -67,6 +63,30 @@ <References> </References> <Files> + <File + RelativePath=".\sqlite\cleancount" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCustomBuildTool" + Description="Downloading SQLITE." + CommandLine="if not exist $(ProjectDir)..\sqlite-source-3_3_6 cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://svn.freeswitch.org/downloads/libs/sqlite-source-3_3_6.zip $(ProjectDir)..
" + Outputs="$(ProjectDir)..\sqlite-source-3_3_6" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCustomBuildTool" + Description="Downloading SQLITE." + CommandLine="if not exist $(ProjectDir)..\sqlite-source-3_3_6 cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://svn.freeswitch.org/downloads/libs/sqlite-source-3_3_6.zip $(ProjectDir)..
" + Outputs="$(ProjectDir)..\sqlite-source-3_3_6" + /> + </FileConfiguration> + </File> </Files> <Globals> </Globals> Added: freeswitch/trunk/libs/win32/libresample/cleancount ============================================================================== --- (empty file) +++ freeswitch/trunk/libs/win32/libresample/cleancount Tue Aug 22 16:31:53 2006 @@ -0,0 +1 @@ +1 \ No newline at end of file Added: freeswitch/trunk/libs/win32/pcre/cleancount ============================================================================== --- (empty file) +++ freeswitch/trunk/libs/win32/pcre/cleancount Tue Aug 22 16:31:53 2006 @@ -0,0 +1 @@ +1 \ No newline at end of file Added: freeswitch/trunk/libs/win32/sqlite/cleancount ============================================================================== --- (empty file) +++ freeswitch/trunk/libs/win32/sqlite/cleancount Tue Aug 22 16:31:53 2006 @@ -0,0 +1 @@ +1 \ No newline at end of file

1 0

[commit] r2361 - in freeswitch/trunk/src: . mod/applications/mod_bridgecall
by Freeswitch SVN 22 Aug '06

22 Aug '06

Author: anthm Date: Tue Aug 22 14:29:00 2006 New Revision: 2361 Modified: freeswitch/trunk/src/mod/applications/mod_bridgecall/mod_bridgecall.c freeswitch/trunk/src/switch_ivr.c Log: update core Modified: freeswitch/trunk/src/mod/applications/mod_bridgecall/mod_bridgecall.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_bridgecall/mod_bridgecall.c (original) +++ freeswitch/trunk/src/mod/applications/mod_bridgecall/mod_bridgecall.c Tue Aug 22 14:29:00 2006 @@ -55,7 +55,6 @@ switch_channel_hangup(caller_channel, SWITCH_CAUSE_REQUESTED_CHAN_UNAVAIL); return; } else { - /* peer channel is read locked now the bridge func will unlock it for us */ switch_ivr_multi_threaded_bridge(session, peer_session, NULL, NULL, NULL); } } Modified: freeswitch/trunk/src/switch_ivr.c ============================================================================== --- freeswitch/trunk/src/switch_ivr.c (original) +++ freeswitch/trunk/src/switch_ivr.c Tue Aug 22 14:29:00 2006 @@ -1560,7 +1560,6 @@ } if (switch_channel_test_flag(peer_channel, CF_ANSWERED) || switch_channel_test_flag(peer_channel, CF_EARLY_MEDIA)) { - switch_core_session_read_lock(peer_session); *bleg = peer_session; if (caller_channel) { switch_channel_set_variable(caller_channel, "originate_disposition", "call accepted");

1 0

[commit] r2360 - freeswitch/trunk/src/mod/languages/mod_spidermonkey
by Freeswitch SVN 22 Aug '06

22 Aug '06

Author: anthm Date: Tue Aug 22 13:19:31 2006 New Revision: 2360 Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c Log: fix fileio Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c (original) +++ freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c Tue Aug 22 13:19:31 2006 @@ -1541,9 +1541,10 @@ } switch_core_new_memory_pool(&pool); if (switch_file_open(&fd, path, flags, SWITCH_FPROT_UREAD|SWITCH_FPROT_UWRITE, pool) != SWITCH_STATUS_SUCCESS) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot Open File!\n"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot Open File: %s\n", path); switch_core_destroy_memory_pool(&pool); - return JS_FALSE; + *rval = BOOLEAN_TO_JSVAL( JS_FALSE ); + return JS_TRUE; } fio = switch_core_alloc(pool, sizeof(*fio)); fio->fd = fd; @@ -1554,7 +1555,7 @@ return JS_TRUE; } - return JS_FALSE; + return JS_TRUE; } static void fileio_destroy(JSContext *cx, JSObject *obj) { @@ -1579,6 +1580,10 @@ *rval = BOOLEAN_TO_JSVAL( JS_FALSE ); + if (fio) { + return JS_TRUE; + } + if (!(fio->flags & SWITCH_FOPEN_READ)) { return JS_TRUE; } @@ -1604,6 +1609,12 @@ static JSBool fileio_data(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) { struct fileio_obj *fio = JS_GetPrivate(cx, obj); + + if (!fio) { + *rval = BOOLEAN_TO_JSVAL( JS_FALSE ); + return JS_TRUE; + } + *rval = STRING_TO_JSVAL (JS_NewStringCopyZ(cx, fio->buf)); return JS_TRUE; } @@ -1614,6 +1625,11 @@ switch_size_t wrote = 0; char *data = NULL; + if (!fio) { + *rval = BOOLEAN_TO_JSVAL( JS_FALSE ); + return JS_TRUE; + } + if (!(fio->flags & SWITCH_FOPEN_WRITE)) { *rval = BOOLEAN_TO_JSVAL( JS_FALSE ); return JS_TRUE; @@ -1633,7 +1649,7 @@ } enum fileio_tinyid { - FILEIO_PATH + FILEIO_PATH, FILEIO_OPEN }; static JSFunctionSpec fileio_methods[] = { @@ -1646,6 +1662,7 @@ static JSPropertySpec fileio_props[] = { {"path", FILEIO_PATH, JSPROP_READONLY|JSPROP_PERMANENT}, + {"open", FILEIO_OPEN, JSPROP_READONLY|JSPROP_PERMANENT}, {0} }; @@ -1667,8 +1684,15 @@ switch(param) { case FILEIO_PATH: - *vp = STRING_TO_JSVAL(JS_NewStringCopyZ(cx, fio->path)); + if (fio) { + *vp = STRING_TO_JSVAL(JS_NewStringCopyZ(cx, fio->path)); + } else { + *vp = BOOLEAN_TO_JSVAL( JS_FALSE ); + } break; + case FILEIO_OPEN: + *vp = BOOLEAN_TO_JSVAL( fio ? JS_TRUE : JS_FALSE ); + break; } return res; @@ -2197,6 +2221,11 @@ /* Built-In*/ /*********************************************************************************/ +static JSBool js_exit(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) +{ + return JS_FALSE; +} + static JSBool js_log(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) { char *level_str, *msg; @@ -2433,6 +2462,7 @@ static JSFunctionSpec fs_functions[] = { {"console_log", js_log, 2}, + {"exit", js_exit, 0}, {"include", js_include, 1}, {"email", js_email, 2}, {"bridge", js_bridge, 2},

1 0

[commit] r2359 - in freeswitch/trunk/libs/win32: . apr apr-iconv apr-util
by Freeswitch SVN 22 Aug '06

22 Aug '06

Author: mikej Date: Tue Aug 22 12:30:35 2006 New Revision: 2359 Added: freeswitch/trunk/libs/win32/apr-iconv/cleancount freeswitch/trunk/libs/win32/apr-util/cleancount freeswitch/trunk/libs/win32/apr/cleancount Modified: freeswitch/trunk/libs/win32/Download APR-Iconv.vcproj freeswitch/trunk/libs/win32/Download APR-Util.vcproj freeswitch/trunk/libs/win32/Download APR.vcproj Log: Let msvc decide if it needs to re-run the download projects based upon the presence of the downloaded directory. This now works properly for these targets when it will scroll pass the target as "up-to-date" instead of running it and doing nothing. This should speed up the build process a bit. Modified: freeswitch/trunk/libs/win32/Download APR-Iconv.vcproj ============================================================================== --- freeswitch/trunk/libs/win32/Download APR-Iconv.vcproj (original) +++ freeswitch/trunk/libs/win32/Download APR-Iconv.vcproj Tue Aug 22 12:30:35 2006 @@ -25,11 +25,6 @@ BuildLogFile="$(IntDir)\BuildLog $(ProjectName).htm" > <Tool - Name="VCPreBuildEventTool" - Description="Downloading APR-Iconv." - CommandLine="if not exist $(ProjectDir)..\apr-iconv-1.1.1 cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://svn.freeswitch.org/downloads/libs/apr-iconv-1.1.1.tar.gz $(ProjectDir).." - /> - <Tool Name="VCCustomBuildTool" /> <Tool @@ -49,11 +44,6 @@ BuildLogFile="$(IntDir)\BuildLog $(ProjectName).htm" > <Tool - Name="VCPreBuildEventTool" - Description="Downloading APR-Iconv." - CommandLine="if not exist $(ProjectDir)..\apr-iconv-1.1.1 cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://svn.freeswitch.org/downloads/libs/apr-iconv-1.1.1.tar.gz $(ProjectDir).." - /> - <Tool Name="VCCustomBuildTool" /> <Tool @@ -67,6 +57,30 @@ <References> </References> <Files> + <File + RelativePath=".\apr-iconv\cleancount" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCustomBuildTool" + Description="Downloading APR-Iconv." + CommandLine="if not exist $(ProjectDir)..\apr-iconv-1.1.1 cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://svn.freeswitch.org/downloads/libs/apr-iconv-1.1.1.tar.gz $(ProjectDir).." + Outputs="$(ProjectDir)..\apr-iconv-1.1.1" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCustomBuildTool" + Description="Downloading APR-Iconv." + CommandLine="if not exist $(ProjectDir)..\apr-iconv-1.1.1 cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://svn.freeswitch.org/downloads/libs/apr-iconv-1.1.1.tar.gz $(ProjectDir).." + Outputs="$(ProjectDir)..\apr-iconv-1.1.1" + /> + </FileConfiguration> + </File> </Files> <Globals> </Globals> Modified: freeswitch/trunk/libs/win32/Download APR-Util.vcproj ============================================================================== --- freeswitch/trunk/libs/win32/Download APR-Util.vcproj (original) +++ freeswitch/trunk/libs/win32/Download APR-Util.vcproj Tue Aug 22 12:30:35 2006 @@ -26,8 +26,6 @@ > <Tool Name="VCPreBuildEventTool" - Description="Downloading APR-Util." - CommandLine="if not exist $(ProjectDir)..\apr-util-1.2.7 cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://svn.freeswitch.org/downloads/libs/apr-util-1.2.7.tar.gz $(ProjectDir).." /> <Tool Name="VCCustomBuildTool" @@ -50,8 +48,6 @@ > <Tool Name="VCPreBuildEventTool" - Description="Downloading APR-Util." - CommandLine="if not exist $(ProjectDir)..\apr-util-1.2.7 cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://svn.freeswitch.org/downloads/libs/apr-util-1.2.7.tar.gz $(ProjectDir).." /> <Tool Name="VCCustomBuildTool" @@ -67,6 +63,30 @@ <References> </References> <Files> + <File + RelativePath=".\apr-util\cleancount" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCustomBuildTool" + Description="Downloading APR-Util." + CommandLine="if not exist $(ProjectDir)..\apr-util-1.2.7 cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://svn.freeswitch.org/downloads/libs/apr-util-1.2.7.tar.gz $(ProjectDir)..
" + Outputs="$(ProjectDir)..\apr-util-1.2.7" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCustomBuildTool" + Description="Downloading APR-Util." + CommandLine="if not exist $(ProjectDir)..\apr-util-1.2.7 cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://svn.freeswitch.org/downloads/libs/apr-util-1.2.7.tar.gz $(ProjectDir)..
" + Outputs="$(ProjectDir)..\apr-util-1.2.7" + /> + </FileConfiguration> + </File> </Files> <Globals> </Globals> Modified: freeswitch/trunk/libs/win32/Download APR.vcproj ============================================================================== --- freeswitch/trunk/libs/win32/Download APR.vcproj (original) +++ freeswitch/trunk/libs/win32/Download APR.vcproj Tue Aug 22 12:30:35 2006 @@ -26,11 +26,13 @@ > <Tool Name="VCPreBuildEventTool" - Description="Downloading APR." - CommandLine="if not exist $(ProjectDir)..\apr-1.2.7 cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://svn.freeswitch.org/downloads/libs/apr-1.2.7.tar.gz $(ProjectDir).." + Description="" + CommandLine="" /> <Tool Name="VCCustomBuildTool" + CommandLine="" + Outputs="" /> <Tool Name="VCMIDLTool" @@ -50,8 +52,8 @@ > <Tool Name="VCPreBuildEventTool" - Description="Downloading APR." - CommandLine="if not exist $(ProjectDir)..\apr-1.2.7 cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://svn.freeswitch.org/downloads/libs/apr-1.2.7.tar.gz $(ProjectDir).." + Description="" + CommandLine="" /> <Tool Name="VCCustomBuildTool" @@ -67,6 +69,30 @@ <References> </References> <Files> + <File + RelativePath=".\apr\cleancount" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCustomBuildTool" + Description="Downloading APR." + CommandLine="if not exist $(ProjectDir)..\apr-1.2.7 cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://svn.freeswitch.org/downloads/libs/apr-1.2.7.tar.gz $(ProjectDir).." + Outputs="$(ProjectDir)..\apr-1.2.7" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCustomBuildTool" + Description="Downloading APR." + CommandLine="if not exist $(ProjectDir)..\apr-1.2.7 cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://svn.freeswitch.org/downloads/libs/apr-1.2.7.tar.gz $(ProjectDir).." + Outputs="$(ProjectDir)..\apr-1.2.7" + /> + </FileConfiguration> + </File> </Files> <Globals> </Globals> Added: freeswitch/trunk/libs/win32/apr-iconv/cleancount ============================================================================== --- (empty file) +++ freeswitch/trunk/libs/win32/apr-iconv/cleancount Tue Aug 22 12:30:35 2006 @@ -0,0 +1 @@ +1 \ No newline at end of file Added: freeswitch/trunk/libs/win32/apr-util/cleancount ============================================================================== --- (empty file) +++ freeswitch/trunk/libs/win32/apr-util/cleancount Tue Aug 22 12:30:35 2006 @@ -0,0 +1 @@ +1 \ No newline at end of file Added: freeswitch/trunk/libs/win32/apr/cleancount ============================================================================== --- (empty file) +++ freeswitch/trunk/libs/win32/apr/cleancount Tue Aug 22 12:30:35 2006 @@ -0,0 +1 @@ +1 \ No newline at end of file

1 0

[commit] r2358 - freeswitch/trunk/src
by Freeswitch SVN 22 Aug '06

22 Aug '06

Author: anthm Date: Tue Aug 22 10:48:35 2006 New Revision: 2358 Modified: freeswitch/trunk/src/switch_stun.c Log: Fix issue pointed out by Fanzhou Zhao <fanzhou(a)gmail.com> Modified: freeswitch/trunk/src/switch_stun.c ============================================================================== --- freeswitch/trunk/src/switch_stun.c (original) +++ freeswitch/trunk/src/switch_stun.c Tue Aug 22 10:48:35 2006 @@ -24,6 +24,7 @@ * Contributor(s): * * Anthony Minessale II <anthmct(a)yahoo.com> + * Fanzhou Zhao <fanzhou(a)gmail.com> 2006-08-22 (Bugfix 2357-2358) * * * switch_stun.c STUN (Simple Traversal of UDP over NAT) @@ -91,18 +92,18 @@ { char chars[] = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"; int max; - uint8_t x; + uint16_t x; if (!set) { set = chars; } - max = (int)strlen(set) - 1; + max = (int)strlen(set); srand((unsigned int)apr_time_now()); for(x = 0; x < len; x++) { - int j = 1+(int)(max*1.0*rand()/(RAND_MAX+1.0)); + int j = (int)(max*1.0*rand()/(RAND_MAX+1.0)); buf[x] = set[j]; } }

1 0

[commit] r2354 - in freeswitch/trunk: . build libs src src/mod/languages/mod_spidermonkey src/mod/loggers/mod_syslog
by Freeswitch SVN 22 Aug '06

22 Aug '06

Author: anthm Date: Mon Aug 21 20:56:27 2006 New Revision: 2354 Modified: freeswitch/trunk/Makefile.in freeswitch/trunk/build/buildlib.sh freeswitch/trunk/build/modmake.sh freeswitch/trunk/libs/mozilla.build.sh freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c freeswitch/trunk/src/mod/loggers/mod_syslog/mod_syslog.c freeswitch/trunk/src/switch_console.c Log: optimizations Modified: freeswitch/trunk/Makefile.in ============================================================================== --- freeswitch/trunk/Makefile.in (original) +++ freeswitch/trunk/Makefile.in Mon Aug 21 20:56:27 2006 @@ -1108,6 +1108,7 @@ @if [ ! -f $(PWD)/modules.conf ] ; then cp $(PWD)/modules.conf.in $(PWD)/modules.conf ; fi @echo making modules @rm -f build/freeswitch.env + @if [ -f $(PWD)/modbuild.env ] ; then cp $(PWD)/modbuild.env build/freeswitch.env ; fi @./build/addenv.sh build/freeswitch.env MAKE "$(MAKE)" @./build/addenv.sh build/freeswitch.env DYLD_LIBRARY_PATH "$(PREFIX)/lib:$DYLD_LIBRARY_PATH" @./build/addenv.sh build/freeswitch.env LD_LIBRARY_PATH "$(PREFIX)/lib:$LD_LIBRARY_PATH" Modified: freeswitch/trunk/build/buildlib.sh ============================================================================== --- freeswitch/trunk/build/buildlib.sh (original) +++ freeswitch/trunk/build/buildlib.sh Mon Aug 21 20:56:27 2006 @@ -67,7 +67,7 @@ MAKE=$MAKE ../$uncompressed.build.sh $@ else $MAKE clean 2>&1 - sh ./configure $@ + sh CFLAGS=$MOD_CFLAGS ./configure $@ if [ $? = 0 ] ; then $MAKE Modified: freeswitch/trunk/build/modmake.sh ============================================================================== --- freeswitch/trunk/build/modmake.sh (original) +++ freeswitch/trunk/build/modmake.sh Mon Aug 21 20:56:27 2006 @@ -20,8 +20,8 @@ fi if [ -f $mod/Makefile ] ; then - MODNAME=$end $make -C $mod $@ + CFLAGS="$MOD_CFLAGS $CFLAGS " MODNAME=$end $make -C $mod $@ else - MODNAME=$end $make -f $pwd/generic_mod.mk -C $mod $@ + CFLAGS="$MOD_CFLAGS $CFLAGS" MODNAME=$end $make -f $pwd/generic_mod.mk -C $mod $@ fi Modified: freeswitch/trunk/libs/mozilla.build.sh ============================================================================== --- freeswitch/trunk/libs/mozilla.build.sh (original) +++ freeswitch/trunk/libs/mozilla.build.sh Mon Aug 21 20:56:27 2006 @@ -5,7 +5,7 @@ opts="--enable-64bit" fi -cd nsprpub && ./configure $opts && make +cd nsprpub && ./configure $opts && $MAKE -cd ../js/src && JS_THREADSAFE=1 OTHER_LIBS="-L../../../mozilla/nsprpub/dist/lib" INCLUDES="-I../../../mozilla/nsprpub/dist/include/nspr" make -f Makefile.ref `find . -name libjs.a` +cd ../js/src && JS_THREADSAFE=1 JS_HAS_FILE_OBJECT=1 OTHER_LIBS="-L../../../mozilla/nsprpub/dist/lib" INCLUDES="-I../../../mozilla/nsprpub/dist/include/nspr" $MAKE -f Makefile.ref `find . -name libjs.a` Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c (original) +++ freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c Mon Aug 21 20:56:27 2006 @@ -456,7 +456,7 @@ for(d = dtmf; *d; d++) { cb_state->ret_buffer[cb_state->ret_buffer_len++] = *d; if ((cb_state->ret_buffer_len > cb_state->digit_count)|| - (cb_state->ret_buffer_len > sizeof(cb_state->ret_buffer))|| + (cb_state->ret_buffer_len > (int32_t) sizeof(cb_state->ret_buffer))|| (cb_state->ret_buffer_len >= cb_state->digit_count) ) { return SWITCH_STATUS_FALSE; @@ -573,7 +573,7 @@ for(d = dtmf; *d; d++) { cb_state->ret_buffer[cb_state->ret_buffer_len++] = *d; if ((cb_state->ret_buffer_len > cb_state->digit_count)|| - (cb_state->ret_buffer_len > sizeof(cb_state->ret_buffer))|| + (cb_state->ret_buffer_len > (int32_t) sizeof(cb_state->ret_buffer))|| (cb_state->ret_buffer_len >= cb_state->digit_count) ) { return SWITCH_STATUS_FALSE; @@ -642,7 +642,7 @@ for(d = dtmf; *d; d++) { cb_state->ret_buffer[cb_state->ret_buffer_len++] = *d; if ((cb_state->ret_buffer_len > cb_state->digit_count)|| - (cb_state->ret_buffer_len > sizeof(cb_state->ret_buffer))|| + (cb_state->ret_buffer_len > (int32_t) sizeof(cb_state->ret_buffer))|| (cb_state->ret_buffer_len >= cb_state->digit_count) ) { return SWITCH_STATUS_FALSE; Modified: freeswitch/trunk/src/mod/loggers/mod_syslog/mod_syslog.c ============================================================================== --- freeswitch/trunk/src/mod/loggers/mod_syslog/mod_syslog.c (original) +++ freeswitch/trunk/src/mod/loggers/mod_syslog/mod_syslog.c Mon Aug 21 20:56:27 2006 @@ -105,8 +105,8 @@ SWITCH_MOD_DECLARE(switch_status_t) switch_module_load(const switch_loadable_module_interface_t **interface, char *filename) { - *interface = &console_module_interface; switch_status_t status; + *interface = &console_module_interface; if ((status=load_config()) != SWITCH_STATUS_SUCCESS) { return status; Modified: freeswitch/trunk/src/switch_console.c ============================================================================== --- freeswitch/trunk/src/switch_console.c (original) +++ freeswitch/trunk/src/switch_console.c Mon Aug 21 20:56:27 2006 @@ -176,9 +176,9 @@ { char hostname[256]; char cmd[2048]; - int running = 1, x = 0, activity = 1; + int running = 1, activity = 1; char *retbuf = (char *)malloc(CMD_BUFLEN); - + switch_size_t x = 0; assert(retbuf != NULL); gethostname(hostname, sizeof(hostname));

1 0

[commit] r2353 - freeswitch/trunk/src/mod/languages/mod_spidermonkey
by Freeswitch SVN 22 Aug '06

22 Aug '06

Author: anthm Date: Mon Aug 21 20:03:47 2006 New Revision: 2353 Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c Log: fix js Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c (original) +++ freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c Mon Aug 21 20:03:47 2006 @@ -1624,7 +1624,7 @@ } if (data) { - wrote = 0; + wrote = strlen(data); *rval = BOOLEAN_TO_JSVAL( (switch_file_write(fio->fd, data, &wrote) == SWITCH_STATUS_SUCCESS) ? JS_TRUE : JS_FALSE); }

1 0

[commit] r2352 - in freeswitch/trunk: libs/libdingaling/src src/mod/endpoints/mod_dingaling src/mod/languages/mod_spidermonkey
by Freeswitch SVN 21 Aug '06

21 Aug '06

Author: mikej Date: Mon Aug 21 18:48:01 2006 New Revision: 2352 Modified: freeswitch/trunk/libs/libdingaling/src/libdingaling.c freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c Log: Windows build tweaks. Modified: freeswitch/trunk/libs/libdingaling/src/libdingaling.c ============================================================================== --- freeswitch/trunk/libs/libdingaling/src/libdingaling.c (original) +++ freeswitch/trunk/libs/libdingaling/src/libdingaling.c Mon Aug 21 18:48:01 2006 @@ -451,8 +451,9 @@ size_t x; if (!apr_hash_get(handle->sub_hash, from, APR_HASH_KEY_STRING)) { + iks *msg; apr_hash_set(handle->sub_hash, apr_pstrdup(handle->pool, from), APR_HASH_KEY_STRING, &marker); - iks *msg = iks_make_s10n (IKS_TYPE_SUBSCRIBED, from, "Ding A Ling...."); + msg = iks_make_s10n (IKS_TYPE_SUBSCRIBED, from, "Ding A Ling...."); apr_queue_push(handle->queue, msg); } 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 Mon Aug 21 18:48:01 2006 @@ -459,8 +459,7 @@ static int do_describe(struct private_object *tech_pvt, int force) { ldl_payload_t payloads[5]; - switch_channel_t *channel = switch_core_session_get_channel(tech_pvt->session); - assert(channel != NULL); + assert(switch_core_session_get_channel(tech_pvt->session) != NULL); if (switch_test_flag(tech_pvt, TFLAG_DO_DESC)) { return 1; Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c (original) +++ freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c Mon Aug 21 18:48:01 2006 @@ -1561,10 +1561,11 @@ struct fileio_obj *fio = JS_GetPrivate(cx, obj); if (fio) { - if (fio->fd) { + switch_memory_pool_t *pool; + if (fio->fd) { switch_file_close(fio->fd); } - switch_memory_pool_t *pool = fio->pool; + pool = fio->pool; switch_core_destroy_memory_pool(&pool); pool = NULL; }

1 0

[commit] r2351 - in freeswitch/trunk/src: . mod/endpoints/mod_exosip mod/languages/mod_spidermonkey
by Freeswitch SVN 21 Aug '06

21 Aug '06

Author: anthm Date: Mon Aug 21 16:16:28 2006 New Revision: 2351 Modified: freeswitch/trunk/src/mod/endpoints/mod_exosip/mod_exosip.c freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c freeswitch/trunk/src/switch_ivr.c Log: bunch of tweaks to make ivr more fun Modified: freeswitch/trunk/src/mod/endpoints/mod_exosip/mod_exosip.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_exosip/mod_exosip.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_exosip/mod_exosip.c Mon Aug 21 16:16:28 2006 @@ -1217,6 +1217,7 @@ snprintf(name, sizeof(name), "Exosip/%s-%04x", event->request->from->url->username, rand() & 0xffff); switch_channel_set_name(channel, name); + switch_channel_set_variable(channel, "endpoint_disposition", "INVITE"); if (osip_message_header_get_byname (event->request, "SrtpRealm", 0, &tedious)) { tech_pvt->realm = switch_core_session_strdup(session, osip_header_get_value(tedious)); @@ -1503,31 +1504,31 @@ switch (event->type) { case EXOSIP_CALL_RELEASED: - switch_channel_set_variable(channel, "exosip_disposition", "RELEASED"); + switch_channel_set_variable(channel, "endpoint_disposition", "RELEASED"); cause = SWITCH_CAUSE_NORMAL_CLEARING; break; case EXOSIP_CALL_CLOSED: - switch_channel_set_variable(channel, "exosip_disposition", "CLOSED"); + switch_channel_set_variable(channel, "endpoint_disposition", "CLOSED"); cause = SWITCH_CAUSE_NORMAL_CLEARING; break; case EXOSIP_CALL_NOANSWER: - switch_channel_set_variable(channel, "exosip_disposition", "NO ANSWER"); + switch_channel_set_variable(channel, "endpoint_disposition", "NO ANSWER"); cause = SWITCH_CAUSE_NO_ANSWER; break; case EXOSIP_CALL_REQUESTFAILURE: - switch_channel_set_variable(channel, "exosip_disposition", "REQUEST FAILURE"); + switch_channel_set_variable(channel, "endpoint_disposition", "REQUEST FAILURE"); cause = SWITCH_CAUSE_REQUESTED_CHAN_UNAVAIL; break; case EXOSIP_CALL_SERVERFAILURE: - switch_channel_set_variable(channel, "exosip_disposition", "SERVER FAILURE"); + switch_channel_set_variable(channel, "endpoint_disposition", "SERVER FAILURE"); cause = SWITCH_CAUSE_CALL_REJECTED; break; case EXOSIP_CALL_GLOBALFAILURE: - switch_channel_set_variable(channel, "exosip_disposition", "GLOBAL FAILURE"); + switch_channel_set_variable(channel, "endpoint_disposition", "GLOBAL FAILURE"); cause = SWITCH_CAUSE_CALL_REJECTED; break; default: - switch_channel_set_variable(channel, "exosip_disposition", "UNKNOWN"); + switch_channel_set_variable(channel, "endpoint_disposition", "UNKNOWN"); cause = SWITCH_CAUSE_SWITCH_CONGESTION; break; } @@ -1735,6 +1736,8 @@ switch_channel_hangup(channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER); return; } + + switch_channel_set_variable(channel, "endpoint_disposition", "ANSWER"); conn = eXosip_get_audio_connection(remote_sdp); Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c (original) +++ freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c Mon Aug 21 16:16:28 2006 @@ -803,6 +803,55 @@ return (switch_channel_ready(channel)) ? JS_TRUE : JS_FALSE; } +static JSBool session_set_variable(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) +{ + struct js_session *jss = JS_GetPrivate(cx, obj); + switch_channel_t *channel; + + channel = switch_core_session_get_channel(jss->session); + assert(channel != NULL); + + if (argc > 1) { + char *var, *val; + + var = JS_GetStringBytes(JS_ValueToString(cx, argv[0])); + val = JS_GetStringBytes(JS_ValueToString(cx, argv[1])); + switch_channel_set_variable(channel, var, val); + *rval = BOOLEAN_TO_JSVAL( JS_TRUE ); + } else { + *rval = BOOLEAN_TO_JSVAL( JS_FALSE ); + } + + return JS_TRUE; +} + +static JSBool session_get_variable(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) +{ + struct js_session *jss = JS_GetPrivate(cx, obj); + switch_channel_t *channel; + + channel = switch_core_session_get_channel(jss->session); + assert(channel != NULL); + + if (argc > 0) { + char *var, *val; + + var = JS_GetStringBytes(JS_ValueToString(cx, argv[0])); + val = switch_channel_get_variable(channel, var); + + if (val) { + *rval = STRING_TO_JSVAL (JS_NewStringCopyZ(cx, val)); + } else { + *rval = BOOLEAN_TO_JSVAL( JS_FALSE ); + } + } else { + *rval = BOOLEAN_TO_JSVAL( JS_FALSE ); + } + + return JS_TRUE; +} + + static JSBool session_speak(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) { struct js_session *jss = JS_GetPrivate(cx, obj); @@ -1193,6 +1242,8 @@ {"flushEvents", session_flush_events, 1}, {"flushDigits", session_flush_digits, 1}, {"speak", session_speak, 1}, + {"setVariable", session_set_variable, 1}, + {"getVariable", session_get_variable, 1}, {"getDigits", session_get_digits, 1}, {"answer", session_answer, 0}, {"ready", session_ready, 0}, @@ -1414,7 +1465,7 @@ context, dest); - if (switch_ivr_originate(NULL, &peer_session, dest, to ? atoi(to) : 60, NULL, NULL, NULL, caller_profile) != SWITCH_STATUS_SUCCESS) { + if (switch_ivr_originate(session, &peer_session, dest, to ? atoi(to) : 60, NULL, NULL, NULL, caller_profile) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Cannot Create Outgoing Channel! [%s]\n", dest); return JS_TRUE; } Modified: freeswitch/trunk/src/switch_ivr.c ============================================================================== --- freeswitch/trunk/src/switch_ivr.c (original) +++ freeswitch/trunk/src/switch_ivr.c Mon Aug 21 16:16:28 2006 @@ -1328,11 +1328,13 @@ status = SWITCH_STATUS_GENERR; goto done; } - + if (session) { caller_channel = switch_core_session_get_channel(session); assert(caller_channel != NULL); + switch_channel_set_variable(caller_channel, "originate_disposition", "failure"); + if ((var = switch_channel_get_variable(caller_channel, "group_confirm_key"))) { key = switch_core_session_strdup(session, var); if ((var = switch_channel_get_variable(caller_channel, "group_confirm_file"))) { @@ -1399,21 +1401,35 @@ goto done; } - caller_profiles[i] = switch_caller_profile_new(pool, - NULL, - NULL, - cid_name_override, - cid_num_override, - NULL, - NULL, - NULL, - NULL, - __FILE__, - NULL, - chan_data); + if (caller_profile_override) { + caller_profiles[i] = switch_caller_profile_new(pool, + caller_profile_override->username, + caller_profile_override->dialplan, + caller_profile_override->caller_id_name, + caller_profile_override->caller_id_number, + caller_profile_override->network_addr, + caller_profile_override->ani, + caller_profile_override->ani2, + caller_profile_override->rdnis, + caller_profile_override->source, + caller_profile_override->context, + chan_data); + } else { + caller_profiles[i] = switch_caller_profile_new(pool, + NULL, + NULL, + cid_name_override, + cid_num_override, + NULL, + NULL, + NULL, + NULL, + __FILE__, + NULL, + chan_data); + } } - if (switch_core_session_outgoing_channel(session, chan_type, caller_profiles[i], &peer_sessions[i], pool) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot Create Outgoing Channel!\n"); if (pool) { @@ -1526,10 +1542,7 @@ continue; } if (i != idx) { - if (caller_channel) { - switch_channel_set_variable(caller_channel, "originate_disposition", "lost race"); - switch_channel_hangup(peer_channels[i], SWITCH_CAUSE_LOSE_RACE); - } + switch_channel_hangup(peer_channels[i], SWITCH_CAUSE_LOSE_RACE); } }

1 0