- Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r3489 - freeswitch/branches/jkr888/trunk/src/mod/languages/mod_python
by Freeswitch SVN 29 Nov '06

29 Nov '06

Author: jkr888 Date: Wed Nov 29 17:51:21 2006 New Revision: 3489 Added: freeswitch/branches/jkr888/trunk/src/mod/languages/mod_python/freeswitch_python.cpp freeswitch/branches/jkr888/trunk/src/mod/languages/mod_python/freeswitch_python.h Log: Added: freeswitch/branches/jkr888/trunk/src/mod/languages/mod_python/freeswitch_python.cpp ============================================================================== --- (empty file) +++ freeswitch/branches/jkr888/trunk/src/mod/languages/mod_python/freeswitch_python.cpp Wed Nov 29 17:51:21 2006 @@ -0,0 +1,13 @@ +#include "freeswitch_python.h" + +SessionContainer::SessionContainer() +{ + +} + +SessionContainer::~SessionContainer() +{ + +} + + Added: freeswitch/branches/jkr888/trunk/src/mod/languages/mod_python/freeswitch_python.h ============================================================================== --- (empty file) +++ freeswitch/branches/jkr888/trunk/src/mod/languages/mod_python/freeswitch_python.h Wed Nov 29 17:51:21 2006 @@ -0,0 +1,20 @@ +#ifdef __cplusplus +exten "C" { +#endif + +#include <switch.h> + +class SessionContainer { + private: + switch_core_session_t *session; + switch_channel_t *channel; + char *uuid; + public: + SessionContainer(); + ~SessionContainer(); + protected: +}; + +#ifdef __cplusplus +} +#endif

1 0

[commit] r3488 - freeswitch/trunk/src
by Freeswitch SVN 29 Nov '06

29 Nov '06

