December 2008 - Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r10889 - freeswitch/trunk/src/mod/codecs/mod_celt
by FreeSWITCH SVN 20 Dec '08

20 Dec '08

Author: brian Date: Fri Dec 19 19:02:09 2008 New Revision: 10889 Log: update celt version Modified: freeswitch/trunk/src/mod/codecs/mod_celt/Makefile Modified: freeswitch/trunk/src/mod/codecs/mod_celt/Makefile ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_celt/Makefile (original) +++ freeswitch/trunk/src/mod/codecs/mod_celt/Makefile Fri Dec 19 19:02:09 2008 @@ -1,6 +1,6 @@ BASE=../../../.. -CELT=celt-0.5.0 +CELT=celt-0.5.1 CELT_DIR=$(BASE)/libs/$(CELT) LOCAL_CFLAGS=-I$(CELT_DIR)/libcelt

1 0

[commit] r10888 - freeswitch/trunk/src/mod/formats/mod_sndfile
by FreeSWITCH SVN 19 Dec '08

19 Dec '08

Author: brian Date: Fri Dec 19 16:58:57 2008 New Revision: 10888 Log: this part was correct to begin with and r48 serves no purpose in this extra formats Modified: freeswitch/trunk/src/mod/formats/mod_sndfile/mod_sndfile.c Modified: freeswitch/trunk/src/mod/formats/mod_sndfile/mod_sndfile.c ============================================================================== --- freeswitch/trunk/src/mod/formats/mod_sndfile/mod_sndfile.c (original) +++ freeswitch/trunk/src/mod/formats/mod_sndfile/mod_sndfile.c Fri Dec 19 16:58:57 2008 @@ -116,17 +116,13 @@ context->sfinfo.channels = 1; context->sfinfo.samplerate = 16000; } else if (!strcmp(ext, "r24")) { - context->sfinfo.format = SF_FORMAT_RAW | SF_FORMAT_PCM_16; + context->sfinfo.format = SF_FORMAT_RAW | SF_FORMAT_PCM_24; context->sfinfo.channels = 1; context->sfinfo.samplerate = 24000; } else if (!strcmp(ext, "r32")) { - context->sfinfo.format = SF_FORMAT_RAW | SF_FORMAT_PCM_16; + context->sfinfo.format = SF_FORMAT_RAW | SF_FORMAT_PCM_32; context->sfinfo.channels = 1; context->sfinfo.samplerate = 32000; - } else if (!strcmp(ext, "r48")) { - context->sfinfo.format = SF_FORMAT_RAW | SF_FORMAT_PCM_16; - context->sfinfo.channels = 1; - context->sfinfo.samplerate = 48000; } else if (!strcmp(ext, "gsm")) { context->sfinfo.format = SF_FORMAT_RAW | SF_FORMAT_GSM610; context->sfinfo.channels = 1; @@ -299,7 +295,7 @@ char buffer[128]; int format, major_count, subtype_count, m, s; int len, x, skip; - char *extras[] = { "r8", "r16", "r24", "r32", "r48", "gsm", "ul", "al", NULL }; + char *extras[] = { "r8", "r16", "r24", "r32", "gsm", "ul", "al", NULL }; int exlen = (sizeof(extras) / sizeof(extras[0])); buffer[0] = 0;

1 0

[commit] r10887 - freeswitch/trunk/src/mod/formats/mod_sndfile
by FreeSWITCH SVN 19 Dec '08

19 Dec '08

Author: brian Date: Fri Dec 19 16:45:58 2008 New Revision: 10887 Log: forgot to register r48 Modified: freeswitch/trunk/src/mod/formats/mod_sndfile/mod_sndfile.c Modified: freeswitch/trunk/src/mod/formats/mod_sndfile/mod_sndfile.c ============================================================================== --- freeswitch/trunk/src/mod/formats/mod_sndfile/mod_sndfile.c (original) +++ freeswitch/trunk/src/mod/formats/mod_sndfile/mod_sndfile.c Fri Dec 19 16:45:58 2008 @@ -299,7 +299,7 @@ char buffer[128]; int format, major_count, subtype_count, m, s; int len, x, skip; - char *extras[] = { "r8", "r16", "r24", "r32", "gsm", "ul", "al", NULL }; + char *extras[] = { "r8", "r16", "r24", "r32", "r48", "gsm", "ul", "al", NULL }; int exlen = (sizeof(extras) / sizeof(extras[0])); buffer[0] = 0;

1 0

[commit] r10886 - freeswitch/trunk/src/mod/formats/mod_sndfile
by FreeSWITCH SVN 19 Dec '08

19 Dec '08

Author: brian Date: Fri Dec 19 16:39:59 2008 New Revision: 10886 Log: mod_sndfile can now record 16bit for the various rates including 48kHz Modified: freeswitch/trunk/src/mod/formats/mod_sndfile/mod_sndfile.c Modified: freeswitch/trunk/src/mod/formats/mod_sndfile/mod_sndfile.c ============================================================================== --- freeswitch/trunk/src/mod/formats/mod_sndfile/mod_sndfile.c (original) +++ freeswitch/trunk/src/mod/formats/mod_sndfile/mod_sndfile.c Fri Dec 19 16:39:59 2008 @@ -95,12 +95,9 @@ context->sfinfo.channels = handle->channels; context->sfinfo.samplerate = handle->samplerate; - if (handle->samplerate == 8000 || handle->samplerate == 16000) { + if (handle->samplerate == 8000 || handle->samplerate == 16000 || + handle->samplerate == 24000 || handle->samplerate == 32000 || handle->samplerate == 48000) { context->sfinfo.format |= SF_FORMAT_PCM_16; - } else if (handle->samplerate == 24000) { - context->sfinfo.format |= SF_FORMAT_PCM_24; - } else if (handle->samplerate == 32000) { - context->sfinfo.format |= SF_FORMAT_PCM_32; } sf_command(context->handle, SFC_FILE_TRUNCATE, &frames, sizeof(frames)); @@ -119,13 +116,17 @@ context->sfinfo.channels = 1; context->sfinfo.samplerate = 16000; } else if (!strcmp(ext, "r24")) { - context->sfinfo.format = SF_FORMAT_RAW | SF_FORMAT_PCM_24; + context->sfinfo.format = SF_FORMAT_RAW | SF_FORMAT_PCM_16; context->sfinfo.channels = 1; context->sfinfo.samplerate = 24000; } else if (!strcmp(ext, "r32")) { - context->sfinfo.format = SF_FORMAT_RAW | SF_FORMAT_PCM_32; + context->sfinfo.format = SF_FORMAT_RAW | SF_FORMAT_PCM_16; context->sfinfo.channels = 1; context->sfinfo.samplerate = 32000; + } else if (!strcmp(ext, "r48")) { + context->sfinfo.format = SF_FORMAT_RAW | SF_FORMAT_PCM_16; + context->sfinfo.channels = 1; + context->sfinfo.samplerate = 48000; } else if (!strcmp(ext, "gsm")) { context->sfinfo.format = SF_FORMAT_RAW | SF_FORMAT_GSM610; context->sfinfo.channels = 1;

1 0

[commit] r10885 - freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax
by FreeSWITCH SVN 19 Dec '08

19 Dec '08

Author: gmaruzz Date: Fri Dec 19 12:32:01 2008 New Revision: 10885 Log: sends and receive audio to/from remote skype client at native rate on linux, sound is nice :-) Modified: freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/mod_skypiax.c freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/skypiax.h freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/skypiax_protocol.c Modified: freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/mod_skypiax.c ============================================================================== --- freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/mod_skypiax.c (original) +++ freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/mod_skypiax.c Fri Dec 19 12:32:01 2008 @@ -30,6 +30,7 @@ switch_endpoint_interface_t *skypiax_endpoint_interface; switch_memory_pool_t *skypiax_module_pool = NULL; int running = 1; +switch_core_session_t *global_session = NULL; /*************************************************/ /*************************************************/ /*************************************************/ @@ -107,7 +108,7 @@ p->tech_pvt = tech_pvt; } - if (skypiax_codec(tech_pvt, SAMPLERATE, 20) != SWITCH_STATUS_SUCCESS) { + if (skypiax_codec(tech_pvt, SAMPLERATE_SKYPIAX, 20) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "skypiax_docec FAILED\n"); } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "skypiax_codec SUCCESS\n"); @@ -391,8 +392,10 @@ #endif sent = frame->datalen; - switch_file_write(p->audioskypepipe[1], (short *) frame->data, &sent); - //DEBUGA_SKYPE("CLI PIPE write %d\n", SKYPIAX_P_LOG, sent); + //DEBUGA_SKYPE("CLI PIPE to write %d\n", SKYPIAX_P_LOG, sent); + switch_file_write(p->audioskypepipe[1], frame->data, &sent); + if(sent != frame->datalen) + ERRORA("CLI PIPE write %d\n", SKYPIAX_P_LOG, sent); return SWITCH_STATUS_SUCCESS; @@ -557,7 +560,7 @@ while (forever) { if (!running) break; - switch_sleep(1000); + //switch_sleep(1000); //cicopet res = skypiax_skype_read(p); //if (res == CALLFLOW_INCOMING_HANGUP && p->interface_state != SKYPIAX_STATE_DOWN) if (res == CALLFLOW_INCOMING_HANGUP) { @@ -581,6 +584,8 @@ } } } + p->interface_state = SKYPIAX_STATE_DOWN; + global_session = NULL; //FIXME } } Modified: freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/skypiax.h ============================================================================== --- freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/skypiax.h (original) +++ freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/skypiax.h Fri Dec 19 12:32:01 2008 @@ -46,7 +46,7 @@ #endif //WIN32 #define SAMPLES_PER_FRAME 320 -#define SAMPLERATE 16000 +#define SAMPLERATE_SKYPIAX 16000 //#define SKYPIAX_SVN_VERSION "SVN 123456" #define SKYPIAX_SVN_VERSION SWITCH_VERSION_REVISION Modified: freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/skypiax_protocol.c ============================================================================== --- freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/skypiax_protocol.c (original) +++ freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/skypiax_protocol.c Fri Dec 19 12:32:01 2008 @@ -12,7 +12,7 @@ /**********************************************************/ -switch_core_session_t *global_session = NULL; +extern switch_core_session_t *global_session; #ifdef WIN32 @@ -48,17 +48,16 @@ unsigned int len; unsigned int i; unsigned int a; - short srv_in[SAMPLES_PER_FRAME]; int sin_size; unsigned int fd; #else int len; int i; int a; - short srv_in[SAMPLES_PER_FRAME]; unsigned int sin_size; int fd; #endif /* WIN32 */ + short srv_in[SAMPLES_PER_FRAME]; struct sockaddr_in my_addr; struct sockaddr_in remote_addr; int exit = 0; @@ -117,16 +116,17 @@ fdselect = fd; FD_ZERO(&fs); FD_SET(fdselect, &fs); - to.tv_usec = 100000; + to.tv_usec = 50000; to.tv_sec = 0; + rt = select(fdselect + 1, &fs, NULL, NULL, &to); - //rt=1; + //rt=0; if (rt > 0) { - len = recv(fd, srv_in, sizeof(short) * SAMPLES_PER_FRAME, 0); - //DEBUGA_SKYPE("recv %d\n", SKYPIAX_P_LOG, len); + //len = recv(fd, srv_in, sizeof(short) * SAMPLES_PER_FRAME, 0); + len = recv(fd, srv_in, 320, 0); //seems that Skype only sends 320 bytes at time - if(SAMPLERATE == 8000) { + if ((SAMPLERATE_SKYPIAX - 8000) == 0) { /****************************************************************/ if (len > 0) { @@ -165,29 +165,32 @@ } else if (len == 0) { DEBUGA_SKYPE("Skype client GONE\n", SKYPIAX_P_LOG); - break; + switch_sleep(1000); } else { ERRORA("len=%d\n", SKYPIAX_P_LOG, len); exit = 1; break; } /****************************************************************/ - } else if (SAMPLERATE == 16000) { + } else if (SAMPLERATE_SKYPIAX == 16000) { /****************************************************************/ if (len > 0) { if (len == SAMPLES_PER_FRAME * sizeof(short)) { unsigned int howmany; - DEBUGA_SKYPE("SRV recv %d\n", SKYPIAX_P_LOG, len); howmany = len; + WARNINGA("SRV recv %d\n", SKYPIAX_P_LOG, len); + switch_file_write(p->audiopipe[1], srv_in, &howmany); p->audiobuf_is_loaded = 0; - DEBUGA_SKYPE("SRV PIPE WRITE=====> req=%d recv=%d to sent=%d sent=%d\n", SKYPIAX_P_LOG, sizeof(short)*SAMPLES_PER_FRAME, len, len, howmany); + WARNINGA("SRV PIPE WRITE=====> req=%d recv=%d to sent=%d sent=%d\n", SKYPIAX_P_LOG, sizeof(short)*SAMPLES_PER_FRAME, len, len, howmany); }else if (len == SAMPLES_PER_FRAME * sizeof(short) / 2) { - unsigned int howmany; - DEBUGA_SKYPE("SRV recv %d\n", SKYPIAX_P_LOG, len); + +#if 1 + + if (!p->audiobuf_is_loaded) { for (i = 0; i < (len / sizeof(short)); i++) { p->audiobuf[i] = srv_in[i]; @@ -206,19 +209,25 @@ switch_file_write(p->audiopipe[1], totalbuf, &howmany); p->audiobuf_is_loaded = 0; - DEBUGA_SKYPE("SRV PIPE WRITE=====> req=%d recv=%d to sent=%d sent=%d\n", SKYPIAX_P_LOG, SAMPLES_PER_FRAME * sizeof(short), len, SAMPLES_PER_FRAME * sizeof(short), howmany); + //NOTICA("SRV PIPE WRITE=====> req=%d recv=%d to sent=%d sent=%d\n", SKYPIAX_P_LOG, SAMPLES_PER_FRAME * sizeof(short), len, SAMPLES_PER_FRAME * sizeof(short), howmany); } +#endif + + + + } else { - ERRORA("len=%d\n", SKYPIAX_P_LOG, len); + ERRORA("SRV len=%d\n", SKYPIAX_P_LOG, len); } } else if (len == 0) { DEBUGA_SKYPE("Skype client GONE\n", SKYPIAX_P_LOG); - break; + switch_sleep(1000); + //break; } else { - ERRORA("len=%d\n", SKYPIAX_P_LOG, len); + ERRORA("SRV len=%d\n", SKYPIAX_P_LOG, len); exit = 1; break; } @@ -228,9 +237,12 @@ } else { - ERRORA("SAMPLERATE can only be 8000 or 16000\n", SKYPIAX_P_LOG); + ERRORA("SAMPLERATE_SKYPIAX can only be 8000 or 16000\n", SKYPIAX_P_LOG); } - } + } else { + + ERRORA("SRV rt=%d\n", SKYPIAX_P_LOG, rt); + } } kill_cli_size = SAMPLES_PER_FRAME * sizeof(short); @@ -274,20 +286,18 @@ struct sockaddr_in my_addr; struct sockaddr_in remote_addr; unsigned int got; + short cli_in[SAMPLES_PER_FRAME]; + short cli_out[SAMPLES_PER_FRAME * 2]; #ifdef WIN32 unsigned int len; unsigned int i; unsigned int a; - short cli_in[SAMPLES_PER_FRAME]; - short cli_out[SAMPLES_PER_FRAME]; int sin_size; unsigned int fd; #else int len; int i; int a; - short cli_in[SAMPLES_PER_FRAME]; - short cli_out[SAMPLES_PER_FRAME]; unsigned int sin_size; int fd; #endif /* WIN32 */ @@ -346,17 +356,20 @@ fdselect = 1; FD_ZERO(&fs); FD_SET(fdselect, &fs); - to.tv_usec = 10000; + to.tv_usec = 100000; //100ms to.tv_sec = 0; - rt = select(fdselect + 1, &fs, NULL, NULL, &to); - //rt = 1; + //FIXME rt = select(fdselect + 1, &fs, NULL, NULL, &to); + //switch_sleep(1000);//FIXME + memset(cli_in, '\0', sizeof(cli_in)); + rt = 1; if (rt > 0) { /*********************************************/ - if (SAMPLERATE == 8000) { - got = (SAMPLES_PER_FRAME / 2) * sizeof(short); + if ((SAMPLERATE_SKYPIAX - 8000) == 0) { + got = SAMPLES_PER_FRAME * sizeof(short); switch_file_read(p->audioskypepipe[0], cli_in, &got); if (got > 0) { + DEBUGA_SKYPE("CLI PIPE read %d\n", SKYPIAX_P_LOG, got); a = 0; for (i = 0; i < got / sizeof(short); i++) { cli_out[a] = cli_in[i]; @@ -366,6 +379,7 @@ } len = send(fd, cli_out, got * 2, 0); + DEBUGA_SKYPE("CLI PIPE send %d\n", SKYPIAX_P_LOG, len); if (len == 0) { ERRORA("Skype server GONE\n", SKYPIAX_P_LOG); @@ -373,21 +387,24 @@ } } else { switch_sleep(1000); - //ERRORA("Audio skype pipe give us: %u\n", SKYPIAX_P_LOG, got); + ERRORA("CLI PIPE give us: %u\n", SKYPIAX_P_LOG, got); + //break; } } /*********************************************/ /*********************************************/ - else if (SAMPLERATE == 16000) { + else if (SAMPLERATE_SKYPIAX == 16000) { got = SAMPLES_PER_FRAME * sizeof(short); switch_file_read(p->audioskypepipe[0], cli_in, &got); if (got > 0) { - //DEBUGA_SKYPE("CLI PIPE read %d\n", SKYPIAX_P_LOG, got); + if(got != SAMPLES_PER_FRAME * sizeof(short) ) + ERRORA("CLI PIPE read %d\n", SKYPIAX_P_LOG, got); len = send(fd, cli_in, got, 0); - //DEBUGA_SKYPE("CLI PIPE send %d\n", SKYPIAX_P_LOG, len); + if(len != got ) + ERRORA("CLI PIPE send %d\n", SKYPIAX_P_LOG, len); if (len == 0) { ERRORA("Skype server GONE\n", SKYPIAX_P_LOG); @@ -431,14 +448,14 @@ rv = switch_file_pipe_create(&p->audiopipe[0], &p->audiopipe[1], skypiax_module_pool); - rv = switch_file_pipe_timeout_set(p->audiopipe[0], 100000); + //rv = switch_file_pipe_timeout_set(p->audiopipe[0], 100); /* the pipe is our audio fd for pbx to poll on */ p->skypiax_sound_capt_fd = p->audiopipe[0]; rv = switch_file_pipe_create(&p->audioskypepipe[0], &p->audioskypepipe[1], skypiax_module_pool); - rv = switch_file_pipe_timeout_set(p->audioskypepipe[0], 100000); + //rv = switch_file_pipe_timeout_set(p->audioskypepipe[0], 20000); if (option_debug > 10) { DEBUGA_PBX("EXITING FUNC\n", SKYPIAX_P_LOG); } @@ -465,12 +482,12 @@ if (samples != SAMPLES_PER_FRAME * sizeof(short)) { if (samples) - DEBUGA_SKYPE("SRV PIPE READ=====> NOT GOOD samples=%d expected=%d\n", SKYPIAX_P_LOG, + ERRORA("SRV PIPE READ=====> NOT GOOD samples=%d expected=%d\n", SKYPIAX_P_LOG, samples, SAMPLES_PER_FRAME * sizeof(short)); //do nothing } else { tech_pvt->read_frame.datalen = samples; - //DEBUGA_SKYPE("read=====> GOOD samples=%d\n", SKYPIAX_P_LOG, samples); + //NOTICA("SRV PIPE READ=====> GOOD samples=%d\n", SKYPIAX_P_LOG, samples); /* A real frame */ } } else { @@ -678,7 +695,7 @@ p = obj; switch_file_pipe_create(&p->AsteriskHandlesAst.fdesc[0], &p->AsteriskHandlesAst.fdesc[1], skypiax_module_pool); - switch_file_pipe_timeout_set(p->AsteriskHandlesAst.fdesc[0], 100000); + //switch_file_pipe_timeout_set(p->AsteriskHandlesAst.fdesc[0], 100); win32_AsteriskHandlesSkype = &p->AsteriskHandlesAst; @@ -862,7 +879,7 @@ switch_file_pipe_create(&p->AsteriskHandlesAst.fdesc[0], &p->AsteriskHandlesAst.fdesc[1], skypiax_module_pool); - switch_file_pipe_timeout_set(p->AsteriskHandlesAst.fdesc[0], 100000); + //switch_file_pipe_timeout_set(p->AsteriskHandlesAst.fdesc[0], 100); AsteriskHandlesAst = &p->AsteriskHandlesAst; //disp = XOpenDisplay(getenv("DISPLAY")); disp = XOpenDisplay(p->X11_display); @@ -928,7 +945,7 @@ b = buffer; while (1) { - usleep(1000); + //switch_sleep(10000); XNextEvent(disp, &an_event); if (!running) break; @@ -1201,7 +1218,9 @@ DEBUGA_SKYPE("Call %s received a DTMF: %s\n", SKYPIAX_P_LOG, id, value); tech_pvt = p->tech_pvt; - session = tech_pvt->session; + //if(tech_pvt) + session = tech_pvt->session; + //if(session) channel = switch_core_session_get_channel(session); if (channel) { @@ -1288,7 +1307,6 @@ DEBUGA_SKYPE("We missed skype_call %s\n", SKYPIAX_P_LOG, id); } else if (!strcasecmp(value, "FINISHED")) { - global_session = NULL; //FIXME //p->skype_callflow = CALLFLOW_STATUS_FINISHED; if (option_debug) DEBUGA_SKYPE("skype_call %s now is DOWN\n", SKYPIAX_P_LOG, id);

