November 2008 - Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r10348 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/nua
by FreeSWITCH SVN 12 Nov '08

12 Nov '08

Author: anthm Date: Wed Nov 12 06:55:47 2008 New Revision: 10348 Log: Tue Oct 2 10:51:22 EDT 2007 Mikhail Zabaluev <mikhail.zabaluev(a)nokia.com> * outbound.c: Do keepalives even when no NAT was detected Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/outbound.c Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Wed Nov 12 06:55:47 2008 @@ -1 +1 @@ -Mon Oct 6 17:52:55 EDT 2008 +Wed Nov 12 11:22:49 EST 2008 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/outbound.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/outbound.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/outbound.c Wed Nov 12 06:55:47 2008 @@ -677,7 +677,7 @@ interval = ob->ob_prefs.interval; need_to_validate = ob->ob_prefs.validate && !ob->ob_validated; - if (!ob->ob_nat_detected || !register_transaction || + if (!register_transaction || !(need_to_validate || interval != 0)) { outbound_stop_keepalive(ob); return;

1 0

[commit] r10347 - freeswitch/trunk/src/mod/applications/mod_commands
by FreeSWITCH SVN 12 Nov '08

12 Nov '08

Author: mikej Date: Wed Nov 12 06:46:44 2008 New Revision: 10347 Log: (FSCORE-217) Add support for passing the cause of hangup to the uuid_kill command Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c (original) +++ freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c Wed Nov 12 06:46:44 2008 @@ -921,26 +921,39 @@ return SWITCH_STATUS_SUCCESS; } -#define KILL_SYNTAX "<uuid>" +#define KILL_SYNTAX "<uuid> [cause]" SWITCH_STANDARD_API(kill_function) { switch_core_session_t *ksession = NULL; + char *mycmd = NULL, *kcause = NULL; + switch_call_cause_t cause = SWITCH_CAUSE_NORMAL_CLEARING; if (session) { return SWITCH_STATUS_FALSE; } - if (!cmd) { + if (switch_strlen_zero(cmd) || !(mycmd = strdup(cmd))) { stream->write_function(stream, "-USAGE: %s\n", KILL_SYNTAX); - } else if ((ksession = switch_core_session_locate(cmd))) { + return SWITCH_STATUS_SUCCESS; + } + + if ((kcause = strchr(mycmd, ' '))) { + *kcause++ = '\0'; + } + + if (switch_strlen_zero(mycmd) || !(ksession = switch_core_session_locate(mycmd))) { + stream->write_function(stream, "-ERR No Such Channel!\n"); + } else { switch_channel_t *channel = switch_core_session_get_channel(ksession); - switch_channel_hangup(channel, SWITCH_CAUSE_NORMAL_CLEARING); + if (!switch_strlen_zero(kcause)){ + cause = switch_channel_str2cause(kcause); + } + switch_channel_hangup(channel, cause); switch_core_session_rwunlock(ksession); stream->write_function(stream, "+OK\n"); - } else { - stream->write_function(stream, "-ERR No Such Channel!\n"); } + switch_safe_free(mycmd); return SWITCH_STATUS_SUCCESS; }

1 0

[commit] r10346 - in freeswitch/trunk/src: . include
by FreeSWITCH SVN 12 Nov '08

12 Nov '08

Author: anthm Date: Wed Nov 12 06:44:13 2008 New Revision: 10346 Log: possible fix for FSCORE-221 Modified: freeswitch/trunk/src/include/switch_core.h freeswitch/trunk/src/switch_core_media_bug.c freeswitch/trunk/src/switch_core_session.c freeswitch/trunk/src/switch_ivr_async.c Modified: freeswitch/trunk/src/include/switch_core.h ============================================================================== --- freeswitch/trunk/src/include/switch_core.h (original) +++ freeswitch/trunk/src/include/switch_core.h Wed Nov 12 06:44:13 2008 @@ -212,6 +212,9 @@ */ SWITCH_DECLARE(switch_status_t) switch_core_media_bug_read(_In_ switch_media_bug_t *bug, _In_ switch_frame_t *frame); +SWITCH_DECLARE(void) switch_core_media_bug_flush(_In_ switch_media_bug_t *bug); +SWITCH_DECLARE(switch_status_t) switch_core_media_bug_flush_all(_In_ switch_core_session_t *session); + ///\} ///\defgroup pa1 Port Allocation Modified: freeswitch/trunk/src/switch_core_media_bug.c ============================================================================== --- freeswitch/trunk/src/switch_core_media_bug.c (original) +++ freeswitch/trunk/src/switch_core_media_bug.c Wed Nov 12 06:44:13 2008 @@ -76,6 +76,12 @@ return bug->user_data; } +SWITCH_DECLARE(void) switch_core_media_bug_flush(switch_media_bug_t *bug) +{ + switch_buffer_zero(bug->raw_read_buffer); + switch_buffer_zero(bug->raw_write_buffer); +} + SWITCH_DECLARE(switch_status_t) switch_core_media_bug_read(switch_media_bug_t *bug, switch_frame_t *frame) { uint32_t bytes = 0; @@ -265,9 +271,27 @@ } +SWITCH_DECLARE(switch_status_t) switch_core_media_bug_flush_all(switch_core_session_t *session) +{ + switch_media_bug_t *bp; + + if (session->bugs) { + switch_thread_rwlock_wrlock(session->bug_rwlock); + for (bp = session->bugs; bp; bp = bp->next) { + switch_core_media_bug_flush(bp); + } + switch_thread_rwlock_unlock(session->bug_rwlock); + return SWITCH_STATUS_SUCCESS; + } + + return SWITCH_STATUS_FALSE; +} + + SWITCH_DECLARE(switch_status_t) switch_core_media_bug_remove_all(switch_core_session_t *session) { switch_media_bug_t *bp; + switch_status_t status = SWITCH_STATUS_FALSE; if (session->bugs) { switch_thread_rwlock_wrlock(session->bug_rwlock); @@ -285,7 +309,7 @@ } session->bugs = NULL; switch_thread_rwlock_unlock(session->bug_rwlock); - return SWITCH_STATUS_SUCCESS; + status = SWITCH_STATUS_SUCCESS; } if (session->bug_codec.implementation) { @@ -293,7 +317,7 @@ memset(&session->bug_codec, 0, sizeof(session->bug_codec)); } - return SWITCH_STATUS_FALSE; + return status; } SWITCH_DECLARE(switch_status_t) switch_core_media_bug_close(switch_media_bug_t **bug) Modified: freeswitch/trunk/src/switch_core_session.c ============================================================================== --- freeswitch/trunk/src/switch_core_session.c (original) +++ freeswitch/trunk/src/switch_core_session.c Wed Nov 12 06:44:13 2008 @@ -742,6 +742,7 @@ switch_clear_flag(session, SSF_WARN_TRANSCODE); switch_ivr_deactivate_unicast(session); switch_channel_clear_flag(channel, CF_BREAK); + switch_core_media_bug_flush_all(session); } Modified: freeswitch/trunk/src/switch_ivr_async.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_async.c (original) +++ freeswitch/trunk/src/switch_ivr_async.c Wed Nov 12 06:44:13 2008 @@ -913,22 +913,18 @@ static switch_bool_t inband_dtmf_callback(switch_media_bug_t *bug, void *user_data, switch_abc_type_t type) { switch_inband_dtmf_t *pvt = (switch_inband_dtmf_t *) user_data; - uint8_t data[SWITCH_RECOMMENDED_BUFFER_SIZE]; - switch_frame_t frame = { 0 }; + switch_frame_t *frame = NULL; char digit_str[80]; switch_channel_t *channel = switch_core_session_get_channel(pvt->session); - frame.data = data; - frame.buflen = SWITCH_RECOMMENDED_BUFFER_SIZE; - switch (type) { case SWITCH_ABC_TYPE_INIT: break; case SWITCH_ABC_TYPE_CLOSE: break; - case SWITCH_ABC_TYPE_READ: - if (switch_core_media_bug_read(bug, &frame) == SWITCH_STATUS_SUCCESS) { - teletone_dtmf_detect(&pvt->dtmf_detect, frame.data, frame.samples); + case SWITCH_ABC_TYPE_READ_REPLACE: + if ((frame = switch_core_media_bug_get_read_replace_frame(bug))) { + teletone_dtmf_detect(&pvt->dtmf_detect, frame->data, frame->samples); teletone_dtmf_get(&pvt->dtmf_detect, digit_str, sizeof(digit_str)); if (digit_str[0]) { char *p = digit_str; @@ -941,6 +937,7 @@ } switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "DTMF DETECTED: [%s]\n", digit_str); } + switch_core_media_bug_set_read_replace_frame(bug, frame); } break; case SWITCH_ABC_TYPE_WRITE: @@ -984,7 +981,7 @@ switch_channel_pre_answer(channel); - if ((status = switch_core_media_bug_add(session, inband_dtmf_callback, pvt, 0, SMBF_READ_STREAM, &bug)) != SWITCH_STATUS_SUCCESS) { + if ((status = switch_core_media_bug_add(session, inband_dtmf_callback, pvt, 0, SMBF_READ_REPLACE, &bug)) != SWITCH_STATUS_SUCCESS) { return status; }

1 0

[commit] r10345 - freeswitch/trunk/src/mod/languages/mod_perl
by FreeSWITCH SVN 12 Nov '08

12 Nov '08

Author: mikej Date: Wed Nov 12 06:29:33 2008 New Revision: 10345 Log: make mod_perl load global Modified: freeswitch/trunk/src/mod/languages/mod_perl/mod_perl.c Modified: freeswitch/trunk/src/mod/languages/mod_perl/mod_perl.c ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_perl/mod_perl.c (original) +++ freeswitch/trunk/src/mod/languages/mod_perl/mod_perl.c Wed Nov 12 06:29:33 2008 @@ -46,7 +46,7 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_perl_load); SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_perl_shutdown); -SWITCH_MODULE_DEFINITION(mod_perl, mod_perl_load, mod_perl_shutdown, NULL); +SWITCH_MODULE_DEFINITION_EX(mod_perl, mod_perl_load, mod_perl_shutdown, NULL, SMODF_GLOBAL_SYMBOLS); static STRLEN n_a;

