- Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r11005 - freeswitch/trunk/src/mod/endpoints/mod_iax
by FreeSWITCH SVN 30 Dec '08

30 Dec '08

Author: anthm Date: Tue Dec 30 13:23:42 2008 New Revision: 11005 Log: update Modified: freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.c Modified: freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.c Tue Dec 30 13:23:42 2008 @@ -496,6 +496,7 @@ switch_clear_flag_locked(tech_pvt, TFLAG_IO); switch_clear_flag_locked(tech_pvt, TFLAG_VOICE); + switch_clear_flag_locked(tech_pvt, TFLAG_CODEC); if (tech_pvt->read_codec.implementation) { switch_core_codec_destroy(&tech_pvt->read_codec); @@ -1079,17 +1080,16 @@ case IAX_EVENT_VOICE: if (tech_pvt && (tech_pvt->read_frame.datalen = iaxevent->datalen) != 0) { if (channel && switch_channel_get_state(channel) <= CS_HANGUP) { - int bytes, frames; + int bytes = 0, frames = 1; - if (!switch_test_flag(tech_pvt, TFLAG_CODEC)) { + if (!switch_test_flag(tech_pvt, TFLAG_CODEC) || !tech_pvt->read_codec.implementation) { + switch_channel_hangup(channel, SWITCH_CAUSE_NORMAL_CLEARING); break; } - + if (tech_pvt->read_codec.implementation->encoded_bytes_per_packet) { bytes = tech_pvt->read_codec.implementation->encoded_bytes_per_packet; frames = (int) (tech_pvt->read_frame.datalen / bytes); - } else { - frames = 1; } tech_pvt->read_frame.samples = frames * tech_pvt->read_codec.implementation->samples_per_packet;

1 0

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

30 Dec '08

Author: gmaruzz Date: Tue Dec 30 13:05:21 2008 New Revision: 11004 Log: skypiax: report caller name and number Modified: freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/skypiax_protocol.c 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 Tue Dec 30 13:05:21 2008 @@ -1650,9 +1650,9 @@ if ((tech_pvt->caller_profile = switch_caller_profile_new(switch_core_session_get_pool(session), - "skypiax", "XML", "gmaruzz_from_skype", - "calling_number", NULL, "calling_ani", - NULL, NULL, "mod_skypiax", "default", + "skypiax", "XML", p->callid_name, + p->callid_number, NULL, "calling_ani", + NULL, NULL, "mod_skypiax", "public", "5000")) != 0) { char name[128]; switch_snprintf(name, sizeof(name), "skypiax/%s-%04x",

1 0

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

30 Dec '08

Author: mrene Date: Tue Dec 30 12:08:00 2008 New Revision: 11003 Log: MODAPP-188 Cleanup the limit_realm channel variable so we re-register the state handler if limit is called again 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 Tue Dec 30 12:08:00 2008 @@ -285,6 +285,8 @@ limit_execute_sql(sql, globals.mutex); switch_safe_free(sql); switch_core_event_hook_remove_state_change(session, db_state_handler); + /* Remove limit_realm variable so we register another hook if limit is called again */ + switch_channel_set_variable(channel, "limit_realm", ""); } return SWITCH_STATUS_SUCCESS; }

1 0

[commit] r11002 - freeswitch/trunk/src
by FreeSWITCH SVN 30 Dec '08

30 Dec '08

Author: mikej Date: Tue Dec 30 10:45:17 2008 New Revision: 11002 Log: remove media bugs on hangup before api_hangup_hook is run Modified: freeswitch/trunk/src/switch_core_state_machine.c Modified: freeswitch/trunk/src/switch_core_state_machine.c ============================================================================== --- freeswitch/trunk/src/switch_core_state_machine.c (original) +++ freeswitch/trunk/src/switch_core_state_machine.c Tue Dec 30 10:45:17 2008 @@ -399,6 +399,8 @@ STATE_MACRO(hangup, "HANGUP"); + switch_core_media_bug_remove_all(session); + hook_var = switch_channel_get_variable(session->channel, SWITCH_API_HANGUP_HOOK_VARIABLE); if (switch_true(switch_channel_get_variable(session->channel, SWITCH_SESSION_IN_HANGUP_HOOK_VARIABLE))) { use_session = session;

1 0

[commit] r11001 - freeswitch/trunk/build
by FreeSWITCH SVN 30 Dec '08

30 Dec '08

Author: brian Date: Tue Dec 30 10:10:20 2008 New Revision: 11001 Log: bump sounds version Modified: freeswitch/trunk/build/sounds_version.txt Modified: freeswitch/trunk/build/sounds_version.txt ============================================================================== --- freeswitch/trunk/build/sounds_version.txt (original) +++ freeswitch/trunk/build/sounds_version.txt Tue Dec 30 10:10:20 2008 @@ -1 +1 @@ -1.0.6 +1.0.7

1 0

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

30 Dec '08

Author: gmaruzz Date: Tue Dec 30 06:53:18 2008 New Revision: 11000 Log: skypiax: now makes outgoing calls and close them almost correctly Modified: freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/mod_skypiax.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 Tue Dec 30 06:53:18 2008 @@ -511,7 +511,8 @@ switch_core_session_add_stream(*new_session, NULL); if ((tech_pvt = (private_t *) switch_core_session_alloc(*new_session, sizeof(private_t))) != 0) { - tech_pvt->p = &globals.SKYPIAX_INTERFACES[2]; //FIXME + tech_pvt->p = &globals.SKYPIAX_INTERFACES[19]; //FIXME + globals.SKYPIAX_INTERFACES[19].tech_pvt = tech_pvt; //FIXME channel = switch_core_session_get_channel(*new_session); skypiax_tech_init(tech_pvt, *new_session, NULL); } else { @@ -588,8 +589,17 @@ if (channel) { switch_channel_hangup(channel, SWITCH_CAUSE_NORMAL_CLEARING); //DEBUGA_SKYPE("after channel_on_hangup\n", SKYPIAX_P_LOG); - } - } + + } else { + ERRORA("no channel?\n", SKYPIAX_P_LOG); + } + + } else { + ERRORA("no session?\n", SKYPIAX_P_LOG); + } + + } else { + ERRORA("no tech_pvt?\n", SKYPIAX_P_LOG); } p->interface_state = SKYPIAX_STATE_DOWN; global_session = NULL; //FIXME

1 0

[commit] r10999 - freeswitch/trunk/libs/esl
by FreeSWITCH SVN 30 Dec '08

30 Dec '08

Author: mikej Date: Mon Dec 29 20:55:59 2008 New Revision: 10999 Log: set default level Modified: freeswitch/trunk/libs/esl/fs_cli.c Modified: freeswitch/trunk/libs/esl/fs_cli.c ============================================================================== --- freeswitch/trunk/libs/esl/fs_cli.c (original) +++ freeswitch/trunk/libs/esl/fs_cli.c Mon Dec 29 20:55:59 2008 @@ -274,7 +274,7 @@ signal(SIGINT, handle_SIGINT); handle.debug = 0; - esl_global_set_default_logger(2); /* default debug level to 2 */ + esl_global_set_default_logger(3); /* default debug level to 3 (error) */ for(;;) { int option_index = 0;

1 0

[commit] r10998 - freeswitch/trunk/libs/esl
by FreeSWITCH SVN 30 Dec '08

30 Dec '08

Author: silik0n Date: Mon Dec 29 20:24:32 2008 New Revision: 10998 Log: tweak Modified: freeswitch/trunk/libs/esl/fs_cli.c Modified: freeswitch/trunk/libs/esl/fs_cli.c ============================================================================== --- freeswitch/trunk/libs/esl/fs_cli.c (original) +++ freeswitch/trunk/libs/esl/fs_cli.c Mon Dec 29 20:24:32 2008 @@ -274,7 +274,7 @@ signal(SIGINT, handle_SIGINT); handle.debug = 0; - esl_global_set_default_logger(0); /* default debug level to 0 */ + esl_global_set_default_logger(2); /* default debug level to 2 */ for(;;) { int option_index = 0;

1 0

[commit] r10997 - freeswitch/trunk/libs/esl
by FreeSWITCH SVN 30 Dec '08

30 Dec '08

Author: anthm Date: Mon Dec 29 19:31:15 2008 New Revision: 10997 Log: update Modified: freeswitch/trunk/libs/esl/fs_cli.c Modified: freeswitch/trunk/libs/esl/fs_cli.c ============================================================================== --- freeswitch/trunk/libs/esl/fs_cli.c (original) +++ freeswitch/trunk/libs/esl/fs_cli.c Mon Dec 29 19:31:15 2008 @@ -83,30 +83,26 @@ if (!esl_strlen_zero(type)) { if (!strcasecmp(type, "log/data")) { - int level = 0, tchannel = 0; + int level = 0; const char *lname = esl_event_get_header(handle->last_event, "log-level"); - const char *channel = esl_event_get_header(handle->last_event, "text-channel"); - //const char *file = esl_event_get_header(handle->last_event, "log-file"); - - if (channel) { - tchannel = atoi(channel); - } - +#ifdef WIN32 + DWORD len = (DWORD) strlen(handle->last_event->body); + DWORD outbytes = 0; +#endif if (lname) { level = atoi(lname); } - if (tchannel == 0) { + #ifdef WIN32 - DWORD len = (DWORD) strlen(handle->last_event->body); - DWORD outbytes = 0; - SetConsoleTextAttribute(hStdout, COLORS[level]); - WriteFile(hStdout, handle->last_event->body, len, &outbytes, NULL); - SetConsoleTextAttribute(hStdout, wOldColorAttrs); + + SetConsoleTextAttribute(hStdout, COLORS[level]); + WriteFile(hStdout, handle->last_event->body, len, &outbytes, NULL); + SetConsoleTextAttribute(hStdout, wOldColorAttrs); #else - printf("%s%s%s", COLORS[level], handle->last_event->body, ESL_SEQ_DEFAULT_COLOR); + printf("%s%s%s", COLORS[level], handle->last_event->body, ESL_SEQ_DEFAULT_COLOR); #endif - } + known++; } else if (!strcasecmp(type, "text/disconnect-notice")) { running = thread_running = 0;

1 0

[commit] r10996 - freeswitch/trunk/src
by FreeSWITCH SVN 29 Dec '08

29 Dec '08

Author: anthm Date: Mon Dec 29 18:38:59 2008 New Revision: 10996 Log: dont transmit console replies over the logger engine Modified: freeswitch/trunk/src/switch_console.c Modified: freeswitch/trunk/src/switch_console.c ============================================================================== --- freeswitch/trunk/src/switch_console.c (original) +++ freeswitch/trunk/src/switch_console.c Mon Dec 29 18:38:59 2008 @@ -249,10 +249,18 @@ SWITCH_STANDARD_STREAM(stream); if (stream.data) { + FILE *handle = switch_core_get_console(); + if (switch_api_execute(cmd, arg, NULL, &stream) == SWITCH_STATUS_SUCCESS) { - switch_log_printf(SWITCH_CHANNEL_LOG_CLEAN, SWITCH_LOG_CONSOLE, "API CALL [%s(%s)] output:\n%s\n", cmd, arg ? arg : "", (char *) stream.data); + if (handle) { + fprintf(handle, "API CALL [%s(%s)] output:\n%s\n", cmd, arg ? arg : "", (char *) stream.data); + fflush(handle); + } } else { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "Unknown Command: %s\n", cmd); + if (handle) { + fprintf(handle, "Unknown Command: %s\n", cmd); + fflush(handle); + } } free(stream.data); } else {

1 0