April 2009 - Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r13113 - in freeswitch/trunk/src: include mod/applications/mod_limit
by FreeSWITCH SVN 22 Apr '09

22 Apr '09

Author: anthm Date: Wed Apr 22 10:02:32 2009 New Revision: 13113 Log: MODAPP-264 prevent multiple bindings of the same event_hooks to make code simpler in mod_limit Modified: freeswitch/trunk/src/include/switch_core_event_hook.h freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.c Modified: freeswitch/trunk/src/include/switch_core_event_hook.h ============================================================================== --- freeswitch/trunk/src/include/switch_core_event_hook.h (original) +++ freeswitch/trunk/src/include/switch_core_event_hook.h Wed Apr 22 10:02:32 2009 @@ -183,12 +183,12 @@ assert(_NAME != NULL); \ for (ptr = session->event_hooks._NAME; ptr && ptr->next; ptr = ptr->next) \ if (ptr->_NAME == _NAME) return SWITCH_STATUS_FALSE; \ + if (ptr && ptr->_NAME == _NAME) return SWITCH_STATUS_FALSE; \ if ((hook = switch_core_session_alloc(session, sizeof(*hook))) != 0) { \ hook->_NAME = _NAME ; \ if (! session->event_hooks._NAME ) { \ session->event_hooks._NAME = hook; \ } else { \ - for (ptr = session->event_hooks._NAME; ptr && ptr->next; ptr = ptr->next); \ ptr->next = hook; \ } \ return SWITCH_STATUS_SUCCESS; \ 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 Wed Apr 22 10:02:32 2009 @@ -67,7 +67,6 @@ } limit_hash_item_t; typedef struct { - uint8_t have_state_handler; switch_hash_t *hash; } limit_hash_private_t; @@ -377,7 +376,7 @@ /* Remove handler */ switch_core_event_hook_remove_state_change(session, hash_state_handler); - pvt->have_state_handler = 0; + switch_mutex_unlock(globals.limit_hash_mutex); } @@ -778,7 +777,6 @@ char buf[80] = ""; callback_t cbt = { 0 }; switch_channel_t *channel = switch_core_session_get_channel(session); - switch_bool_t new_channel = SWITCH_FALSE; if (!switch_strlen_zero(data)) { mydata = switch_core_session_strdup(session, data); @@ -812,7 +810,6 @@ } - new_channel = !switch_channel_get_variable(channel, "limit_realm"); switch_channel_set_variable(channel, "limit_realm", realm); switch_channel_set_variable(channel, "limit_id", id); switch_channel_set_variable(channel, "limit_max", argv[2]); @@ -829,9 +826,9 @@ goto done; } - if (new_channel) { - switch_core_event_hook_add_state_change(session, db_state_handler); - } + switch_core_event_hook_add_state_change(session, db_state_handler); + switch_core_event_hook_add_state_change(session, db_state_handler); + sql = switch_mprintf("insert into limit_data (hostname, realm, id, uuid) values('%q','%q','%q','%q');", globals.hostname, realm, id, switch_core_session_get_uuid(session)); @@ -1025,11 +1022,9 @@ switch_channel_set_variable(channel, "limit_rate", srate); switch_channel_set_variable(channel, switch_core_session_sprintf(session, "limit_rate_%s", hashkey), srate); } - - if (!pvt->have_state_handler) { - switch_core_event_hook_add_state_change(session, hash_state_handler); - pvt->have_state_handler = 1; - } + + switch_core_event_hook_add_state_change(session, hash_state_handler); + end: switch_mutex_unlock(globals.limit_hash_mutex);

1 0

[commit] r13112 - in freeswitch/trunk/src/mod/languages/mod_managed: . managed
by FreeSWITCH SVN 21 Apr '09

21 Apr '09