Author: mikej Date: Wed Nov 29 15:08:12 2006 New Revision: 3488 Modified: freeswitch/trunk/src/switch_ivr.c Log: cast for datatype of score. Modified: freeswitch/trunk/src/switch_ivr.c ============================================================================== --- freeswitch/trunk/src/switch_ivr.c (original) +++ freeswitch/trunk/src/switch_ivr.c Wed Nov 29 15:08:12 2006 @@ -496,7 +496,7 @@ j += read_codec->implementation->number_of_channels; } - score = energy / samples; + score = (uint32_t)(energy / samples); if (score < fh->thresh) { if (!--fh->silence_hits) { break;

1 0

[commit] r3487 - in freeswitch/trunk: . src
by Freeswitch SVN 29 Nov '06

29 Nov '06

Author: mikej Date: Wed Nov 29 15:07:13 2006 New Revision: 3487 Modified: freeswitch/trunk/AUTHORS freeswitch/trunk/src/switch_ivr.c Log: playfile fixes for startpos from Matt Klein. Modified: freeswitch/trunk/AUTHORS ============================================================================== --- freeswitch/trunk/AUTHORS (original) +++ freeswitch/trunk/AUTHORS Wed Nov 29 15:07:13 2006 @@ -31,7 +31,7 @@ Neal Horman <neal at wanlink dot com> - conference improvements, switch_ivr menu additions and other tweaks. Johny Kadarisman <jkr888 at gmail.com> - mod_python fixups. Michael Murdock <mike at mmurdock dot org> - testing, documentation, bug finding and usability enhancements. - + Matt Klein <mklein(a)nmedia.net> A big THANK YOU goes to: Modified: freeswitch/trunk/src/switch_ivr.c ============================================================================== --- freeswitch/trunk/src/switch_ivr.c (original) +++ freeswitch/trunk/src/switch_ivr.c Wed Nov 29 15:07:13 2006 @@ -26,6 +26,7 @@ * Anthony Minessale II <anthmct(a)yahoo.com> * Paul D. Tinsley <pdt at jackhammer.org> * Neal Horman <neal at wanlink dot com> + * Matt Klein <mklein(a)nmedia.net> * * switch_ivr_api.c -- IVR Library * @@ -956,7 +957,7 @@ switch_channel_t *channel; int16_t abuf[FILE_STARTSAMPLES]; char dtmf[128]; - uint32_t interval = 0, samples = 0, framelen; + uint32_t interval = 0, samples = 0, framelen, sample_start = 0; uint32_t ilen = 0; switch_size_t olen = 0; switch_frame_t write_frame = {0}; @@ -974,6 +975,11 @@ uint8_t asis = 0; char *ext; + if (fh->samples > 0) { + sample_start = fh->samples; + fh->samples = 0; + } + if (file) { if ((ext = strrchr(file, '.'))) { ext++; @@ -1009,9 +1015,9 @@ write_frame.data = abuf; write_frame.buflen = sizeof(abuf); - if (fh->samples) { + if (sample_start > 0) { uint32_t pos = 0; - switch_core_file_seek(fh, &pos, fh->samples, SEEK_CUR); + switch_core_file_seek(fh, &pos, sample_start, SEEK_CUR); } if (switch_core_file_get_string(fh, SWITCH_AUDIO_COL_STR_TITLE, &p) == SWITCH_STATUS_SUCCESS) {

1 0

[commit] r3486 - freeswitch/branches/blackeye1010
by Freeswitch SVN 29 Nov '06

29 Nov '06

Author: sphere Date: Wed Nov 29 15:02:34 2006 New Revision: 3486 Added: freeswitch/branches/blackeye1010/ Log: Creating empty folder for blackeye1010

1 0

[commit] r3485 - in freeswitch/trunk/src: . include mod/languages/mod_spidermonkey
by Freeswitch SVN 29 Nov '06

29 Nov '06

Author: anthm Date: Wed Nov 29 12:10:40 2006 New Revision: 3485 Modified: freeswitch/trunk/src/include/switch_module_interfaces.h freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c freeswitch/trunk/src/switch_event.c freeswitch/trunk/src/switch_ivr.c Log: api tweaks Modified: freeswitch/trunk/src/include/switch_module_interfaces.h ============================================================================== --- freeswitch/trunk/src/include/switch_module_interfaces.h (original) +++ freeswitch/trunk/src/include/switch_module_interfaces.h Wed Nov 29 12:10:40 2006 @@ -313,6 +313,8 @@ void *private_info; int64_t pos; switch_buffer_t *audio_buffer; + uint32_t thresh; + uint32_t silence_hits; }; /*! \brief Abstract interface to an asr module */ 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 Wed Nov 29 12:10:40 2006 @@ -828,7 +828,7 @@ int len = 0; switch_input_callback_function_t dtmf_func = NULL; struct input_callback_state cb_state = {0}; - switch_file_handle_t fh; + switch_file_handle_t fh = {0}; JSFunction *function; int32 limit = 0; @@ -860,9 +860,21 @@ if (argc > 3) { JS_ValueToInt32(cx, argv[3], &limit); } + + if (argc > 4) { + int32_t thresh; + JS_ValueToInt32(cx, argv[4], &thresh); + fh.thresh = thresh; + } + + if (argc > 5) { + int32_t silence_hits; + JS_ValueToInt32(cx, argv[5], &silence_hits); + fh.silence_hits = silence_hits; + } } - memset(&fh, 0, sizeof(fh)); + cb_state.extra = &fh; cb_state.ret = BOOLEAN_TO_JSVAL( JS_FALSE ); switch_ivr_record_file(jss->session, &fh, file_name, dtmf_func, bp, len, limit); @@ -925,7 +937,7 @@ int len = 0; switch_input_callback_function_t dtmf_func = NULL; struct input_callback_state cb_state = {0}; - switch_file_handle_t fh; + switch_file_handle_t fh = {0}; JSFunction *function; channel = switch_core_session_get_channel(jss->session); @@ -963,12 +975,10 @@ if (argc > 4) { int32 samps; - uint32_t pos = 0; JS_ValueToInt32(cx, argv[4], &samps); - switch_core_file_seek(&fh, &pos, samps, SEEK_CUR); + fh.samples = samps; } - memset(&fh, 0, sizeof(fh)); cb_state.extra = &fh; cb_state.ret = BOOLEAN_TO_JSVAL( JS_FALSE ); switch_ivr_play_file(jss->session, &fh, file_name, timer_name, dtmf_func, bp, len); Modified: freeswitch/trunk/src/switch_event.c ============================================================================== --- freeswitch/trunk/src/switch_event.c (original) +++ freeswitch/trunk/src/switch_event.c Wed Nov 29 12:10:40 2006 @@ -606,7 +606,9 @@ *str = NULL; - if (!(buf = malloc(blocksize))) { + dlen = blocksize * 2; + + if (!(buf = malloc(dlen))) { return SWITCH_STATUS_MEMERR; } @@ -615,9 +617,7 @@ return SWITCH_STATUS_MEMERR; } - dlen = blocksize; - - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "hit serialze!.\n"); + //switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "hit serialze!.\n"); for (hp = event->headers; hp; hp = hp->next) { /* * grab enough memory to store 3x the string (url encode takes one char and turns it into %XX) @@ -628,7 +628,7 @@ */ if(encode_len < ((strlen(hp->value) * 3) + 1)) { char* tmp; - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Allocing %d was %d.\n", ((strlen(hp->value) * 3) + 1), encode_len); + //switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Allocing %d was %d.\n", ((strlen(hp->value) * 3) + 1), encode_len); /* we can use realloc for initial alloc as well, if encode_buf is zero it treats it as a malloc */ if(!(tmp = realloc(encode_buf, ((strlen(hp->value) * 3) + 1)))) { /* oh boy, ram's gone, give back what little we grabbed and bail */ Modified: freeswitch/trunk/src/switch_ivr.c ============================================================================== --- freeswitch/trunk/src/switch_ivr.c (original) +++ freeswitch/trunk/src/switch_ivr.c Wed Nov 29 12:10:40 2006 @@ -428,6 +428,12 @@ start = time(NULL); } + if (fh->thresh) { + if (!fh->silence_hits) { + fh->silence_hits = 20; + } + } + while(switch_channel_ready(channel)) { switch_size_t len; switch_event_t *event; @@ -477,6 +483,26 @@ if (!SWITCH_READ_ACCEPTABLE(status)) { break; } + + if (fh->thresh) { + int16_t *fdata = (int16_t *) read_frame->data; + uint32_t samples = read_frame->datalen / sizeof(*fdata); + uint32_t score, count = 0, j = 0; + double energy = 0; + + for (count = 0; count < samples; count++) { + energy += abs(fdata[j]); + j += read_codec->implementation->number_of_channels; + } + + score = energy / samples; + if (score < fh->thresh) { + if (!--fh->silence_hits) { + break; + } + } + } + if (!switch_test_flag(fh, SWITCH_FILE_PAUSE)) { len = (switch_size_t) read_frame->datalen / 2; switch_core_file_write(fh, read_frame->data, &len); @@ -983,6 +1009,10 @@ write_frame.data = abuf; write_frame.buflen = sizeof(abuf); + if (fh->samples) { + uint32_t pos = 0; + switch_core_file_seek(fh, &pos, fh->samples, SEEK_CUR); + } if (switch_core_file_get_string(fh, SWITCH_AUDIO_COL_STR_TITLE, &p) == SWITCH_STATUS_SUCCESS) { title = (char *) switch_core_session_strdup(session, (char *)p);

1 0

[commit] r3484 - freeswitch/trunk/libs
by Freeswitch SVN 29 Nov '06

29 Nov '06

Author: mikej Date: Wed Nov 29 09:43:41 2006 New Revision: 3484 Modified: freeswitch/trunk/libs/mozilla.build.sh Log: fix spidermonkey build on FreeBSD (patch from Matt Klein) Modified: freeswitch/trunk/libs/mozilla.build.sh ============================================================================== --- freeswitch/trunk/libs/mozilla.build.sh (original) +++ freeswitch/trunk/libs/mozilla.build.sh Wed Nov 29 09:43:41 2006 @@ -23,6 +23,7 @@ cp js/src/config/Linux_All.mk js/src/config/`uname -s``uname -r`.mk ldflags="-lpthread" +other_libs="-lpthread" fi if [ $hosttype = "OpenBSD" ] ; then @@ -49,5 +50,6 @@ cd nsprpub && CFLAGS=$cflags LDFLAGS=$ldflags ./configure $opts && $MAKE -cd ../js/src && CFLAGS=$cflags BUILD_OPT=$BUILD_OPT LDFLAGS=$ldflags 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` +cd ../js/src && CFLAGS=$cflags BUILD_OPT=$BUILD_OPT LDFLAGS=$ldflags JS_THREADSAFE=1 JS_HAS_FILE_OBJECT=1 OTHER_LIBS="$other_libs -L../../../mozilla/nsprpub/dist/lib" INCLUDES="-I../../../mozilla/nsprpub/dist/include/nspr" $MAKE -f Makefile.ref `find . -name libjs.a` +

1 0

[commit] r3483 - freeswitch/trunk/src/mod/event_handlers/mod_cdr
by Freeswitch SVN 29 Nov '06

29 Nov '06

Author: mikej Date: Wed Nov 29 09:32:11 2006 New Revision: 3483 Modified: freeswitch/trunk/src/mod/event_handlers/mod_cdr/mysqlcdr.cpp Log: more ani2 -> aniii changes. Note, if you have mysql tables setup, you may need to alter them Modified: freeswitch/trunk/src/mod/event_handlers/mod_cdr/mysqlcdr.cpp ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_cdr/mysqlcdr.cpp (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_cdr/mysqlcdr.cpp Wed Nov 29 09:32:11 2006 @@ -54,7 +54,7 @@ src_length = (long unsigned int)strlen(src); dst_length = (long unsigned int)strlen(dst); ani_length = (long unsigned int)strlen(ani); - ani2_length = (long unsigned int)strlen(ani2); + aniii_length = (long unsigned int)strlen(aniii); dialplan_length = (long unsigned int)strlen(dialplan); myuuid_length = (long unsigned int)strlen(myuuid); destuuid_length = (long unsigned int)strlen(destuuid); @@ -181,7 +181,7 @@ if(activated) { - tmp_sql_query = "INSERT INTO freeswitchcdr (callstartdate,callanswerdate,callenddate,originated,clid,src,dst,ani,ani2,dialplan,myuuid,destuuid,srcchannel,dstchannel,lastapp,lastdata,billusec,disposition,hangupcause,amaflags"; + tmp_sql_query = "INSERT INTO freeswitchcdr (callstartdate,callanswerdate,callenddate,originated,clid,src,dst,ani,aniii,dialplan,myuuid,destuuid,srcchannel,dstchannel,lastapp,lastdata,billusec,disposition,hangupcause,amaflags"; int items_appended = 0; @@ -324,7 +324,7 @@ add_string_parameter(src,src_length,MYSQL_TYPE_VAR_STRING,0); add_string_parameter(dst,dst_length,MYSQL_TYPE_VAR_STRING,0); add_string_parameter(ani,ani_length,MYSQL_TYPE_VAR_STRING,0); - add_string_parameter(ani2,ani2_length,MYSQL_TYPE_VAR_STRING,0); + add_string_parameter(aniii,aniii_length,MYSQL_TYPE_VAR_STRING,0); add_string_parameter(dialplan,dialplan_length,MYSQL_TYPE_VAR_STRING,0); add_string_parameter(myuuid,myuuid_length,MYSQL_TYPE_VAR_STRING,0); add_string_parameter(destuuid,destuuid_length,MYSQL_TYPE_VAR_STRING,0);

1 0

[commit] r3482 - freeswitch/trunk/src
by Freeswitch SVN 29 Nov '06

29 Nov '06

Author: ptinsley Date: Wed Nov 29 00:46:12 2006 New Revision: 3482 Modified: freeswitch/trunk/src/switch_utils.c Log: No reason to consider % dangerous twice... Also i retract my pcre statement from before, i doubt a perl pack and hex call are going to work in pcre. The regex should give plenty of idea what you need to do in your language of choice though, thats the point :) Modified: freeswitch/trunk/src/switch_utils.c ============================================================================== --- freeswitch/trunk/src/switch_utils.c (original) +++ freeswitch/trunk/src/switch_utils.c Wed Nov 29 00:46:12 2006 @@ -297,7 +297,7 @@ { char *p; size_t x = 0; - const char urlunsafe[] = "\r\n %\"#%&+:;<=>?@[\\]^`{|}"; + const char urlunsafe[] = "\r\n \"#%&+:;<=>?@[\\]^`{|}"; const char hex[] = "0123456789ABCDEF"; memset(buf, 0, len);

1 0

[commit] r3481 - freeswitch/trunk/src
by Freeswitch SVN 29 Nov '06

29 Nov '06

Author: ptinsley Date: Tue Nov 28 23:57:01 2006 New Revision: 3481 Modified: freeswitch/trunk/src/switch_event.c freeswitch/trunk/src/switch_utils.c Log: Fix for event serialization, multi-ilne variables or crazy characters in a line could cause parsing errors in consumers of serialized events. All values are now url encoded to ensure they don't have "dangerous" characters in them. make sure you url_decode in your language of choice when consuming events in plain format from the event socket. For those perl or pcre heads out there you can use the following regex: $value =~ s/\%([A-Fa-f0-9]{2})/pack('C', hex($1))/sego; Modified: freeswitch/trunk/src/switch_event.c ============================================================================== --- freeswitch/trunk/src/switch_event.c (original) +++ freeswitch/trunk/src/switch_event.c Tue Nov 28 23:57:01 2006 @@ -600,8 +600,9 @@ { switch_size_t len = 0; switch_event_header_t *hp; - switch_size_t llen = 0, dlen = 0, blocksize = 512; + switch_size_t llen = 0, dlen = 0, blocksize = 512, encode_len = 1024; char *buf; + char *encode_buf = NULL; /* used for url encoding of variables to make sure unsafe things stay out of the serialzed copy */ *str = NULL; @@ -609,10 +610,42 @@ return SWITCH_STATUS_MEMERR; } + /* go ahead and give ourselves some space to work with, should save a few reallocs */ + if(!(encode_buf = malloc(encode_len))) { + return SWITCH_STATUS_MEMERR; + } + dlen = blocksize; + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "hit serialze!.\n"); for (hp = event->headers; hp; hp = hp->next) { - llen = strlen(hp->name) + strlen(hp->value) + 2; + /* + * grab enough memory to store 3x the string (url encode takes one char and turns it into %XX) + * so we could end up with a string that is 3 times the original's length, unlikely but rather + * be safe than destroy the string, also add one for the null. And try to be smart about using + * the memory, allocate and only reallocate if we need more. This avoids an alloc, free CPU + * destroying loop. + */ + if(encode_len < ((strlen(hp->value) * 3) + 1)) { + char* tmp; + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Allocing %d was %d.\n", ((strlen(hp->value) * 3) + 1), encode_len); + /* we can use realloc for initial alloc as well, if encode_buf is zero it treats it as a malloc */ + if(!(tmp = realloc(encode_buf, ((strlen(hp->value) * 3) + 1)))) { + /* oh boy, ram's gone, give back what little we grabbed and bail */ + switch_safe_free(buf); + return SWITCH_STATUS_MEMERR; + } + + /* keep track of the size of our allocation */ + encode_len = (strlen(hp->value) * 3) + 1; + + encode_buf = tmp; + } + + /* handle any bad things in the string like newlines : etc that screw up the serialized format */ + switch_url_encode(hp->value, encode_buf, encode_len - 1); + + llen = strlen(hp->name) + strlen(encode_buf) + 2; if ((len + llen) > dlen) { char *m; @@ -620,14 +653,20 @@ if ((m = realloc(buf, dlen))) { buf = m; } else { + /* we seem to be out of memory trying to resize the serialize string, give back what we already have and give up */ switch_safe_free(buf); + switch_safe_free(encode_buf); return SWITCH_STATUS_MEMERR; } } - snprintf(buf + len, dlen - len, "%s: %s\n", hp->name, hp->value); + snprintf(buf + len, dlen - len, "%s: %s\n", hp->name, encode_buf); len = strlen(buf); + } + + /* we are done with the memory we used for encoding, give it back */ + switch_safe_free(encode_buf); if (event->body) { int blen = (int) strlen(event->body); Modified: freeswitch/trunk/src/switch_utils.c ============================================================================== --- freeswitch/trunk/src/switch_utils.c (original) +++ freeswitch/trunk/src/switch_utils.c Tue Nov 28 23:57:01 2006 @@ -297,7 +297,7 @@ { char *p; size_t x = 0; - const char urlunsafe[] = " \"#%&+:;<=>?@[\\]^`{|}"; + const char urlunsafe[] = "\r\n %\"#%&+:;<=>?@[\\]^`{|}"; const char hex[] = "0123456789ABCDEF"; memset(buf, 0, len);

1 0

[commit] r3480 - freeswitch/branches/igorneves/scripts/socket
by Freeswitch SVN 29 Nov '06

29 Nov '06

Author: igorneves Date: Tue Nov 28 19:25:15 2006 New Revision: 3480 Modified: freeswitch/branches/igorneves/scripts/socket/fsconsole.pl Log: take out the "api..." no sense always showing that Modified: freeswitch/branches/igorneves/scripts/socket/fsconsole.pl ============================================================================== --- freeswitch/branches/igorneves/scripts/socket/fsconsole.pl (original) +++ freeswitch/branches/igorneves/scripts/socket/fsconsole.pl Tue Nov 28 19:25:15 2006 @@ -270,7 +270,8 @@ if($input->{'Content-Type'} eq "auth/request") { $heap->{'server'}->put("auth $server_secret"); } elsif ($input->{'Content-Type'} eq "api/response") { - new_message('destination_window' => 0, 'message' => 'API Response: '); +# no sense allways showing "api......." +# new_message('destination_window' => 0, 'message' => 'API Response: '); new_message('destination_window' => 0, 'message' => $input->{'__DATA__'}); } elsif ($input->{'Content-Type'} eq "log/data") { new_message('destination_window' => 1, 'message' => $input->{'__DATA__'});

1 0