1 0

[commit] r10344 - freeswitch/trunk/conf/sip_profiles
by FreeSWITCH SVN 12 Nov '08

12 Nov '08

Author: brian Date: Wed Nov 12 06:16:23 2008 New Revision: 10344 Log: disable 100rel by default Modified: freeswitch/trunk/conf/sip_profiles/external.xml freeswitch/trunk/conf/sip_profiles/internal.xml Modified: freeswitch/trunk/conf/sip_profiles/external.xml ============================================================================== --- freeswitch/trunk/conf/sip_profiles/external.xml (original) +++ freeswitch/trunk/conf/sip_profiles/external.xml Wed Nov 12 06:16:23 2008 @@ -26,6 +26,7 @@ <param name="hold-music" value="$${hold_music}"/> <param name="use-rtp-timer" value="true"/> <param name="rtp-timer-name" value="soft"/> + <param name="enable-100rel" value="false"/>  <param name="manage-presence" value="false"/> Modified: freeswitch/trunk/conf/sip_profiles/internal.xml ============================================================================== --- freeswitch/trunk/conf/sip_profiles/internal.xml (original) +++ freeswitch/trunk/conf/sip_profiles/internal.xml Wed Nov 12 06:16:23 2008 @@ -55,7 +55,7 @@    -  + <param name="enable-100rel" value="false"/>  <param name="apply-inbound-acl" value="domains"/>