Author: mikej Date: Tue Apr 21 18:27:53 2009 New Revision: 13112 Log: swigall Modified: freeswitch/trunk/src/mod/languages/mod_managed/freeswitch_wrap.cxx freeswitch/trunk/src/mod/languages/mod_managed/managed/swig.cs Modified: freeswitch/trunk/src/mod/languages/mod_managed/freeswitch_wrap.cxx ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_managed/freeswitch_wrap.cxx (original) +++ freeswitch/trunk/src/mod/languages/mod_managed/freeswitch_wrap.cxx Tue Apr 21 18:27:53 2009 @@ -19439,6 +19439,18 @@ } +SWIGEXPORT int SWIGSTDCALL CSharp_switch_channel_direction(void * jarg1) { + int jresult ; + switch_channel_t *arg1 = (switch_channel_t *) 0 ; + switch_call_direction_t result; + + arg1 = (switch_channel_t *)jarg1; + result = (switch_call_direction_t)switch_channel_direction(arg1); + jresult = result; + return jresult; +} + + SWIGEXPORT int SWIGSTDCALL CSharp_switch_buffer_create(void * jarg1, void * jarg2, void * jarg3) { int jresult ; switch_memory_pool_t *arg1 = (switch_memory_pool_t *) 0 ; Modified: freeswitch/trunk/src/mod/languages/mod_managed/managed/swig.cs ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_managed/managed/swig.cs (original) +++ freeswitch/trunk/src/mod/languages/mod_managed/managed/swig.cs Tue Apr 21 18:27:53 2009 @@ -2703,6 +2703,11 @@ freeswitchPINVOKE.switch_channel_set_hangup_time(SWIGTYPE_p_switch_channel.getCPtr(channel)); } + public static switch_call_direction_t switch_channel_direction(SWIGTYPE_p_switch_channel channel) { + switch_call_direction_t ret = (switch_call_direction_t)freeswitchPINVOKE.switch_channel_direction(SWIGTYPE_p_switch_channel.getCPtr(channel)); + return ret; + } + public static switch_status_t switch_buffer_create(SWIGTYPE_p_apr_pool_t pool, SWIGTYPE_p_p_switch_buffer buffer, SWIGTYPE_p_switch_size_t max_len) { switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_buffer_create(SWIGTYPE_p_apr_pool_t.getCPtr(pool), SWIGTYPE_p_p_switch_buffer.getCPtr(buffer), SWIGTYPE_p_switch_size_t.getCPtr(max_len)); if (freeswitchPINVOKE.SWIGPendingException.Pending) throw freeswitchPINVOKE.SWIGPendingException.Retrieve(); @@ -9121,6 +9126,9 @@ [DllImport("mod_managed", EntryPoint="CSharp_switch_channel_set_hangup_time")] public static extern void switch_channel_set_hangup_time(HandleRef jarg1); + [DllImport("mod_managed", EntryPoint="CSharp_switch_channel_direction")] + public static extern int switch_channel_direction(HandleRef jarg1); + [DllImport("mod_managed", EntryPoint="CSharp_switch_buffer_create")] public static extern int switch_buffer_create(HandleRef jarg1, HandleRef jarg2, HandleRef jarg3); @@ -20372,6 +20380,8 @@ SWITCH_EVENT_SESSION_HEARTBEAT, SWITCH_EVENT_CLIENT_DISCONNECTED, SWITCH_EVENT_SERVER_DISCONNECTED, + SWITCH_EVENT_SEND_INFO, + SWITCH_EVENT_RECV_INFO, SWITCH_EVENT_ALL }

1 0

[commit] r13111 - freeswitch/trunk/src/include
by FreeSWITCH SVN 21 Apr '09

21 Apr '09