1 0

[commit] r10884 - freeswitch/trunk/scripts/socket/FreeSWITCH
by FreeSWITCH SVN 19 Dec '08

19 Dec '08

Author: anthm Date: Fri Dec 19 12:25:52 2008 New Revision: 10884 Log: fix bug in FS Client.pm Modified: freeswitch/trunk/scripts/socket/FreeSWITCH/Client.pm Modified: freeswitch/trunk/scripts/socket/FreeSWITCH/Client.pm ============================================================================== --- freeswitch/trunk/scripts/socket/FreeSWITCH/Client.pm (original) +++ freeswitch/trunk/scripts/socket/FreeSWITCH/Client.pm Fri Dec 19 12:25:52 2008 @@ -73,7 +73,7 @@ while(length($h->{body}) < $h->{'content-length'}) { my $buf; recv $s, $buf, $h->{'content-length'} - length($h->{body}), 0; - if (!$buf) { + if ($buf eq '') { $h->{socketerror} = "yes"; return $h; } @@ -152,9 +152,9 @@ my $r = $self->sendmsg({ 'command' => "api " . shift }); - if ($r->{body}) { + if ($r->{body} ne '') { $reply = $r->{body}; - } elsif ($r->{'reply-text'}) { + } elsif ($r->{'reply-text'} ne '') { $reply = $r->{'reply-text'}; } else { $reply = "socketerror";

1 0

[commit] r10883 - freeswitch/trunk/src
by FreeSWITCH SVN 19 Dec '08

19 Dec '08

Author: anthm Date: Fri Dec 19 12:12:27 2008 New Revision: 10883 Log: remove unneeded fflush Modified: freeswitch/trunk/src/switch_log.c Modified: freeswitch/trunk/src/switch_log.c ============================================================================== --- freeswitch/trunk/src/switch_log.c (original) +++ freeswitch/trunk/src/switch_log.c Fri Dec 19 12:12:27 2008 @@ -376,9 +376,7 @@ switch_safe_free(data); switch_safe_free(new_fmt); - if (handle) { - fflush(handle); - } + } SWITCH_DECLARE(switch_status_t) switch_log_init(switch_memory_pool_t *pool, switch_bool_t colorize)

1 0

[commit] r10882 - freeswitch/trunk/src/mod/applications/mod_limit
by FreeSWITCH SVN 19 Dec '08

19 Dec '08

Author: anthm Date: Fri Dec 19 11:55:44 2008 New Revision: 10882 Log: add patch to see limit usage Modified: freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.c Modified: freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.c (original) +++ freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.c Fri Dec 19 11:55:44 2008 @@ -26,7 +26,8 @@ * Anthony Minessale II <anthmct(a)yahoo.com> * Ken Rice <krice at suspicious dot org * Mathieu Rene <mathieu.rene(a)gmail.com> - * + * Bret McDanel <trixter AT 0xdecafbad.com> + * * mod_limit.c -- Resource Limit Module * */ @@ -750,6 +751,45 @@ switch_mutex_unlock(globals.mutex); } + +#define LIMIT_USAGE_USAGE "<realm> <id>" +SWITCH_STANDARD_API(limit_usage_function) +{ + int argc = 0; + char *argv[6] = { 0 }; + char *mydata = NULL; + char *sql = NULL; + char *realm = NULL; + char *id = NULL; + char buf[80] = ""; + callback_t cbt = { 0 }; + + + if (!switch_strlen_zero(cmd)) { + mydata = strdup(cmd); + switch_assert(mydata); + argc = switch_separate_string(mydata, ' ', argv, (sizeof(argv) / sizeof(argv[0]))); + } + + if (argc < 2) { + stream->write_function(stream, "USAGE: limit_usage %s\n", LIMIT_USAGE_USAGE); + return SWITCH_STATUS_SUCCESS; + } + + + realm = argv[0]; + id = argv[1]; + + cbt.buf = buf; + cbt.len = sizeof(buf); + sql = switch_mprintf("select count(hostname) from limit_data where realm='%q' and id like '%q'", realm, id); + limit_execute_sql_callback(NULL, sql, sql2str_callback, &cbt); + switch_safe_free(sql); + + stream->write_function(stream, "%s\n", buf); + return SWITCH_STATUS_SUCCESS; +} + #define LIMITHASH_USAGE "<realm> <id> <max>[/interval] [number [dialplan [context]]]" #define LIMITHASH_DESC "limit access to a resource and transfer to an extension if the limit is exceeded" SWITCH_STANDARD_APP(limit_hash_function) @@ -941,6 +981,7 @@ SWITCH_ADD_APP(app_interface, "group", "Manage a group", GROUP_DESC, group_function, GROUP_USAGE, SAF_SUPPORT_NOMEDIA); SWITCH_ADD_API(commands_api_interface, "limit_hash_usage", "Gets the usage count of a limited resource", limit_hash_usage_function, LIMIT_HASH_USAGE_USAGE); + SWITCH_ADD_API(commands_api_interface, "limit_usage", "Gets the usage count of a limited resource", limit_usage_function, "<realm> <id>"); SWITCH_ADD_API(commands_api_interface, "db", "db get/set", db_api_function, "[insert|delete|select]/<realm>/<key>/<value>"); switch_console_set_complete("add db insert"); switch_console_set_complete("add db delete");

1 0

[commit] r10881 - freeswitch/trunk/src/mod/applications/mod_limit
by FreeSWITCH SVN 19 Dec '08

19 Dec '08

Author: mrene Date: Thu Dec 18 23:11:51 2008 New Revision: 10881 Log: Fix counter bug Modified: freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.c Modified: freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.c (original) +++ freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.c Thu Dec 18 23:11:51 2008 @@ -816,14 +816,11 @@ /* Did we already run on this channel before? */ if ((channel_hash = switch_channel_get_private(channel, "limit_hash"))) { - /* Yes, but check if we did that realm+id */ - if (!switch_core_hash_find(channel_hash, hashkey)) { - /* No, add it to our table so the state handler can take care of it */ - switch_core_hash_insert(channel_hash, hashkey, item); - } else { - /* Yes, dont touch total counter */ - increment = 0; - } + /* Yes, but check if we did that realm+id + If we didnt, allow incrementing the counter. + If we did, dont touch it but do the validation anyways + */ + increment = !!!switch_core_hash_find(channel_hash, hashkey); } else { /* This is the first limit check on this channel, create a hashtable, set our prviate data and add a state handler */ new_channel = 1; @@ -852,6 +849,10 @@ if (increment) { item->total_usage++; + if (!new_channel) { + switch_core_hash_insert(channel_hash, hashkey, item); + } + if (interval == 0) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Usage for %s is now %d/%d\n", hashkey, item->total_usage, max); } else {

1 0

[commit] r10880 - freeswitch/trunk/docs/phrase
by FreeSWITCH SVN 18 Dec '08

18 Dec '08

Author: mcollins Date: Thu Dec 18 18:50:16 2008 New Revision: 10880 Log: Add new 1.0.2 prompts to phrase_en.xml Modified: freeswitch/trunk/docs/phrase/phrase_en.xml Modified: freeswitch/trunk/docs/phrase/phrase_en.xml ============================================================================== --- freeswitch/trunk/docs/phrase/phrase_en.xml (original) +++ freeswitch/trunk/docs/phrase/phrase_en.xml Thu Dec 18 18:50:16 2008 @@ -267,12 +267,20 @@ <prompt phrase="To speak with an operator" filename="ivr-to_speak_with_an_operator.wav"/> <prompt phrase="Welcome to FreeSWITCH, the future of telephony" filename="ivr-welcome_to_freeswitch.wav"/> <prompt phrase="You may exit at any time by simply hanging up" filename="ivr-you_may_exit_by_hanging_up.wav"/> -  + <prompt phrase="or" filename ="ivr-or.wav"/> + <prompt phrase="not" filename ="ivr-not.wav"/> + <prompt phrase="call" filename ="ivr-call.wav"/> + <prompt phrase="You may" filename ="ivr-you_may.wav"/> + <prompt phrase="hello" filename="ivr-hello.wav"/> + <prompt phrase="Using your telephone keypad..." filename="ivr-use_telephone_keypad.wav"/> + <prompt phrase="please spell the name of the person you are trying to reach." filename="ivr-spell_name.wav"/> + <prompt phrase="Last name first" filename="ivr-last_name_first.wav"/> + <prompt phrase="First name first" filename="ivr-first_name_first.wav"/> + <prompt phrase="Press 1 for Q or Z." filename="ivr-press_one_q_or_z.wav"/> + <prompt phrase="Sales" filename="ivr-sales.wav"/> + <prompt phrase="Customer service" filename="ivr-customer_service.wav"/> + <prompt phrase="Technical support" filename="ivr-technical_support.wav"/> + <prompt phrase="Operator" filename="ivr-operator.wav"/> </ivr> <misc> <prompt phrase="This call has been secured" filename="call_secured.wav"/>

1 0