1 0

[commit] r10343 - freeswitch/trunk/src
by FreeSWITCH SVN 12 Nov '08

12 Nov '08

Author: anthm Date: Wed Nov 12 05:42:55 2008 New Revision: 10343 Log: fix compiler warning in msvc Modified: freeswitch/trunk/src/switch_rtp.c Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Wed Nov 12 05:42:55 2008 @@ -1257,7 +1257,7 @@ { switch_size_t bytes = 0; switch_status_t status; - uint8_t check = 0; + int check = 0; stfu_frame_t *jb_frame; int ret = -1; int sleep_mss = 1000;

1 0

[commit] r10342 - freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax
by FreeSWITCH SVN 12 Nov '08

12 Nov '08

Author: gmaruzz Date: Wed Nov 12 05:32:02 2008 New Revision: 10342 Log: skypiax: accept a call and sends you the audioPA_ALSA_PLUGHW=1 /usr/local/freeswitch/bin/freeswitch PA_ALSA_PLUGHW=1 /usr/local/freeswitch/bin/freeswitch 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 Wed Nov 12 05:32:02 2008 @@ -220,6 +220,134 @@ int option_debug = 100; +static switch_status_t skypiax_codec(private_t *tech_pvt, int sample_rate, int codec_ms) +{ + if (switch_core_codec_init(&tech_pvt->read_codec, + "L16", + NULL, sample_rate, codec_ms, 1, SWITCH_CODEC_FLAG_ENCODE | SWITCH_CODEC_FLAG_DECODE, NULL, + NULL) != SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Can't load codec?\n"); + return SWITCH_STATUS_FALSE; + } + + if (switch_core_codec_init(&tech_pvt->write_codec, + "L16", + NULL, + sample_rate, codec_ms, 1, SWITCH_CODEC_FLAG_ENCODE | SWITCH_CODEC_FLAG_DECODE, NULL, + NULL) != SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Can't load codec?\n"); + switch_core_codec_destroy(&tech_pvt->read_codec); + return SWITCH_STATUS_FALSE; + } + + tech_pvt->read_frame.rate = sample_rate; + tech_pvt->read_frame.codec = &tech_pvt->read_codec; + + + switch_core_session_set_read_codec(tech_pvt->session, &tech_pvt->read_codec); + switch_core_session_set_write_codec(tech_pvt->session, &tech_pvt->write_codec); + + return SWITCH_STATUS_SUCCESS; + +} +#undef PORTAUDIO_ENGAGE +#ifdef PORTAUDIO_ENGAGE +static switch_status_t engage_device(int sample_rate, int codec_ms) +{ + PaStreamParameters inputParameters, outputParameters; + PaError err; + + if (!globals.audio_stream) { + if (!sample_rate) { + sample_rate = globals.sample_rate; + } + if (!codec_ms) { + codec_ms = globals.codec_ms; + } + + if (!globals.read_codec.implementation) { + if (switch_core_codec_init(&globals.read_codec, + "L16", + NULL, sample_rate, codec_ms, 1, SWITCH_CODEC_FLAG_ENCODE | SWITCH_CODEC_FLAG_DECODE, NULL, + NULL) != SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Can't load codec?\n"); + return SWITCH_STATUS_FALSE; + } + } + + switch_assert(globals.read_codec.implementation); + + if (!globals.write_codec.implementation) { + if (switch_core_codec_init(&globals.write_codec, + "L16", + NULL, + sample_rate, codec_ms, 1, SWITCH_CODEC_FLAG_ENCODE | SWITCH_CODEC_FLAG_DECODE, NULL, + NULL) != SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Can't load codec?\n"); + switch_core_codec_destroy(&globals.read_codec); + return SWITCH_STATUS_FALSE; + } + } + + if (!globals.timer.timer_interface) { + if (switch_core_timer_init(&globals.timer, + globals.timer_name, codec_ms, globals.read_codec.implementation->samples_per_packet, + module_pool) != SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "setup timer failed!\n"); + switch_core_codec_destroy(&globals.read_codec); + switch_core_codec_destroy(&globals.write_codec); + return SWITCH_STATUS_FALSE; + } + } + + if (!globals.hold_timer.timer_interface) { + if (switch_core_timer_init(&globals.hold_timer, + globals.timer_name, codec_ms, globals.read_codec.implementation->samples_per_packet, + module_pool) != SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "setup hold timer failed!\n"); + switch_core_codec_destroy(&globals.read_codec); + switch_core_codec_destroy(&globals.write_codec); + switch_core_timer_destroy(&globals.timer); + return SWITCH_STATUS_FALSE; + } + } + + globals.read_frame.rate = sample_rate; + globals.read_frame.codec = &globals.read_codec; + + switch_mutex_lock(globals.device_lock); + /* LOCKED ************************************************************************************************** */ + inputParameters.device = globals.indev; + inputParameters.channelCount = 1; + inputParameters.sampleFormat = SAMPLE_TYPE; + inputParameters.suggestedLatency = Pa_GetDeviceInfo(inputParameters.device)->defaultLowInputLatency; + inputParameters.hostApiSpecificStreamInfo = NULL; + + outputParameters.device = globals.outdev; + outputParameters.channelCount = 1; + outputParameters.sampleFormat = SAMPLE_TYPE; + outputParameters.suggestedLatency = Pa_GetDeviceInfo(outputParameters.device)->defaultLowOutputLatency; + outputParameters.hostApiSpecificStreamInfo = NULL; + err = OpenAudioStream(&globals.audio_stream, &inputParameters, &outputParameters, sample_rate, paClipOff, + globals.read_codec.implementation->samples_per_packet); + /* UNLOCKED ************************************************************************************************* */ + switch_mutex_unlock(globals.device_lock); + + if (err != paNoError) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Can't open audio device!\n"); + switch_core_codec_destroy(&globals.read_codec); + switch_core_codec_destroy(&globals.write_codec); + switch_core_timer_destroy(&globals.timer); + switch_core_timer_destroy(&globals.hold_timer); + return SWITCH_STATUS_FALSE; + } + } + + return SWITCH_STATUS_SUCCESS; +} +#endif // PORTAUDIO_ENGAGE + + #define SKYPE_AUDIO #ifdef SKYPE_AUDIO @@ -519,6 +647,13 @@ tech_pvt->session = session; if(p) tech_pvt->p=p; +if ( skypiax_codec(tech_pvt, 8000, 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_ERROR, "skypiax_docec SUCCESS\n"); +} + DEBUGA_PBX("EXITING FUNC\n", SKYPIAX_P_LOG); } @@ -719,7 +854,7 @@ #endif - //switch_set_flag_locked(tech_pvt, TFLAG_VOICE); //FIXME + switch_set_flag_locked(tech_pvt, TFLAG_VOICE); //FIXME if (switch_test_flag(tech_pvt, TFLAG_IO) && switch_test_flag(tech_pvt, TFLAG_VOICE)) { switch_clear_flag_locked(tech_pvt, TFLAG_VOICE);

1 0

[commit] r10341 - freeswitch/trunk/src
by FreeSWITCH SVN 12 Nov '08

12 Nov '08

Author: brian Date: Wed Nov 12 05:28:16 2008 New Revision: 10341 Log: Don't copy the time stampes over when the sample rates differ Modified: freeswitch/trunk/src/switch_core_io.c Modified: freeswitch/trunk/src/switch_core_io.c ============================================================================== --- freeswitch/trunk/src/switch_core_io.c (original) +++ freeswitch/trunk/src/switch_core_io.c Wed Nov 12 05:28:16 2008 @@ -421,7 +421,11 @@ case SWITCH_STATUS_SUCCESS: session->enc_read_frame.samples = session->read_codec->implementation->decoded_bytes_per_packet / sizeof(int16_t); if (perfect) { - session->enc_read_frame.timestamp = read_frame->timestamp; + if (enc_frame->codec->implementation->samples_per_packet != session->read_codec->implementation->samples_per_packet) { + session->enc_read_frame.timestamp = 0; + } else { + session->enc_read_frame.timestamp = read_frame->timestamp; + } session->enc_read_frame.rate = read_frame->rate; session->enc_read_frame.ssrc = read_frame->ssrc; session->enc_read_frame.seq = read_frame->seq; @@ -793,7 +797,11 @@ case SWITCH_STATUS_SUCCESS: session->enc_write_frame.codec = session->write_codec; session->enc_write_frame.samples = enc_frame->datalen / sizeof(int16_t); - session->enc_write_frame.timestamp = frame->timestamp; + if (frame->codec->implementation->samples_per_packet != session->write_codec->implementation->samples_per_packet) { + session->enc_write_frame.timestamp = 0; + } else { + session->enc_write_frame.timestamp = frame->timestamp; + } session->enc_write_frame.payload = session->write_codec->implementation->ianacode; session->enc_write_frame.m = frame->m; session->enc_write_frame.ssrc = frame->ssrc;

1 0

[commit] r10340 - freeswitch/trunk/scripts/contrib/mrene/mod_limit_hash
by FreeSWITCH SVN 12 Nov '08

12 Nov '08

Author: mrene Date: Tue Nov 11 22:43:34 2008 New Revision: 10340 Log: fix gcc 4.2 compiler warning Modified: freeswitch/trunk/scripts/contrib/mrene/mod_limit_hash/mod_limit_hash.c Modified: freeswitch/trunk/scripts/contrib/mrene/mod_limit_hash/mod_limit_hash.c ============================================================================== --- freeswitch/trunk/scripts/contrib/mrene/mod_limit_hash/mod_limit_hash.c (original) +++ freeswitch/trunk/scripts/contrib/mrene/mod_limit_hash/mod_limit_hash.c Tue Nov 11 22:43:34 2008 @@ -68,17 +68,17 @@ for(hi = switch_hash_first(NULL, channel_hash); hi; hi = switch_hash_next(hi)) { void *val = NULL; - const char *key; + const void *key; switch_ssize_t keylen; limit_hash_item_t *item = NULL; - switch_hash_this(hi, (const void**)&key, &keylen, &val); + switch_hash_this(hi, &key, &keylen, &val); item = (limit_hash_item_t*)val; /* We keep the structure even though the count is 0 so we do not allocate too often */ item->total_usage--; - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Usage for %s is now %d\n", key, item->total_usage); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Usage for %s is now %d\n", (const char*)key, item->total_usage); } switch_core_event_hook_remove_state_change(session, state_handler); switch_mutex_unlock(globals.mutex);

1 0

[commit] r10339 - freeswitch/trunk/scripts/contrib/mrene/mod_limit_hash
by FreeSWITCH SVN 12 Nov '08

12 Nov '08

Author: mrene Date: Tue Nov 11 22:36:41 2008 New Revision: 10339 Log: Make it work with multiple limit checks on the same channel (same and different realm+id) It is also possible to rate-limit and value-limit the same realm+id. For example: <action application="limit_hash" data="test test 3 no_more_channels XML default" /> <action application="limit_hash" data="test test 3/10 too_fast XML default" /> Modified: freeswitch/trunk/scripts/contrib/mrene/mod_limit_hash/mod_limit_hash.c Modified: freeswitch/trunk/scripts/contrib/mrene/mod_limit_hash/mod_limit_hash.c ============================================================================== --- freeswitch/trunk/scripts/contrib/mrene/mod_limit_hash/mod_limit_hash.c (original) +++ freeswitch/trunk/scripts/contrib/mrene/mod_limit_hash/mod_limit_hash.c Tue Nov 11 22:36:41 2008 @@ -30,7 +30,7 @@ #include <switch.h> -#define LIMIT_SYNTAX "<realm> <id> <max>[/interval] [transfer_destination_number [transfer_destination_context]]" +#define LIMIT_SYNTAX "<realm> <id> <max>[/interval] [transfer_destination_number [transfer_destination_dialplan [transfer_destination_context]]]" SWITCH_MODULE_LOAD_FUNCTION(mod_limit_hash_load); SWITCH_MODULE_DEFINITION(mod_limit_hash, mod_limit_hash_load, NULL , NULL); @@ -48,27 +48,39 @@ uint32_t rate_usage; time_t last_check; }; +typedef struct limit_hash_item limit_hash_item_t; static char *limit_def_xfer_exten = "limit_exceeded"; -typedef struct limit_hash_item limit_hash_item_t; - +/* Callback procedure so we know when to decrement counters */ static switch_status_t state_handler(switch_core_session_t *session) { switch_channel_t *channel = switch_core_session_get_channel(session); switch_channel_state_t state = switch_channel_get_state(channel); - char *hashkey = switch_channel_get_private(channel, "limit_hashkey"); - limit_hash_item_t *item = NULL; + switch_hash_t *channel_hash = switch_channel_get_private(channel, "limit_hash"); + /* The call is either hung up, or is going back into the dialplan, decrement appropriate couters */ if (state == CS_HANGUP || state == CS_ROUTING) { + switch_hash_index_t *hi; switch_mutex_lock(globals.mutex); - item = (limit_hash_item_t*)switch_core_hash_find(globals.hash, hashkey); - - /* We keep the structure even though the count is 0 so we do not allocate too often */ - item->total_usage--; - - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Usage for %s is now %d\n", hashkey, item->total_usage); - + + /* Loop through the channel's hashtable which contains mapping to all the limit_hash_item_t referenced by that channel */ + for(hi = switch_hash_first(NULL, channel_hash); hi; hi = switch_hash_next(hi)) + { + void *val = NULL; + const char *key; + switch_ssize_t keylen; + limit_hash_item_t *item = NULL; + + switch_hash_this(hi, (const void**)&key, &keylen, &val); + + item = (limit_hash_item_t*)val; + + /* We keep the structure even though the count is 0 so we do not allocate too often */ + item->total_usage--; + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Usage for %s is now %d\n", key, item->total_usage); + } + switch_core_event_hook_remove_state_change(session, state_handler); switch_mutex_unlock(globals.mutex); } @@ -90,7 +102,11 @@ limit_hash_item_t *item = NULL; switch_channel_t *channel = switch_core_session_get_channel(session); time_t now = switch_timestamp(NULL); + switch_hash_t *channel_hash = NULL; + uint8_t increment = 1; + uint8_t new_channel = 0; + /* Parse application data */ if (!switch_strlen_zero(data)) { mydata = switch_core_session_strdup(session, data); argc = switch_separate_string(mydata, ' ', argv, (sizeof(argv) / sizeof(argv[0]))); @@ -101,8 +117,6 @@ return; } - switch_mutex_lock(globals.mutex); - realm = argv[0]; id = argv[1]; if ((szinterval = strchr(argv[2], '/'))) @@ -123,45 +137,72 @@ max = 0; } - hashkey = switch_core_session_sprintf(session, "limit_%s_%s", realm, id); + hashkey = switch_core_session_sprintf(session, "%s_%s", realm, id); + switch_mutex_lock(globals.mutex); + /* Check if that realm+id has ever been checked */ if (!(item = (limit_hash_item_t*)switch_core_hash_find(globals.hash, hashkey))) { + /* No, create an empty structure and add it, then continue like as if it existed */ item = (limit_hash_item_t*)switch_core_alloc(globals.pool, sizeof(limit_hash_item_t)); memset(item, 0, sizeof(limit_hash_item_t)); switch_core_hash_insert(globals.hash, hashkey, item); } - if (item->last_check <= (now - interval)) { - item->rate_usage = 1; - item->last_check = now; - } else { - if (interval > 0 && item->rate_usage + 1 > max) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Usage for %s exceeds maximum rate of %d/%ds\n", - hashkey, max, interval); - switch_ivr_session_transfer(session, xfer_exten, argv[4], argv[5]); - goto end; + /* 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; } - item->rate_usage++; + } 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; } - if (interval == 0 && item->total_usage + 1 > max) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Usage for %s is already at max value\n", hashkey); + if (interval > 0) { + if (item->last_check <= (now - interval)) { + item->rate_usage = 1; + item->last_check = now; + } else { + // Always increment rate when its checked as it doesnt depend on the channel + item->rate_usage++; + + if (item->rate_usage > max) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Usage for %s exceeds maximum rate of %d/%ds, now at %d\n", hashkey, max, interval, item->rate_usage); + switch_ivr_session_transfer(session, xfer_exten, argv[4], argv[5]); + goto end; + } + } + } else if (/* interval == 0 && */ item->total_usage + increment > max) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Usage for %s is already at max value (%d)\n", hashkey, item->total_usage); switch_ivr_session_transfer(session, xfer_exten, argv[4], argv[5]); goto end; } - - item->total_usage++; - - if (interval == 0) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Usage for %s is now %d/%d\n", hashkey, item->total_usage, max); - } else { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Usage for %s is now %d/%d for the last %d seconds\n", hashkey, item->rate_usage, max, interval); + + if (increment) { + item->total_usage++; + + 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 { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Usage for %s is now %d/%d for the last %d seconds\n", hashkey, item->rate_usage, max, interval); + } } + - switch_channel_set_private(channel, "limit_hashkey", hashkey); - switch_core_event_hook_add_state_change(session, state_handler); + if (new_channel) { + switch_core_hash_init(&channel_hash, switch_core_session_get_pool(session)); + switch_core_hash_insert(channel_hash, hashkey, item); + switch_channel_set_private(channel, "limit_hash", channel_hash); + switch_core_event_hook_add_state_change(session, state_handler); + } -end: +end: switch_mutex_unlock(globals.mutex); } @@ -180,8 +221,7 @@ switch_core_hash_init(&globals.hash, pool); - SWITCH_ADD_APP(app_interface, "limit_hash", "Limit", - "Limits various resources usage", limit_hash_function, LIMIT_SYNTAX, SAF_SUPPORT_NOMEDIA); + SWITCH_ADD_APP(app_interface, "limit_hash", "Limit (hashtable backend)", "Limits various resources usage", limit_hash_function, LIMIT_SYNTAX, SAF_SUPPORT_NOMEDIA); return SWITCH_STATUS_NOUNLOAD; /* Potential Kaboom(tm) if we have active calls */ }

1 0