Author: anthm Date: Tue Apr 21 17:51:28 2009 New Revision: 13111 Log: make state_handler macros not let you install the same one more than once Modified: freeswitch/trunk/src/include/switch_core_event_hook.h Modified: freeswitch/trunk/src/include/switch_core_event_hook.h ============================================================================== --- freeswitch/trunk/src/include/switch_core_event_hook.h (original) +++ freeswitch/trunk/src/include/switch_core_event_hook.h Tue Apr 21 17:51:28 2009 @@ -181,6 +181,8 @@ { \ switch_io_event_hook_##_NAME##_t *hook, *ptr; \ assert(_NAME != NULL); \ + for (ptr = session->event_hooks._NAME; ptr && ptr->next; ptr = ptr->next) \ + if (ptr->_NAME == _NAME) return SWITCH_STATUS_FALSE; \ if ((hook = switch_core_session_alloc(session, sizeof(*hook))) != 0) { \ hook->_NAME = _NAME ; \ if (! session->event_hooks._NAME ) { \

1 0

[commit] r13110 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by FreeSWITCH SVN 21 Apr '09

21 Apr '09

Author: stkn Date: Tue Apr 21 17:43:18 2009 New Revision: 13110 Log: Change call counter status output for consistency Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Tue Apr 21 17:43:18 2009 @@ -1672,10 +1672,10 @@ stream->write_function(stream, "AGGRESSIVENAT \t%s\n", sofia_test_pflag(profile, PFLAG_AGGRESSIVE_NAT_DETECTION) ? "true" : "false"); stream->write_function(stream, "STUN-ENABLED \t%s\n", sofia_test_pflag(profile, PFLAG_STUN_ENABLED) ? "true" : "false"); stream->write_function(stream, "STUN-AUTO-DISABLE\t%s\n", sofia_test_pflag(profile, PFLAG_STUN_AUTO_DISABLE) ? "true" : "false"); - stream->write_function(stream, "CallsIN \t%d\n", profile->ib_calls); - stream->write_function(stream, "FailedCallsIN \t%d\n", profile->ib_failed_calls); - stream->write_function(stream, "CallsOUT \t%d\n", profile->ob_calls); - stream->write_function(stream, "FailedCallsOUT \t%d\n", profile->ob_failed_calls); + stream->write_function(stream, "CALLS-IN \t%d\n", profile->ib_calls); + stream->write_function(stream, "FAILED-CALLS-IN \t%d\n", profile->ib_failed_calls); + stream->write_function(stream, "CALLS-OUT \t%d\n", profile->ob_calls); + stream->write_function(stream, "FAILED-CALLS-OUT \t%d\n", profile->ob_failed_calls); } stream->write_function(stream, "\nRegistrations:\n%s\n", line);

1 0

[commit] r13109 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by FreeSWITCH SVN 21 Apr '09

21 Apr '09

Author: brian Date: Tue Apr 21 17:26:21 2009 New Revision: 13109 Log: cleanup Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Tue Apr 21 17:26:21 2009 @@ -1670,8 +1670,8 @@ stream->write_function(stream, "LATE-NEG \t%s\n", sofia_test_flag(profile, TFLAG_LATE_NEGOTIATION) ? "true" : "false"); stream->write_function(stream, "PROXY-MEDIA \t%s\n", sofia_test_flag(profile, TFLAG_PROXY_MEDIA) ? "true" : "false"); stream->write_function(stream, "AGGRESSIVENAT \t%s\n", sofia_test_pflag(profile, PFLAG_AGGRESSIVE_NAT_DETECTION) ? "true" : "false"); - stream->write_function(stream, "STUN_ENABLED \t%s\n", sofia_test_pflag(profile, PFLAG_STUN_ENABLED) ? "true" : "false"); - stream->write_function(stream, "STUN_AUTO_DISABLE\t%s\n", sofia_test_pflag(profile, PFLAG_STUN_AUTO_DISABLE) ? "true" : "false"); + stream->write_function(stream, "STUN-ENABLED \t%s\n", sofia_test_pflag(profile, PFLAG_STUN_ENABLED) ? "true" : "false"); + stream->write_function(stream, "STUN-AUTO-DISABLE\t%s\n", sofia_test_pflag(profile, PFLAG_STUN_AUTO_DISABLE) ? "true" : "false"); stream->write_function(stream, "CallsIN \t%d\n", profile->ib_calls); stream->write_function(stream, "FailedCallsIN \t%d\n", profile->ib_failed_calls); stream->write_function(stream, "CallsOUT \t%d\n", profile->ob_calls);

1 0

