December 2008 - Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r10858 - freeswitch/trunk/src
by FreeSWITCH SVN 17 Dec '08

17 Dec '08

Author: anthm Date: Wed Dec 17 15:43:13 2008 New Revision: 10858 Log: fix bottleneck in sql thread Modified: freeswitch/trunk/src/switch_core_db.c freeswitch/trunk/src/switch_core_sqldb.c Modified: freeswitch/trunk/src/switch_core_db.c ============================================================================== --- freeswitch/trunk/src/switch_core_db.c (original) +++ freeswitch/trunk/src/switch_core_db.c Wed Dec 17 15:43:13 2008 @@ -86,7 +86,7 @@ if (ret == SQLITE_BUSY || ret == SQLITE_LOCKED) { if (sane > 1) { switch_safe_free(err); - switch_yield(20000); + switch_cond_next(); continue; } } else { Modified: freeswitch/trunk/src/switch_core_sqldb.c ============================================================================== --- freeswitch/trunk/src/switch_core_sqldb.c (original) +++ freeswitch/trunk/src/switch_core_sqldb.c Wed Dec 17 15:43:13 2008 @@ -38,7 +38,7 @@ static struct { switch_core_db_t *db; switch_core_db_t *event_db; - switch_queue_t *sql_queue; + switch_queue_t *sql_queue[2]; switch_memory_pool_t *memory_pool; int thread_running; } sql_manager; @@ -61,7 +61,7 @@ while (begin_retries > 0) { again = 0; - switch_core_db_exec(db, "begin transaction", NULL, NULL, &errmsg); + switch_core_db_exec(db, "BEGIN", NULL, NULL, &errmsg); if (errmsg) { begin_retries--; @@ -74,7 +74,7 @@ errmsg = NULL; if (again) { - switch_core_db_exec(db, "end transaction", NULL, NULL, NULL); + switch_core_db_exec(db, "COMMIT", NULL, NULL, NULL); goto again; } @@ -109,7 +109,7 @@ done: - switch_core_db_exec(db, "end transaction", NULL, NULL, NULL); + switch_core_db_exec(db, "COMMIT", NULL, NULL, NULL); return status; } @@ -151,13 +151,13 @@ void *pop; uint32_t itterations = 0; uint8_t trans = 0, nothing_in_queue = 0; - uint32_t target = 1000; + uint32_t target = 50000; switch_size_t len = 0, sql_len = SQLLEN; char *tmp, *sqlbuf = (char *) malloc(sql_len); char *sql; switch_size_t newlen; int lc = 0; - + switch_assert(sqlbuf); if (!sql_manager.event_db) { @@ -167,7 +167,8 @@ sql_manager.thread_running = 1; for (;;) { - if (switch_queue_trypop(sql_manager.sql_queue, &pop) == SWITCH_STATUS_SUCCESS) { + if (switch_queue_trypop(sql_manager.sql_queue[0], &pop) == SWITCH_STATUS_SUCCESS || + switch_queue_trypop(sql_manager.sql_queue[1], &pop) == SWITCH_STATUS_SUCCESS) { sql = (char *) pop; if (sql) { @@ -201,9 +202,9 @@ } else { nothing_in_queue = 1; } - - - if (trans && ((itterations == target) || nothing_in_queue)) { + + + if (trans && ((itterations == target) || (nothing_in_queue && ++lc >= 500))) { if (switch_core_db_persistant_execute_trans(sql_manager.event_db, sqlbuf, 100) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "SQL thread unable to commit transaction, records lost!\n"); } @@ -212,19 +213,19 @@ nothing_in_queue = 0; len = 0; *sqlbuf = '\0'; - } - - if (++lc == 300000) { - switch_core_db_exec(sql_manager.db, "vacuum;", NULL, NULL, NULL); lc = 0; } - + if (nothing_in_queue) { switch_cond_next(); } } - while (switch_queue_trypop(sql_manager.sql_queue, &pop) == SWITCH_STATUS_SUCCESS) { + while (switch_queue_trypop(sql_manager.sql_queue[0], &pop) == SWITCH_STATUS_SUCCESS) { + free(pop); + } + + while (switch_queue_trypop(sql_manager.sql_queue[1], &pop) == SWITCH_STATUS_SUCCESS) { free(pop); } @@ -288,17 +289,20 @@ sql = switch_mprintf ("update channels set read_codec='%q',read_rate='%q',write_codec='%q',write_rate='%q' where uuid='%q'", - switch_event_get_header_nil(event, "channel-read-codec-name"), switch_event_get_header_nil(event, - "channel-read-codec-rate"), - switch_event_get_header_nil(event, "channel-write-codec-name"), switch_event_get_header_nil(event, - "channel-write-codec-rate"), + switch_event_get_header_nil(event, "channel-read-codec-name"), + switch_event_get_header_nil(event, "channel-read-codec-rate"), + switch_event_get_header_nil(event, "channel-write-codec-name"), + switch_event_get_header_nil(event, "channel-write-codec-rate"), switch_event_get_header_nil(event, "unique-id")); break; case SWITCH_EVENT_CHANNEL_EXECUTE: sql = switch_mprintf("update channels set application='%q',application_data='%q' where uuid='%q'", switch_event_get_header_nil(event, "application"), - switch_event_get_header_nil(event, "application-data"), switch_event_get_header_nil(event, "unique-id") - ); + switch_event_get_header_nil(event, "application-data"), + switch_event_get_header_nil(event, "unique-id") + + ); + break; case SWITCH_EVENT_CHANNEL_STATE: { @@ -384,7 +388,11 @@ } if (sql) { - switch_queue_push(sql_manager.sql_queue, sql); + if (switch_stristr("update channels", sql)) { + switch_queue_push(sql_manager.sql_queue[1], sql); + } else { + switch_queue_push(sql_manager.sql_queue[0], sql); + } sql = NULL; } } @@ -442,7 +450,7 @@ " read_rate VARCHAR(255),\n" " write_codec VARCHAR(255),\n" " write_rate VARCHAR(255)\n" - ");\n"; + ");\ncreate index uuindex on channels (uuid);\n"; char create_calls_sql[] = "CREATE TABLE calls (\n" " created VARCHAR(255),\n" @@ -458,7 +466,9 @@ " callee_dest_num VARCHAR(255),\n" " callee_chan_name VARCHAR(255),\n" " callee_uuid VARCHAR(255)\n" - ");\n"; + ");\n" + "create index eruuindex on calls (caller_uuid);\n" + "create index eeuuindex on calls (callee_uuid);\n"; char create_interfaces_sql[] = "CREATE TABLE interfaces (\n" " type VARCHAR(255),\n" @@ -488,6 +498,17 @@ switch_core_db_test_reactive(sql_manager.db, "select sticky from aliases", "DROP TABLE aliases", create_alias_sql); switch_core_db_exec(sql_manager.db, "delete from complete where sticky=0", NULL, NULL, NULL); switch_core_db_exec(sql_manager.db, "delete from aliases where sticky=0", NULL, NULL, NULL); + switch_core_db_exec(sql_manager.db, "create index if not exists alias1 on aliases (alias)", NULL, NULL, NULL); + switch_core_db_exec(sql_manager.db, "create index if not exists complete1 on complete (a1)", NULL, NULL, NULL); + switch_core_db_exec(sql_manager.db, "create index if not exists complete2 on complete (a2)", NULL, NULL, NULL); + switch_core_db_exec(sql_manager.db, "create index if not exists complete3 on complete (a3)", NULL, NULL, NULL); + switch_core_db_exec(sql_manager.db, "create index if not exists complete4 on complete (a4)", NULL, NULL, NULL); + switch_core_db_exec(sql_manager.db, "create index if not exists complete5 on complete (a5)", NULL, NULL, NULL); + switch_core_db_exec(sql_manager.db, "create index if not exists complete6 on complete (a6)", NULL, NULL, NULL); + switch_core_db_exec(sql_manager.db, "create index if not exists complete7 on complete (a7)", NULL, NULL, NULL); + switch_core_db_exec(sql_manager.db, "create index if not exists complete8 on complete (a8)", NULL, NULL, NULL); + switch_core_db_exec(sql_manager.db, "create index if not exists complete9 on complete (a9)", NULL, NULL, NULL); + switch_core_db_exec(sql_manager.db, "create index if not exists complete10 on complete (a10)", NULL, NULL, NULL); switch_core_db_exec(sql_manager.db, create_channels_sql, NULL, NULL, NULL); switch_core_db_exec(sql_manager.db, create_calls_sql, NULL, NULL, NULL); switch_core_db_exec(sql_manager.db, create_interfaces_sql, NULL, NULL, NULL); @@ -497,12 +518,14 @@ } } - switch_queue_create(&sql_manager.sql_queue, SWITCH_SQL_QUEUE_LEN, sql_manager.memory_pool); + switch_queue_create(&sql_manager.sql_queue[0], SWITCH_SQL_QUEUE_LEN, sql_manager.memory_pool); + switch_queue_create(&sql_manager.sql_queue[1], SWITCH_SQL_QUEUE_LEN, sql_manager.memory_pool); switch_threadattr_create(&thd_attr, sql_manager.memory_pool); switch_threadattr_detach_set(thd_attr, 1); switch_threadattr_stacksize_set(thd_attr, SWITCH_THREAD_STACKSIZE); switch_thread_create(&thread, thd_attr, switch_core_sql_thread, NULL, sql_manager.memory_pool); + while (!sql_manager.thread_running) { switch_yield(10000); } @@ -510,10 +533,14 @@ void switch_core_sqldb_stop(void) { - switch_queue_push(sql_manager.sql_queue, NULL); + switch_queue_push(sql_manager.sql_queue[0], NULL); + switch_queue_push(sql_manager.sql_queue[1], NULL); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "Waiting for unfinished SQL transactions\n"); - while (switch_queue_size(sql_manager.sql_queue) > 0) { + while (switch_queue_size(sql_manager.sql_queue[0]) > 0) { + switch_yield(10000); + } + while (switch_queue_size(sql_manager.sql_queue[1]) > 0) { switch_yield(10000); }

1 0

[commit] r10857 - freeswitch/trunk/src/mod/applications/mod_http
by FreeSWITCH SVN 17 Dec '08

17 Dec '08

Author: ericdc Date: Wed Dec 17 14:40:37 2008 New Revision: 10857 Log: Re added missing file header Modified: freeswitch/trunk/src/mod/applications/mod_http/mod_http.c Modified: freeswitch/trunk/src/mod/applications/mod_http/mod_http.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_http/mod_http.c (original) +++ freeswitch/trunk/src/mod/applications/mod_http/mod_http.c Wed Dec 17 14:40:37 2008 @@ -1,3 +1,38 @@ +/* + * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application + * Copyright (C) 2008, Eric des Courtis <eric.des.courtis(a)benbria.com> + * + * Version: MPL 1.1 + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * Eric des Courtis <eric.des.courtis(a)benbria.com> + * Copyright (C) Benbria. All Rights Reserved. + * + * Contributor(s): + * + * Eric des Courtis <eric.des.courtis(a)benbria.com> + * + * + * mod_http.c -- HTTP client implementation for FreeSWITCH + * + * The purpose is to provide laguages like LUA with a _fast_ HTTP + * client implementation. + * + * Support for SSL will be provided in future versions. + * Initial release does not include win32 support. + * + */ + + #include <switch.h> #include <stdio.h> #include <stdlib.h>

1 0

[commit] r10856 - freeswitch/trunk/src/mod/applications/mod_http
by FreeSWITCH SVN 17 Dec '08

17 Dec '08

Author: ericdc Date: Wed Dec 17 14:36:15 2008 New Revision: 10856 Log: Fixed json validation error. Modified: freeswitch/trunk/src/mod/applications/mod_http/mod_http.c Modified: freeswitch/trunk/src/mod/applications/mod_http/mod_http.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_http/mod_http.c (original) +++ freeswitch/trunk/src/mod/applications/mod_http/mod_http.c Wed Dec 17 14:36:15 2008 @@ -1,37 +1,3 @@ -/* - * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application - * Copyright (C) 2008, Eric des Courtis <eric.des.courtis(a)benbria.com> - * - * Version: MPL 1.1 - * - * The contents of this file are subject to the Mozilla Public License Version - * 1.1 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - * for the specific language governing rights and limitations under the - * License. - * - * Eric des Courtis <eric.des.courtis(a)benbria.com> - * Copyright (C) Benbria. All Rights Reserved. - * - * Contributor(s): - * - * Eric des Courtis <eric.des.courtis(a)benbria.com> - * - * - * mod_http.c -- HTTP client implementation for FreeSWITCH - * - * The purpose is to provide laguages like LUA with a _fast_ HTTP - * client implementation. - * - * Support for SSL will be provided in future versions. - * Initial release does not include win32 support. - * - */ - #include <switch.h> #include <stdio.h> #include <stdlib.h> @@ -174,6 +140,12 @@ GARBAGE_ADD(request.url); strcpy(request.url, url); json_http_headers = json_tokener_parse(headers_str); + if(is_error(json_http_headers)){ + switch_safe_free(ccmd); + stream->write_function(stream, "-ERR\n"); + GARBAGE_CLEANUP(); + return SWITCH_STATUS_SUCCESS; + } i = 0; json_object_object_foreach(json_http_headers, key, val){

1 0

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

17 Dec '08

Author: gmaruzz Date: Wed Dec 17 13:37:17 2008 New Revision: 10855 Log: send audio to remote skype client at native rate on linux 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 Wed Dec 17 13:37:17 2008 @@ -392,7 +392,7 @@ sent = frame->datalen; switch_file_write(p->audioskypepipe[1], (short *) frame->data, &sent); - //ERRORA("sent %d\n", SKYPIAX_P_LOG, sent); + DEBUGA_SKYPE("CLI PIPE write %d\n", SKYPIAX_P_LOG, sent); return SWITCH_STATUS_SUCCESS; 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 Wed Dec 17 13:37:17 2008 @@ -45,8 +45,8 @@ //FIXME include? #endif //WIN32 -#define SAMPLES_PER_FRAME 160 -#define SAMPLERATE 8000 +#define SAMPLES_PER_FRAME 320 +#define SAMPLERATE 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 Wed Dec 17 13:37:17 2008 @@ -216,7 +216,7 @@ unsigned int len; unsigned int i; unsigned int a; - short cli_in[SAMPLES_PER_FRAME / 2]; + short cli_in[SAMPLES_PER_FRAME]; short cli_out[SAMPLES_PER_FRAME]; int sin_size; unsigned int fd; @@ -224,7 +224,7 @@ int len; int i; int a; - short cli_in[SAMPLES_PER_FRAME / 2]; + short cli_in[SAMPLES_PER_FRAME]; short cli_out[SAMPLES_PER_FRAME]; unsigned int sin_size; int fd; @@ -287,33 +287,59 @@ to.tv_usec = 10000; to.tv_sec = 0; //rt = select(fdselect + 1, &fs, NULL, NULL, &to); - switch_sleep(5000); + //switch_sleep(5000); rt = 1; - if (rt > 0) { + if (rt > 0) { + /*********************************************/ + if (SAMPLERATE == 8000) { + got = (SAMPLES_PER_FRAME / 2) * sizeof(short); + switch_file_read(p->audioskypepipe[0], cli_in, &got); + + if (got > 0) { + a = 0; + for (i = 0; i < got / sizeof(short); i++) { + cli_out[a] = cli_in[i]; + a++; + cli_out[a] = cli_in[i]; + a++; + } + + len = send(fd, cli_out, got * 2, 0); + + if (len == 0) { + ERRORA("Skype server GONE\n", SKYPIAX_P_LOG); + break; + } + } else { + switch_sleep(1000); + //ERRORA("Audio skype pipe give us: %u\n", SKYPIAX_P_LOG, got); + } + } + /*********************************************/ + /*********************************************/ + else if (SAMPLERATE == 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); + + len = send(fd, cli_in, got, 0); + + DEBUGA_SKYPE("CLI PIPE send %d\n", SKYPIAX_P_LOG, len); + + if (len == 0) { + ERRORA("Skype server GONE\n", SKYPIAX_P_LOG); + break; + } + } else { + switch_sleep(1000); + ERRORA("CLI PIPE give us: %u\n", SKYPIAX_P_LOG, got); + } + } + /*********************************************/ - got = (SAMPLES_PER_FRAME / 2) * sizeof(short); - switch_file_read(p->audioskypepipe[0], cli_in, &got); - - if (got > 0) { - a = 0; - for (i = 0; i < got / sizeof(short); i++) { - cli_out[a] = cli_in[i]; - a++; - cli_out[a] = cli_in[i]; - a++; - } - - len = send(fd, cli_out, got * 2, 0); - - if (len == 0) { - ERRORA("Skype server GONE\n", SKYPIAX_P_LOG); - break; - } - } else { - switch_sleep(1000); - //ERRORA("Audio skype pipe give us: %u\n", SKYPIAX_P_LOG, got); - } - } + } } ERRORA("Skype server GONE\n", SKYPIAX_P_LOG); @@ -351,7 +377,7 @@ rv = switch_file_pipe_create(&p->audioskypepipe[0], &p->audioskypepipe[1], skypiax_module_pool); - rv = switch_file_pipe_timeout_set(p->audioskypepipe[0], 100); + rv = switch_file_pipe_timeout_set(p->audioskypepipe[0], 100000); if (option_debug > 10) { DEBUGA_PBX("EXITING FUNC\n", SKYPIAX_P_LOG); }

1 0

[commit] r10854 - freeswitch/branches/cseket/src/mod/applications/mod_voicemail
by FreeSWITCH SVN 17 Dec '08

17 Dec '08

Author: cseket Date: Wed Dec 17 12:45:19 2008 New Revision: 10854 Log: fix loglevel (MODAPP-177) Modified: freeswitch/branches/cseket/src/mod/applications/mod_voicemail/mod_voicemail.c Modified: freeswitch/branches/cseket/src/mod/applications/mod_voicemail/mod_voicemail.c ============================================================================== --- freeswitch/branches/cseket/src/mod/applications/mod_voicemail/mod_voicemail.c (original) +++ freeswitch/branches/cseket/src/mod/applications/mod_voicemail/mod_voicemail.c Wed Dec 17 12:45:19 2008 @@ -257,7 +257,7 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Destroying Profile %s\n", profile->name); #ifdef SWITCH_HAVE_ODBC if (profile->odbc_dsn && profile->master_odbc) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Closing ODBC Database! %s\n", profile->name); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Closing ODBC Database! %s\n", profile->name); switch_odbc_handle_destroy(&profile->master_odbc); } #endif

1 0

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

17 Dec '08

Author: gmaruzz Date: Wed Dec 17 12:21:26 2008 New Revision: 10853 Log: re-beginning native rate 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 Wed Dec 17 12:21:26 2008 @@ -107,7 +107,7 @@ p->tech_pvt = tech_pvt; } - if (skypiax_codec(tech_pvt, 16000, 20) != SWITCH_STATUS_SUCCESS) { + if (skypiax_codec(tech_pvt, SAMPLERATE, 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"); @@ -390,10 +390,9 @@ } #endif - sent = frame->datalen/sizeof(short); - //ERRORA("CLI to be sent %d\n", SKYPIAX_P_LOG, sent); + sent = frame->datalen; switch_file_write(p->audioskypepipe[1], (short *) frame->data, &sent); - //ERRORA("CLI sent %d\n", SKYPIAX_P_LOG, sent); + //ERRORA("sent %d\n", SKYPIAX_P_LOG, sent); return SWITCH_STATUS_SUCCESS; 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 Wed Dec 17 12:21:26 2008 @@ -45,6 +45,8 @@ //FIXME include? #endif //WIN32 +#define SAMPLES_PER_FRAME 160 +#define SAMPLERATE 8000 //#define SKYPIAX_SVN_VERSION "SVN 123456" #define SKYPIAX_SVN_VERSION SWITCH_VERSION_REVISION @@ -179,7 +181,7 @@ switch_thread_t *tcp_cli_thread; switch_thread_t *skypiax_do_controldev_thread_thread; switch_thread_t *skypiax_do_skype_thread_thread; - short audiobuf[160]; + short audiobuf[SAMPLES_PER_FRAME]; int audiobuf_is_loaded; //int phonebook_listing; 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 Wed Dec 17 12:21:26 2008 @@ -37,13 +37,12 @@ /**********************************************************/ /**********************************************************/ /**********************************************************/ -#define SAMPLES_PER_FRAME 320 static void *SWITCH_THREAD_FUNC skypiax_do_tcp_srv_thread(switch_thread_t * thread, void *obj) { struct skypiax_interface *p = obj; - //short srv_out[SAMPLES_PER_FRAME / 2]; + short srv_out[SAMPLES_PER_FRAME / 2]; int s; #ifdef WIN32 unsigned int len; @@ -53,10 +52,10 @@ int sin_size; unsigned int fd; #else - int len = 0; - //int i; - //int a; - short srv_in[SAMPLES_PER_FRAME * 2]; + int len; + int i; + int a; + short srv_in[SAMPLES_PER_FRAME]; unsigned int sin_size; int fd; #endif /* WIN32 */ @@ -64,9 +63,7 @@ struct sockaddr_in remote_addr; int exit = 0; unsigned int kill_cli_size; - short kill_cli_buff[320]; - //int i; - //int a; + short kill_cli_buff[SAMPLES_PER_FRAME * sizeof(short)]; if (option_debug > 10) { WARNINGA("ENTERING FUNC\n", SKYPIAX_P_LOG); @@ -120,61 +117,16 @@ fdselect = fd; FD_ZERO(&fs); FD_SET(fdselect, &fs); - to.tv_usec = 100000; + to.tv_usec = 10000; to.tv_sec = 0; rt = select(fdselect + 1, &fs, NULL, NULL, &to); - //switch_sleep(10000); + //usleep(1000); //rt=1; if (rt > 0) { - len = recv(fd, srv_in, SAMPLES_PER_FRAME * sizeof(short), 0); + len = recv(fd, srv_in, sizeof(short) * SAMPLES_PER_FRAME, 0); //DEBUGA_SKYPE("recv %d\n", SKYPIAX_P_LOG, len); if (len > 0) { - if(len == SAMPLES_PER_FRAME * sizeof(short)) { - unsigned int howmany; - - howmany = len / sizeof(short); - switch_file_write(p->audiopipe[1], srv_in, &howmany); - if(howmany == 320){ - NOTICA("SRV=====> req=%d recv=%d to sent=%d sent=%d\n", SKYPIAX_P_LOG, SAMPLES_PER_FRAME * sizeof(short), len, len / sizeof(short), howmany); - } else { - ERRORA("SRV=====> req=%d recv=%d to sent=%d sent=%d\n", SKYPIAX_P_LOG, SAMPLES_PER_FRAME * sizeof(short), len, len / sizeof(short), howmany); - switch_sleep(1000); - } - } else { - - if (!p->audiobuf_is_loaded) { - for (i = 0; i < (len / sizeof(short)); i++) { - p->audiobuf[i] = srv_in[i]; - } - p->audiobuf_is_loaded = 1; - } else { - unsigned int howmany; - short totalbuf[SAMPLES_PER_FRAME]; - - howmany = len / 2 ; - for (i = 0; i < howmany; i++) - totalbuf[i] = p->audiobuf[i]; - - howmany = len / 2 ; - for (a = 0; a < howmany; a++) { - totalbuf[i] = srv_in[a]; - i++; - } - - howmany = SAMPLES_PER_FRAME; - - switch_file_write(p->audiopipe[1], totalbuf, &howmany); - p->audiobuf_is_loaded = 0; - DEBUGA_SKYPE("SRV=====> req=%d recv=%d to sent=%d sent=%d\n", SKYPIAX_P_LOG, sizeof(short)*SAMPLES_PER_FRAME, len, SAMPLES_PER_FRAME, howmany); - } - - - - - } - -#if 0 a = 0; for (i = 0; i < len / sizeof(short); i++) { srv_out[a] = srv_in[i]; @@ -208,7 +160,6 @@ //DEBUGA_SKYPE("read=====> req=%d recv=%d to sent=%d sent=%d\n", SKYPIAX_P_LOG, sizeof(short)*SAMPLES_PER_FRAME, len, (len*sizeof(short))/2, howmany); } -#endif } else if (len == 0) { DEBUGA_SKYPE("Skype client GONE\n", SKYPIAX_P_LOG); break; @@ -220,14 +171,14 @@ } } - kill_cli_size = 320; + kill_cli_size = SAMPLES_PER_FRAME * sizeof(short); switch_file_write(p->audiopipe[1], kill_cli_buff, &kill_cli_size); - kill_cli_size = 320; + kill_cli_size = SAMPLES_PER_FRAME * sizeof(short); switch_file_write(p->audioskypepipe[1], kill_cli_buff, &kill_cli_size); p->interface_state = SKYPIAX_STATE_DOWN; - kill_cli_size = 320; + kill_cli_size = SAMPLES_PER_FRAME * sizeof(short); switch_file_write(p->audiopipe[1], kill_cli_buff, &kill_cli_size); - kill_cli_size = 320; + kill_cli_size = SAMPLES_PER_FRAME * sizeof(short); switch_file_write(p->audioskypepipe[1], kill_cli_buff, &kill_cli_size); DEBUGA_SKYPE("Skype client GONE\n", SKYPIAX_P_LOG); @@ -271,9 +222,9 @@ unsigned int fd; #else int len; - //int i; - //int a; - //short cli_in[SAMPLES_PER_FRAME / 2]; + int i; + int a; + short cli_in[SAMPLES_PER_FRAME / 2]; short cli_out[SAMPLES_PER_FRAME]; unsigned int sin_size; int fd; @@ -336,17 +287,9 @@ to.tv_usec = 10000; to.tv_sec = 0; //rt = select(fdselect + 1, &fs, NULL, NULL, &to); - switch_sleep(1000); + switch_sleep(5000); rt = 1; if (rt > 0) { - //got = (SAMPLES_PER_FRAME / 2) * sizeof(short); - got = SAMPLES_PER_FRAME; - switch_file_read(p->audioskypepipe[0], cli_out, &got); - if (got > 0) { - len = send(fd, cli_out, got * sizeof(short), 0); - NOTICA("CLI=====> req=%d recv=%d to sent=%d sent=%d\n", SKYPIAX_P_LOG, SAMPLES_PER_FRAME, got, got*sizeof(short), len); - } -#if 0 got = (SAMPLES_PER_FRAME / 2) * sizeof(short); switch_file_read(p->audioskypepipe[0], cli_in, &got); @@ -370,7 +313,6 @@ switch_sleep(1000); //ERRORA("Audio skype pipe give us: %u\n", SKYPIAX_P_LOG, got); } -#endif } } @@ -409,7 +351,7 @@ 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], 100); if (option_debug > 10) { DEBUGA_PBX("EXITING FUNC\n", SKYPIAX_P_LOG); } @@ -419,7 +361,6 @@ switch_status_t skypiax_skypeaudio_read(private_t * tech_pvt) { struct skypiax_interface *p; - short buf[640]; unsigned int samples; int rt; @@ -427,26 +368,22 @@ //DEBUGA_PBX("ENTERING FUNC\n", SKYPIAX_P_LOG); - memset(buf, '\0', sizeof(buf)); - //switch_sleep(10000); rt = 1; if (rt > 0) { - samples = SAMPLES_PER_FRAME; + samples = SAMPLES_PER_FRAME * sizeof(short); switch_file_read(p->audiopipe[0], tech_pvt->read_frame.data, &samples); - //if ((samples = read(p->audiopipe[0], buf, SAMPLES_PER_FRAME * sizeof(short))) != 320) - if (samples != SAMPLES_PER_FRAME) { - if (samples){ - DEBUGA_SKYPE("SRV=====> NOT GOOD samples=%d expected=%d\n", SKYPIAX_P_LOG, samples, SAMPLES_PER_FRAME); - //tech_pvt->read_frame.datalen = 0; + if (samples != SAMPLES_PER_FRAME * sizeof(short)) { + if (samples) + DEBUGA_SKYPE("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 * sizeof(short); - NOTICA("SRV=====> GOOD samples=%d\n", SKYPIAX_P_LOG, samples); + tech_pvt->read_frame.datalen = samples; + //DEBUGA_SKYPE("read=====> GOOD samples=%d\n", SKYPIAX_P_LOG, samples); /* A real frame */ } } else {

1 0

[commit] r10852 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by FreeSWITCH SVN 17 Dec '08

17 Dec '08

Author: mikej Date: Wed Dec 17 12:02:46 2008 New Revision: 10852 Log: MODENDP-163 fix info dtmf support on some devices that do not send it properly Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Wed Dec 17 12:02:46 2008 @@ -3516,7 +3516,7 @@ int tmp; /* move signal_ptr where we need it (right past Signal=) */ signal_ptr = signal_ptr + 7; - if (*signal_ptr && strlen(signal_ptr) == 1 && is_dtmf(*signal_ptr)) { + if (*signal_ptr && (*signal_ptr == '*' || *signal_ptr == '#' || *signal_ptr == 'A' || *signal_ptr == 'B' || *signal_ptr == 'C' || *signal_ptr == 'D')) { dtmf.digit = *signal_ptr; } else { tmp = atoi(signal_ptr);

1 0

[commit] r10851 - freeswitch/trunk/src/mod/languages/mod_spidermonkey
by FreeSWITCH SVN 17 Dec '08

17 Dec '08

Author: anthm Date: Wed Dec 17 10:35:40 2008 New Revision: 10851 Log: fix seg in js Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c 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 Dec 17 10:35:40 2008 @@ -1778,6 +1778,8 @@ struct js_session *jss = JS_GetPrivate(cx, obj); switch_channel_t *channel; + METHOD_SANITY_CHECK(); + channel = switch_core_session_get_channel(jss->session); if (argc > 1) { @@ -1799,10 +1801,7 @@ struct js_session *jss = JS_GetPrivate(cx, obj); switch_channel_t *channel; - if (!jss || !jss->session) { - *rval = BOOLEAN_TO_JSVAL(JS_FALSE); - return JS_TRUE; - } + METHOD_SANITY_CHECK(); channel = switch_core_session_get_channel(jss->session);

1 0

[commit] r10850 - freeswitch/trunk/conf/autoload_configs
by FreeSWITCH SVN 17 Dec '08

17 Dec '08

Author: brian Date: Wed Dec 17 10:20:32 2008 New Revision: 10850 Log: no 48k flite Modified: freeswitch/trunk/conf/autoload_configs/conference.conf.xml Modified: freeswitch/trunk/conf/autoload_configs/conference.conf.xml ============================================================================== --- freeswitch/trunk/conf/autoload_configs/conference.conf.xml (original) +++ freeswitch/trunk/conf/autoload_configs/conference.conf.xml Wed Dec 17 10:20:32 2008 @@ -172,8 +172,6 @@ <param name="caller-id-name" value="$${outbound_caller_name}"/> <param name="caller-id-number" value="$${outbound_caller_id}"/> <param name="comfort-noise" value="true"/> - <param name="tts-engine" value="flite"/> - <param name="tts-voice" value="kal16"/> </profile> --> </profiles>

1 0

[commit] r10849 - freeswitch/trunk/conf/autoload_configs
by FreeSWITCH SVN 17 Dec '08

17 Dec '08

Author: intralanman Date: Wed Dec 17 09:50:20 2008 New Revision: 10849 Log: lint Modified: freeswitch/trunk/conf/autoload_configs/conference.conf.xml Modified: freeswitch/trunk/conf/autoload_configs/conference.conf.xml ============================================================================== --- freeswitch/trunk/conf/autoload_configs/conference.conf.xml (original) +++ freeswitch/trunk/conf/autoload_configs/conference.conf.xml Wed Dec 17 09:50:20 2008 @@ -172,8 +172,8 @@ <param name="caller-id-name" value="$${outbound_caller_name}"/> <param name="caller-id-number" value="$${outbound_caller_id}"/> <param name="comfort-noise" value="true"/> -  -  + <param name="tts-engine" value="flite"/> + <param name="tts-voice" value="kal16"/> </profile> --> </profiles>

1 0