[commit] r13108 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by FreeSWITCH SVN 21 Apr '09

21 Apr '09

Author: brian Date: Tue Apr 21 17:02:20 2009 New Revision: 13108 Log: thanks stnk Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Tue Apr 21 17:02:20 2009 @@ -1857,7 +1857,7 @@ stream->write_function(stream, " <nomedia>%s</nomedia>\n", sofia_test_flag(profile, TFLAG_INB_NOMEDIA) ? "true" : "false"); stream->write_function(stream, " <late-neg>%s</late-neg>\n", sofia_test_flag(profile, TFLAG_LATE_NEGOTIATION) ? "true" : "false"); stream->write_function(stream, " <proxy-media>%s</proxy-media>\n", sofia_test_flag(profile, TFLAG_PROXY_MEDIA) ? "true" : "false"); - stream->write_function(stream, " <aggressivenat>%s</aggressive-nat>\n", + stream->write_function(stream, " <aggressive-nat>%s</aggressive-nat>\n", sofia_test_pflag(profile, PFLAG_AGGRESSIVE_NAT_DETECTION) ? "true" : "false"); stream->write_function(stream, " <stun-enabled>%s</stun-enabled>\n", sofia_test_pflag(profile, PFLAG_STUN_ENABLED) ? "true" : "false"); stream->write_function(stream, " <stun-auto-disable>%s</stun-auto-disable>\n",

1 0

[commit] r13107 - freeswitch/trunk/libs/xmlrpc-c/lib/abyss/src
by FreeSWITCH SVN 21 Apr '09

21 Apr '09

Author: anthm Date: Tue Apr 21 16:43:05 2009 New Revision: 13107 Log: add select to read socket in abyss so we can timeout Modified: freeswitch/trunk/libs/xmlrpc-c/lib/abyss/src/socket_unix.c Modified: freeswitch/trunk/libs/xmlrpc-c/lib/abyss/src/socket_unix.c ============================================================================== --- freeswitch/trunk/libs/xmlrpc-c/lib/abyss/src/socket_unix.c (original) +++ freeswitch/trunk/libs/xmlrpc-c/lib/abyss/src/socket_unix.c Tue Apr 21 16:43:05 2009 @@ -227,7 +227,19 @@ struct socketUnix * const socketUnixP = channelP->implP; int rc; - rc = recv(socketUnixP->fd, buffer, bufferSize, 0); + fd_set rfds, efds; + struct timeval tv = { 10, 0 }; + + FD_ZERO(&rfds); + FD_ZERO(&efds); + FD_SET(socketUnixP->fd, &rfds); + FD_SET(socketUnixP->fd, &efds); + + if ((rc = select(socketUnixP->fd + 1, &rfds, NULL, &efds, &tv)) > 0) { + rc = recv(socketUnixP->fd, buffer, bufferSize, 0); + } else { + rc = -1; + } if (rc < 0) { *failedP = TRUE;

1 0

[commit] r13106 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by FreeSWITCH SVN 21 Apr '09

21 Apr '09

Author: brian Date: Tue Apr 21 15:24:44 2009 New Revision: 13106 Log: hrm, remove the uppercase first letter on these. Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Tue Apr 21 15:24:44 2009 @@ -1918,7 +1918,7 @@ } stream->write_function(stream, "%s\n", header); - stream->write_function(stream, "<Profiles>\n"); + stream->write_function(stream, "<profiles>\n"); switch_mutex_lock(mod_sofia_globals.hash_mutex); for (hi = switch_hash_first(NULL, mod_sofia_globals.profile_hash); hi; hi = switch_hash_next(hi)) { switch_hash_this(hi, &vvar, NULL, &val); @@ -1927,9 +1927,9 @@ if (strcmp(vvar, profile->name)) { ac++; - stream->write_function(stream, "<alias>\n<Name>%s</Name>\n<Type>%s</Type>\n<Data>%s</Data>\n<State>%s</State>\n</alias>\n", vvar, "alias", profile->name, "ALIASED"); + stream->write_function(stream, "<alias>\n<name>%s</name>\n<type>%s</type>\n<data>%s</data>\n<state>%s</state>\n</alias>\n", vvar, "alias", profile->name, "ALIASED"); } else { - stream->write_function(stream, "<profile>\n<Name>%s</Name>\n<Type>%s</Type>\n<Data>%s</Data>\n<State>%s (%u)</State>\n</profile>\n", profile->name, "profile", profile->url, + stream->write_function(stream, "<profile>\n<name>%s</name>\n<type>%s</type>\n<data>%s</data>\n<state>%s (%u)</state>\n</profile>\n", profile->name, "profile", profile->url, sofia_test_pflag(profile, PFLAG_RUNNING) ? "RUNNING" : "DOWN", profile->inuse); if (sofia_test_pflag(profile, PFLAG_TLS)) { @@ -1941,7 +1941,7 @@ for (gp = profile->gateways; gp; gp = gp->next) { switch_assert(gp->state < REG_STATE_LAST); - stream->write_function(stream, "<gateway>\n<Name>%s</Name>\n<Type>%s</Type>\n<Data>%s</Data>\n<State>%s</State>\n</gateway>\n", gp->name, "gateway", gp->register_to, sofia_state_names[gp->state]); + stream->write_function(stream, "<gateway>\n<name>%s</name>\n<type>%s</type>\n<data>%s</data>\n<state>%s</state>\n</gateway>\n", gp->name, "gateway", gp->register_to, sofia_state_names[gp->state]); if (gp->state == REG_STATE_FAILED || gp->state == REG_STATE_TRYING) { time_t now = switch_epoch_time_now(NULL); if (gp->retry > now) { @@ -1956,7 +1956,7 @@ } } switch_mutex_unlock(mod_sofia_globals.hash_mutex); - stream->write_function(stream, "</Profiles>\n"); + stream->write_function(stream, "</profiles>\n"); return SWITCH_STATUS_SUCCESS; }

1 0

[commit] r13105 - freeswitch/trunk/src
by FreeSWITCH SVN 21 Apr '09

21 Apr '09

Author: anthm Date: Tue Apr 21 14:32:55 2009 New Revision: 13105 Log: add record_ms, record_samples, playback_ms and playback_samples chanvars Modified: freeswitch/trunk/src/switch_ivr_play_say.c Modified: freeswitch/trunk/src/switch_ivr_play_say.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_play_say.c (original) +++ freeswitch/trunk/src/switch_ivr_play_say.c Tue Apr 21 14:32:55 2009 @@ -634,6 +634,9 @@ } } + switch_channel_set_variable_printf(channel, "record_ms", "%d", fh->samples_in / read_impl.samples_per_second); + switch_channel_set_variable_printf(channel, "record_samples", "%d", fh->samples_in); + switch_core_file_close(fh); switch_core_session_reset(session, SWITCH_TRUE, SWITCH_TRUE); return status; @@ -1280,6 +1283,10 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "done playing file\n"); //switch_core_file_seek(fh, &fh->last_pos, 0, SEEK_CUR); + + switch_channel_set_variable_printf(channel, "playback_ms", "%d", fh->samples_out / read_impl.samples_per_second); + switch_channel_set_variable_printf(channel, "playback_samples", "%d", fh->samples_out); + switch_core_file_close(fh); switch_buffer_destroy(&fh->audio_buffer); switch_buffer_destroy(&fh->sp_audio_buffer);

1 0

[commit] r13104 - freeswitch/trunk/src/mod/applications/mod_conference
by FreeSWITCH SVN 21 Apr '09

21 Apr '09

Author: anthm Date: Tue Apr 21 13:53:54 2009 New Revision: 13104 Log: increase sanity timer for conference auto-record to 120 seconds Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c (original) +++ freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Tue Apr 21 13:53:54 2009 @@ -909,7 +909,7 @@ switch_mutex_unlock(globals.hash_mutex); if (conference->auto_record) { - uint32_t sanity = 100; + uint32_t sanity = 1200; while (!conference->members && --sanity) { switch_yield(100000);

1 0