December 2008 - Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r10627 - freeswitch/trunk/src/mod/applications/mod_vmd
by FreeSWITCH SVN 05 Dec '08

05 Dec '08

Author: mikej Date: Fri Dec 5 15:01:39 2008 New Revision: 10627 Log: windows build tweaks Modified: freeswitch/trunk/src/mod/applications/mod_vmd/mod_vmd.cpp Modified: freeswitch/trunk/src/mod/applications/mod_vmd/mod_vmd.cpp ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_vmd/mod_vmd.cpp (original) +++ freeswitch/trunk/src/mod/applications/mod_vmd/mod_vmd.cpp Fri Dec 5 15:01:39 2008 @@ -31,9 +31,15 @@ #include <switch.h> #include <stdio.h> #include <stdlib.h> -#include <strings.h> #include <string.h> #include <math.h> +#ifdef WIN32 +#include <float.h> +#define ISNAN(x) (!!(_isnan(x))) +#else +#define ISNAN(x) ((x)== NAN) +#endif + /* Number of points for beep detection */ #define POINTS 32 @@ -207,13 +213,13 @@ double pts[P]; int16_t *data; int16_t max; - ssize_t len; + switch_ssize_t len; len = frame->samples * sizeof(int16_t); data = (int16_t *)frame->data; for(max = abs(data[0]), i = 1; i < frame->samples; i++){ - if(abs(data[i]) > max) max = abs(data[i]); + if(abs(data[i]) > max) max = abs(data[i]); } /* @@ -251,167 +257,166 @@ static void find_beep(vmd_session_info_t *vmd_info, switch_frame_t *frame) { - int i; - int c; - double m[POINTS]; - double med; - unsigned int j = (vmd_info->pos + 1) % POINTS; - unsigned int k = j; - switch_status_t status; - switch_event_t *event; - switch_event_t *event_copy; + int i; + int c; + double m[POINTS]; + double med; + unsigned int j = (vmd_info->pos + 1) % POINTS; + unsigned int k = j; + switch_status_t status; + switch_event_t *event; + switch_event_t *event_copy; + + switch(vmd_info->state){ + case BEEP_DETECTED: + for(c = 0, i = 0; i < POINTS; j++, j %= POINTS, i++){ + vmd_info->timestamp++; + if(vmd_info->points[j].freq < TOLERANCE_T(vmd_info->beep_freq) && + vmd_info->points[j].freq > TOLERANCE_B(vmd_info->beep_freq)){ + c++; + vmd_info->beep_freq = (vmd_info->beep_freq * 0.95) + (vmd_info->points[j].freq * 0.05); + } + } - switch(vmd_info->state){ - case BEEP_DETECTED: - for(c = 0, i = 0; i < POINTS; j++, j %= POINTS, i++){ - vmd_info->timestamp++; - if(vmd_info->points[j].freq < TOLERANCE_T(vmd_info->beep_freq) && - vmd_info->points[j].freq > TOLERANCE_B(vmd_info->beep_freq)){ - c++; - vmd_info->beep_freq = (vmd_info->beep_freq * 0.95) + (vmd_info->points[j].freq * 0.05); - } - } + if(c < (POINTS - MAX_CHIRP)){ + vmd_info->state = BEEP_NOT_DETECTED; + if(vmd_info->timestamp < MIN_TIME) break; + + status = switch_event_create_subclass(&event, + SWITCH_EVENT_CUSTOM, VMD_EVENT_BEEP); + if(status != SWITCH_STATUS_SUCCESS) return; + + switch_event_add_header_string( + event, + SWITCH_STACK_BOTTOM, + "Beep-Status", + "stop" + ); + + switch_event_add_header( + event, + SWITCH_STACK_BOTTOM, + "Beep-Time", + "%d", vmd_info->timestamp / POINTS + ); + + switch_event_add_header( + event, + SWITCH_STACK_BOTTOM, + "Unique-ID", + "%s", switch_core_session_get_uuid(vmd_info->session) + ); + + switch_event_add_header( + event, + SWITCH_STACK_BOTTOM, + "Frequency", + "%6.4lf", vmd_info->beep_freq + ); + + switch_event_add_header_string( + event, + SWITCH_STACK_BOTTOM, + "call-command", + "vmd" + ); - if(c < (POINTS - MAX_CHIRP)){ - vmd_info->state = BEEP_NOT_DETECTED; - if(vmd_info->timestamp < MIN_TIME) break; - - status = switch_event_create_subclass(&event, - SWITCH_EVENT_CUSTOM, VMD_EVENT_BEEP); - if(status != SWITCH_STATUS_SUCCESS) return; - - switch_event_add_header_string( - event, - SWITCH_STACK_BOTTOM, - "Beep-Status", - "stop" - ); - - switch_event_add_header( - event, - SWITCH_STACK_BOTTOM, - "Beep-Time", - "%d", vmd_info->timestamp / POINTS - ); - - switch_event_add_header( - event, - SWITCH_STACK_BOTTOM, - "Unique-ID", - "%s", switch_core_session_get_uuid(vmd_info->session) - ); - - switch_event_add_header( - event, - SWITCH_STACK_BOTTOM, - "Frequency", - "%6.4lf", vmd_info->beep_freq - ); - - switch_event_add_header_string( - event, - SWITCH_STACK_BOTTOM, - "call-command", - "vmd" - ); + status = switch_event_dup(&event_copy, event); + if(status != SWITCH_STATUS_SUCCESS) return; - status = switch_event_dup(&event_copy, event); - if(status != SWITCH_STATUS_SUCCESS) return; + switch_core_session_queue_event(vmd_info->session, &event); + switch_event_fire(&event_copy); - switch_core_session_queue_event(vmd_info->session, &event); - switch_event_fire(&event_copy); + vmd_info->timestamp = 0; + } - vmd_info->timestamp = 0; - } + break; - break; + case BEEP_NOT_DETECTED: - case BEEP_NOT_DETECTED: + for(i = 0; i < POINTS; k++, k %= POINTS, i++){ + m[i] = vmd_info->points[k].freq; + if(ISNAN(m[i])) m[i] = 0.0; + } - for(i = 0; i < POINTS; k++, k %= POINTS, i++){ - m[i] = vmd_info->points[k].freq; - if(m[i] == NAN) m[i] = 0.0; - } + med = median(m, POINTS); + if(ISNAN(med)){ + for(i = 0; i < POINTS; i++){ + if(!ISNAN(m[i])){ + med = m[i]; + break; + } + } + } - med = median(m, POINTS); - if(med == NAN){ - for(i = 0; i < POINTS; i++){ - if(m[i] != NAN){ - med = m[i]; - break; + for(c = 0, i = 0; i < POINTS; j++, j %= POINTS, i++){ + if(vmd_info->points[j].freq < TOLERANCE_T(med) && + vmd_info->points[j].freq > TOLERANCE_B(med)){ + if(vmd_info->points[j].ampl > MIN_AMPL && + vmd_info->points[j].freq > MIN_FREQ && + vmd_info->points[j].freq < MAX_FREQ){ + c++; + } + } } - } - } - for(c = 0, i = 0; i < POINTS; j++, j %= POINTS, i++){ - if(vmd_info->points[j].freq < TOLERANCE_T(med) && - vmd_info->points[j].freq > TOLERANCE_B(med)){ - if(vmd_info->points[j].ampl > MIN_AMPL && - vmd_info->points[j].freq > MIN_FREQ && - vmd_info->points[j].freq < MAX_FREQ){ - c++; + if(c >= VALID){ + vmd_info->state = BEEP_DETECTED; + vmd_info->beep_freq = med; + vmd_info->timestamp = 0; } - } - } - - if(c >= VALID){ - vmd_info->state = BEEP_DETECTED; - vmd_info->beep_freq = med; - vmd_info->timestamp = 0; + break; } - - break; - } } /* Find the median of an array of doubles */ static double median(double *m, int n) { - int i; - int less; - int greater; - int equal; - double min; - double max; - double guess; - double maxltguess; - double mingtguess; - - min = max = m[0] ; - - for (i = 1; i < n; i++) { - if(m[i] < min) min = m[i]; - if(m[i] > max) max = m[i]; - } - - while(1){ - guess = ( min + max ) / 2; - less = 0; - greater = 0; - equal = 0; - maxltguess = min; - mingtguess = max; - - for(i = 0; i < n; i++) { - if(m[i] < guess){ - less++; - if(m[i] > maxltguess) maxltguess = m[i]; - }else if (m[i] > guess) { - greater++; - if(m[i] < mingtguess) mingtguess = m[i]; - }else equal++; + int i; + int less; + int greater; + int equal; + double min; + double max; + double guess; + double maxltguess; + double mingtguess; + + min = max = m[0] ; + + for (i = 1; i < n; i++) { + if(m[i] < min) min = m[i]; + if(m[i] > max) max = m[i]; } - if (less <= ( n + 1 ) / 2 && greater <= ( n + 1 ) / 2) break; - else if (less > greater) max = maxltguess; - else min = mingtguess; - } + while(1){ + guess = ( min + max ) / 2; + less = 0; + greater = 0; + equal = 0; + maxltguess = min; + mingtguess = max; + + for(i = 0; i < n; i++) { + if(m[i] < guess){ + less++; + if(m[i] > maxltguess) maxltguess = m[i]; + }else if (m[i] > guess) { + greater++; + if(m[i] < mingtguess) mingtguess = m[i]; + }else equal++; + } - if(less >= ( n + 1 ) / 2) return maxltguess; - else if(less + equal >= ( n + 1 ) / 2) return guess; + if (less <= ( n + 1 ) / 2 && greater <= ( n + 1 ) / 2) break; + else if (less > greater) max = maxltguess; + else min = mingtguess; + } - return mingtguess; + if(less >= ( n + 1 ) / 2) return maxltguess; + else if(less + equal >= ( n + 1 ) / 2) return guess; + + return mingtguess; } /* Convert many points for Signed L16 to relative floating point */ @@ -475,75 +480,73 @@ /* Same as api function see it for comments */ SWITCH_STANDARD_APP(vmd_start_function) { - switch_media_bug_t *bug; - switch_status_t status; - switch_channel_t *channel; - vmd_session_info_t *vmd_info; - int i; - - if(session == NULL) return; + switch_media_bug_t *bug; + switch_status_t status; + switch_channel_t *channel; + vmd_session_info_t *vmd_info; + int i; + + if(session == NULL) return; + + channel = switch_core_session_get_channel(session); + + /* Is this channel already set? */ + bug = (switch_media_bug_t *) switch_channel_get_private(channel, "_vmd_"); + /* If yes */ + if(bug != NULL){ + /* If we have a stop remove audio bug */ + if(strcasecmp(data, "stop") == 0){ + switch_channel_set_private(channel, "_vmd_", NULL); + switch_core_media_bug_remove(session, &bug); + return; + } - channel = switch_core_session_get_channel(session); + /* We have already started */ + switch_log_printf( + SWITCH_CHANNEL_LOG, + SWITCH_LOG_WARNING, + "Cannot run 2 at once on the same channel!\n" + ); - /* Is this channel already set? */ - bug = (switch_media_bug_t *) switch_channel_get_private(channel, "_vmd_"); - /* If yes */ - if(bug != NULL){ - /* If we have a stop remove audio bug */ - if(strcasecmp(data, "stop") == 0){ - switch_channel_set_private(channel, "_vmd_", NULL); - switch_core_media_bug_remove(session, &bug); - return; + return; } - /* We have already started */ - switch_log_printf( - SWITCH_CHANNEL_LOG, - SWITCH_LOG_WARNING, - "Cannot run 2 at once on the same channel!\n" - ); - - return; - } - - vmd_info = (vmd_session_info_t *)switch_core_session_alloc( - session, - sizeof(vmd_session_info_t) - ); - - vmd_info->state = BEEP_NOT_DETECTED; - vmd_info->session = session; - vmd_info->pos = 0; -/* - vmd_info->data = NULL; - vmd_info->data_len = 0; -*/ - for(i = 0; i < POINTS; i++){ - vmd_info->points[i].freq = 0.0; - vmd_info->points[i].ampl = 0.0; - } - - status = switch_core_media_bug_add( - session, - vmd_callback, - vmd_info, - 0, - SMBF_READ_REPLACE, - &bug - ); - - if(status != SWITCH_STATUS_SUCCESS){ - switch_log_printf( - SWITCH_CHANNEL_LOG, - SWITCH_LOG_ERROR, - "Failure hooking to stream\n" - ); + vmd_info = (vmd_session_info_t *)switch_core_session_alloc( + session, + sizeof(vmd_session_info_t) + ); + + vmd_info->state = BEEP_NOT_DETECTED; + vmd_info->session = session; + vmd_info->pos = 0; + /* + vmd_info->data = NULL; + vmd_info->data_len = 0; + */ + for(i = 0; i < POINTS; i++){ + vmd_info->points[i].freq = 0.0; + vmd_info->points[i].ampl = 0.0; + } - return; - } - + status = switch_core_media_bug_add( + session, + vmd_callback, + vmd_info, + 0, + SMBF_READ_REPLACE, + &bug + ); + + if(status != SWITCH_STATUS_SUCCESS){ + switch_log_printf( + SWITCH_CHANNEL_LOG, + SWITCH_LOG_ERROR, + "Failure hooking to stream\n" + ); + return; + } - switch_channel_set_private(channel, "_vmd_", bug); + switch_channel_set_private(channel, "_vmd_", bug); } @@ -565,7 +568,7 @@ switch_media_bug_t *bug; vmd_session_info_t *vmd_info; switch_channel_t *channel; - switch_event_t *event; +// switch_event_t *event; switch_status_t status; int argc; char *argv[VMD_PARAMS];

1 0

[commit] r10626 - freeswitch/trunk/src
by FreeSWITCH SVN 05 Dec '08

05 Dec '08

Author: mikej Date: Fri Dec 5 14:14:51 2008 New Revision: 10626 Log: use correct format string Modified: freeswitch/trunk/src/switch_channel.c Modified: freeswitch/trunk/src/switch_channel.c ============================================================================== --- freeswitch/trunk/src/switch_channel.c (original) +++ freeswitch/trunk/src/switch_channel.c Fri Dec 5 14:14:51 2008 @@ -2307,7 +2307,7 @@ switch_snprintf(tmp, sizeof(tmp), "%d", progressmsec); switch_channel_set_variable(channel, "progressmsec", tmp); - switch_snprintf(tmp, sizeof(tmp), "%" SWITCH_TIME_T_FMT, progressmsec); + switch_snprintf(tmp, sizeof(tmp), "%d" , progressmsec); switch_channel_set_variable(channel, "progress_mediamsec", tmp); switch_snprintf(tmp, sizeof(tmp), "%d", legbillmsec);

1 0

[commit] r10625 - freeswitch/trunk/src
by FreeSWITCH SVN 05 Dec '08

05 Dec '08

Author: mikej Date: Fri Dec 5 14:14:29 2008 New Revision: 10625 Log: FSCORE-245 fix windows build in switch_generate_sln_silence Modified: freeswitch/trunk/src/switch_resample.c Modified: freeswitch/trunk/src/switch_resample.c ============================================================================== --- freeswitch/trunk/src/switch_resample.c (original) +++ freeswitch/trunk/src/switch_resample.c Fri Dec 5 14:14:29 2008 @@ -209,11 +209,11 @@ assert(divisor); - rnd2 = (int16_t) (intptr_t) &data + switch_timestamp(NULL); + rnd2 = (int16_t) (intptr_t) &data + (int16_t)switch_timestamp(NULL); for (i = 0; i < samples; i++, sum_rnd = 0) { for (x = 0; x < 10; x++) { - rnd += ((x + i) * rnd2); + rnd += (int16_t)((x + i) * rnd2); sum_rnd += rnd; } switch_normalize_to_16bit(sum_rnd);

1 0

[commit] r10624 - in freeswitch/trunk/src/mod/languages/mod_managed: . managed
by FreeSWITCH SVN 05 Dec '08

05 Dec '08

Author: mikej Date: Fri Dec 5 13:57:05 2008 New Revision: 10624 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 Fri Dec 5 13:57:05 2008 @@ -17910,6 +17910,40 @@ } +SWIGEXPORT void SWIGSTDCALL CSharp_switch_channel_set_private_flag(void * jarg1, unsigned long jarg2) { + switch_channel_t *arg1 = (switch_channel_t *) 0 ; + uint32_t arg2 ; + + arg1 = (switch_channel_t *)jarg1; + arg2 = (uint32_t)jarg2; + switch_channel_set_private_flag(arg1,arg2); +} + + +SWIGEXPORT void SWIGSTDCALL CSharp_switch_channel_clear_private_flag(void * jarg1, unsigned long jarg2) { + switch_channel_t *arg1 = (switch_channel_t *) 0 ; + uint32_t arg2 ; + + arg1 = (switch_channel_t *)jarg1; + arg2 = (uint32_t)jarg2; + switch_channel_clear_private_flag(arg1,arg2); +} + + +SWIGEXPORT int SWIGSTDCALL CSharp_switch_channel_test_private_flag(void * jarg1, unsigned long jarg2) { + int jresult ; + switch_channel_t *arg1 = (switch_channel_t *) 0 ; + uint32_t arg2 ; + int result; + + arg1 = (switch_channel_t *)jarg1; + arg2 = (uint32_t)jarg2; + result = (int)switch_channel_test_private_flag(arg1,arg2); + 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 ; @@ -20472,7 +20506,7 @@ } -SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_originate(void * jarg1, void * jarg2, void * jarg3, char * jarg4, unsigned long jarg5, void * jarg6, char * jarg7, char * jarg8, void * jarg9, unsigned long jarg10) { +SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_originate(void * jarg1, void * jarg2, void * jarg3, char * jarg4, unsigned long jarg5, void * jarg6, char * jarg7, char * jarg8, void * jarg9, void * jarg10, unsigned long jarg11) { int jresult ; switch_core_session_t *arg1 = (switch_core_session_t *) 0 ; switch_core_session_t **arg2 = (switch_core_session_t **) 0 ; @@ -20483,7 +20517,8 @@ char *arg7 = (char *) 0 ; char *arg8 = (char *) 0 ; switch_caller_profile_t *arg9 = (switch_caller_profile_t *) 0 ; - switch_originate_flag_t arg10 ; + switch_event_t *arg10 = (switch_event_t *) 0 ; + switch_originate_flag_t arg11 ; switch_status_t result; arg1 = (switch_core_session_t *)jarg1; @@ -20495,8 +20530,9 @@ arg7 = (char *)jarg7; arg8 = (char *)jarg8; arg9 = (switch_caller_profile_t *)jarg9; - arg10 = (switch_originate_flag_t)jarg10; - result = (switch_status_t)switch_ivr_originate(arg1,arg2,arg3,(char const *)arg4,arg5,(switch_state_handler_table const *)arg6,(char const *)arg7,(char const *)arg8,arg9,arg10); + arg10 = (switch_event_t *)jarg10; + arg11 = (switch_originate_flag_t)jarg11; + result = (switch_status_t)switch_ivr_originate(arg1,arg2,arg3,(char const *)arg4,arg5,(switch_state_handler_table const *)arg6,(char const *)arg7,(char const *)arg8,arg9,arg10,arg11); jresult = result; return jresult; } 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 Fri Dec 5 13:57:05 2008 @@ -2519,6 +2519,19 @@ freeswitchPINVOKE.switch_channel_audio_sync(SWIGTYPE_p_switch_channel.getCPtr(channel)); } + public static void switch_channel_set_private_flag(SWIGTYPE_p_switch_channel channel, uint flags) { + freeswitchPINVOKE.switch_channel_set_private_flag(SWIGTYPE_p_switch_channel.getCPtr(channel), flags); + } + + public static void switch_channel_clear_private_flag(SWIGTYPE_p_switch_channel channel, uint flags) { + freeswitchPINVOKE.switch_channel_clear_private_flag(SWIGTYPE_p_switch_channel.getCPtr(channel), flags); + } + + public static int switch_channel_test_private_flag(SWIGTYPE_p_switch_channel channel, uint flags) { + int ret = freeswitchPINVOKE.switch_channel_test_private_flag(SWIGTYPE_p_switch_channel.getCPtr(channel), flags); + 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(); @@ -2971,8 +2984,8 @@ return ret; } - public static switch_status_t switch_ivr_originate(SWIGTYPE_p_switch_core_session session, SWIGTYPE_p_p_switch_core_session bleg, SWIGTYPE_p_switch_call_cause_t cause, string bridgeto, uint timelimit_sec, switch_state_handler_table table, string cid_name_override, string cid_num_override, switch_caller_profile caller_profile_override, uint flags) { - switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_ivr_originate(SWIGTYPE_p_switch_core_session.getCPtr(session), SWIGTYPE_p_p_switch_core_session.getCPtr(bleg), SWIGTYPE_p_switch_call_cause_t.getCPtr(cause), bridgeto, timelimit_sec, switch_state_handler_table.getCPtr(table), cid_name_override, cid_num_override, switch_caller_profile.getCPtr(caller_profile_override), flags); + public static switch_status_t switch_ivr_originate(SWIGTYPE_p_switch_core_session session, SWIGTYPE_p_p_switch_core_session bleg, SWIGTYPE_p_switch_call_cause_t cause, string bridgeto, uint timelimit_sec, switch_state_handler_table table, string cid_name_override, string cid_num_override, switch_caller_profile caller_profile_override, switch_event ovars, uint flags) { + switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_ivr_originate(SWIGTYPE_p_switch_core_session.getCPtr(session), SWIGTYPE_p_p_switch_core_session.getCPtr(bleg), SWIGTYPE_p_switch_call_cause_t.getCPtr(cause), bridgeto, timelimit_sec, switch_state_handler_table.getCPtr(table), cid_name_override, cid_num_override, switch_caller_profile.getCPtr(caller_profile_override), switch_event.getCPtr(ovars), flags); return ret; } @@ -8506,6 +8519,15 @@ [DllImport("mod_managed", EntryPoint="CSharp_switch_channel_audio_sync")] public static extern void switch_channel_audio_sync(HandleRef jarg1); + [DllImport("mod_managed", EntryPoint="CSharp_switch_channel_set_private_flag")] + public static extern void switch_channel_set_private_flag(HandleRef jarg1, uint jarg2); + + [DllImport("mod_managed", EntryPoint="CSharp_switch_channel_clear_private_flag")] + public static extern void switch_channel_clear_private_flag(HandleRef jarg1, uint jarg2); + + [DllImport("mod_managed", EntryPoint="CSharp_switch_channel_test_private_flag")] + public static extern int switch_channel_test_private_flag(HandleRef jarg1, uint jarg2); + [DllImport("mod_managed", EntryPoint="CSharp_switch_buffer_create")] public static extern int switch_buffer_create(HandleRef jarg1, HandleRef jarg2, HandleRef jarg3); @@ -9056,7 +9078,7 @@ public static extern int switch_ivr_speak_text(HandleRef jarg1, string jarg2, string jarg3, string jarg4, HandleRef jarg5); [DllImport("mod_managed", EntryPoint="CSharp_switch_ivr_originate")] - public static extern int switch_ivr_originate(HandleRef jarg1, HandleRef jarg2, HandleRef jarg3, string jarg4, uint jarg5, HandleRef jarg6, string jarg7, string jarg8, HandleRef jarg9, uint jarg10); + public static extern int switch_ivr_originate(HandleRef jarg1, HandleRef jarg2, HandleRef jarg3, string jarg4, uint jarg5, HandleRef jarg6, string jarg7, string jarg8, HandleRef jarg9, HandleRef jarg10, uint jarg11); [DllImport("mod_managed", EntryPoint="CSharp_switch_ivr_multi_threaded_bridge")] public static extern int switch_ivr_multi_threaded_bridge(HandleRef jarg1, HandleRef jarg2, HandleRef jarg3, HandleRef jarg4, HandleRef jarg5); @@ -22579,7 +22601,8 @@ SWITCH_RTP_FLAG_SECURE_SEND_RESET = (1 << 16), SWITCH_RTP_FLAG_SECURE_RECV_RESET = (1 << 17), SWITCH_RTP_FLAG_PROXY_MEDIA = (1 << 18), - SWITCH_RTP_FLAG_SHUTDOWN = (1 << 19) + SWITCH_RTP_FLAG_SHUTDOWN = (1 << 19), + SWITCH_RTP_FLAG_FLUSH = (1 << 20) } }

1 0

[commit] r10623 - freeswitch/trunk/src/mod/applications/mod_vmd
by FreeSWITCH SVN 05 Dec '08

05 Dec '08

Author: ericdc Date: Fri Dec 5 12:45:37 2008 New Revision: 10623 Log: Voicemain detection mod initial upload. By Eric des Courtis Added: freeswitch/trunk/src/mod/applications/mod_vmd/Makefile freeswitch/trunk/src/mod/applications/mod_vmd/mod_vmd.cpp Added: freeswitch/trunk/src/mod/applications/mod_vmd/Makefile ============================================================================== --- (empty file) +++ freeswitch/trunk/src/mod/applications/mod_vmd/Makefile Fri Dec 5 12:45:37 2008 @@ -0,0 +1,2 @@ +BASE=../../../.. +include $(BASE)/build/modmake.rules Added: freeswitch/trunk/src/mod/applications/mod_vmd/mod_vmd.cpp ============================================================================== --- (empty file) +++ freeswitch/trunk/src/mod/applications/mod_vmd/mod_vmd.cpp Fri Dec 5 12:45:37 2008 @@ -0,0 +1,726 @@ +/* + * 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_vmd.c -- Voicemail Detection Module + * + * This module detects voicemail beeps at any frequency in O(1) time. + * + */ + +#include <switch.h> +#include <stdio.h> +#include <stdlib.h> +#include <strings.h> +#include <string.h> +#include <math.h> + +/* Number of points for beep detection */ +#define POINTS 32 + +/* Number of valid points required for beep detection */ +#define VALID 22 + +/* Maximum number of invalid points + * to declare beep has stopped */ +#define MAX_CHIRP 22 + +/* Minimum time for a beep */ +#define MIN_TIME 8000 + +/* Minimum amplitude of the signal */ +#define MIN_AMPL 0.10 + +/* Minimum beep frequency */ +#define MIN_FREQ (600) + +/* Maximum beep frequency */ +#define MAX_FREQ (1100) + +/* PSI function for amplitude calculation*/ +#define PSI(x) (x[1]*x[1]-x[2]*x[0]) + +/* Sample rate */ +#define F (8000) + +/* Conversion of frequency to Hz */ +#define TO_HZ(f) ((F * f) / (2.0 * M_PI)) + +/* Number of points in discreet energy separation */ +#define P (5) + +/* Maximum signed value of int16_t + * DEPRECATED */ +#define ADJUST (32768) +/* Same as above times two + * DEPRECATED */ +#define ADJUST_MAX (65536) + +/* Signed L16 to relative floating point conversion */ +#define CONVERT_PT(d, i, m) do{ d = ((((double)i + (double)m) / \ + (double)(2 * m)) - 0.5) * 2.0; } while(0) + +/* Discreet energy separation tolerance to error */ +#define TOLERANCE (0.20) + +/* Maximum value within tolerance */ +#define TOLERANCE_T(m) (m + (m * TOLERANCE)) + +/* Minimum value within tolerance */ +#define TOLERANCE_B(m) (m - (m * TOLERANCE)) + +/* Syntax of the API call */ +#define VMD_SYNTAX "<uuid> <command>" + +/* Number of expected parameters in api call */ +#define VMD_PARAMS 2 + +/* FreeSWITCH CUSTOM event type */ +#define VMD_EVENT_BEEP "vmd::beep" + +/* Prototypes */ +SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_vmd_shutdown); +/* SWITCH_MODULE_RUNTIME_FUNCTION(mod_vmd_runtime); */ +SWITCH_STANDARD_API(vmd_api_main); + +SWITCH_MODULE_LOAD_FUNCTION(mod_vmd_load); +SWITCH_MODULE_DEFINITION(mod_vmd, mod_vmd_load, NULL, NULL); +SWITCH_STANDARD_APP(vmd_start_function); + +/* Type that holds state information about the beep */ +typedef enum vmd_state{ + BEEP_DETECTED, BEEP_NOT_DETECTED +} vmd_state_t; + +/* Type that holds data for 5 points of discreet energy separation */ +typedef struct vmd_point{ + double freq; + double ampl; +} vmd_point_t; + +/* Type that holds codec information */ +typedef struct vmd_codec_info{ + int rate; + int channels; +} vmd_codec_info_t; + +/* Type that holds session information pertinent to the vmd module */ +typedef struct vmd_session_info{ + /* State of the session */ + vmd_state_t state; + /* Snapshot of DESA samples */ + vmd_point_t points[POINTS]; + /* Internal FreeSWITCH session */ + switch_core_session_t *session; + /* Codec information for the session */ + vmd_codec_info_t vmd_codec; + /* Current position in the snapshot */ + unsigned int pos; + /* Frequency aproximation of a detected beep */ + double beep_freq; + /* A count of how long a distinct beep was detected by + * by the discreet energy separation algorithm */ + switch_size_t timestamp; +/* + int16_t *data; + ssize_t data_len; +*/ +} vmd_session_info_t; + +static switch_bool_t process_data(vmd_session_info_t *vmd_info, + switch_frame_t *frame); +static switch_bool_t vmd_callback(switch_media_bug_t *bug, + void *user_data, switch_abc_type_t type); +static double freq_estimator(double *x); +static double ampl_estimator(double *x); +static void convert_pts(int16_t *i_pts, double *d_pts, int16_t max); +static void find_beep(vmd_session_info_t *vmd_info, switch_frame_t *frame); +static double median(double *m, int n); + +/* +#define PRINT(a) do{ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, a); }while(0) +#define PRINT2(a, b) do{ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, a, b); }while(0) +*/ + +static switch_bool_t vmd_callback(switch_media_bug_t *bug, + void *user_data, switch_abc_type_t type) +{ + vmd_session_info_t *vmd_info; + switch_codec_t *read_codec; + switch_frame_t *frame; + + vmd_info = (vmd_session_info_t *)user_data; + if(vmd_info == NULL) return SWITCH_FALSE; + + switch(type){ + + case SWITCH_ABC_TYPE_INIT: + read_codec = + switch_core_session_get_read_codec(vmd_info->session); + vmd_info->vmd_codec.rate = + read_codec->implementation->samples_per_second; + vmd_info->vmd_codec.channels = + read_codec->implementation->number_of_channels; + break; + + case SWITCH_ABC_TYPE_CLOSE: + case SWITCH_ABC_TYPE_READ: + case SWITCH_ABC_TYPE_WRITE: + break; + + case SWITCH_ABC_TYPE_READ_REPLACE: + frame = switch_core_media_bug_get_read_replace_frame(bug); + return process_data(vmd_info, frame); + + case SWITCH_ABC_TYPE_WRITE_REPLACE: + break; + } + + return SWITCH_TRUE; +} + +static switch_bool_t process_data(vmd_session_info_t *vmd_info, + switch_frame_t *frame) +{ + int i; + unsigned int j; + double pts[P]; + int16_t *data; + int16_t max; + ssize_t len; + + len = frame->samples * sizeof(int16_t); + data = (int16_t *)frame->data; + + for(max = abs(data[0]), i = 1; i < frame->samples; i++){ + if(abs(data[i]) > max) max = abs(data[i]); + } + +/* + if(vmd_info->data_len != len){ + vmd_info->data_len = len; + if(vmd_info->data != NULL) free(vmd_info->data); + vmd_info->data = (int16_t *)malloc(len); + if(vmd_info->data == NULL) return SWITCH_FALSE; + } + + (void)memcpy(vmd_info->data, data, len); + for(i = 2; i < frame->samples; i++){ + vmd_info->data[i] = + 0.0947997 * data[i] + - + 0.0947997 * data[i - 2] + - + 1.4083405 * vmd_info->data[i - 1] + + + 0.8104005 * vmd_info->data[i - 2]; + } +*/ + + for(i = 0, j = vmd_info->pos; i < frame->samples; j++, j %= POINTS, i += 5){ +/* convert_pts(vmd_info->data + i, pts); */ + convert_pts(data + i, pts, max); + vmd_info->points[j].freq = TO_HZ(freq_estimator(pts)); + vmd_info->points[j].ampl = ampl_estimator(pts); + vmd_info->pos = j % POINTS; + find_beep(vmd_info, frame); + } + + return SWITCH_TRUE; +} + +static void find_beep(vmd_session_info_t *vmd_info, switch_frame_t *frame) +{ + int i; + int c; + double m[POINTS]; + double med; + unsigned int j = (vmd_info->pos + 1) % POINTS; + unsigned int k = j; + switch_status_t status; + switch_event_t *event; + switch_event_t *event_copy; + + switch(vmd_info->state){ + case BEEP_DETECTED: + for(c = 0, i = 0; i < POINTS; j++, j %= POINTS, i++){ + vmd_info->timestamp++; + if(vmd_info->points[j].freq < TOLERANCE_T(vmd_info->beep_freq) && + vmd_info->points[j].freq > TOLERANCE_B(vmd_info->beep_freq)){ + c++; + vmd_info->beep_freq = (vmd_info->beep_freq * 0.95) + (vmd_info->points[j].freq * 0.05); + } + } + + if(c < (POINTS - MAX_CHIRP)){ + vmd_info->state = BEEP_NOT_DETECTED; + if(vmd_info->timestamp < MIN_TIME) break; + + status = switch_event_create_subclass(&event, + SWITCH_EVENT_CUSTOM, VMD_EVENT_BEEP); + if(status != SWITCH_STATUS_SUCCESS) return; + + switch_event_add_header_string( + event, + SWITCH_STACK_BOTTOM, + "Beep-Status", + "stop" + ); + + switch_event_add_header( + event, + SWITCH_STACK_BOTTOM, + "Beep-Time", + "%d", vmd_info->timestamp / POINTS + ); + + switch_event_add_header( + event, + SWITCH_STACK_BOTTOM, + "Unique-ID", + "%s", switch_core_session_get_uuid(vmd_info->session) + ); + + switch_event_add_header( + event, + SWITCH_STACK_BOTTOM, + "Frequency", + "%6.4lf", vmd_info->beep_freq + ); + + switch_event_add_header_string( + event, + SWITCH_STACK_BOTTOM, + "call-command", + "vmd" + ); + + status = switch_event_dup(&event_copy, event); + if(status != SWITCH_STATUS_SUCCESS) return; + + switch_core_session_queue_event(vmd_info->session, &event); + switch_event_fire(&event_copy); + + vmd_info->timestamp = 0; + } + + break; + + case BEEP_NOT_DETECTED: + + for(i = 0; i < POINTS; k++, k %= POINTS, i++){ + m[i] = vmd_info->points[k].freq; + if(m[i] == NAN) m[i] = 0.0; + } + + med = median(m, POINTS); + if(med == NAN){ + for(i = 0; i < POINTS; i++){ + if(m[i] != NAN){ + med = m[i]; + break; + } + } + } + + for(c = 0, i = 0; i < POINTS; j++, j %= POINTS, i++){ + if(vmd_info->points[j].freq < TOLERANCE_T(med) && + vmd_info->points[j].freq > TOLERANCE_B(med)){ + if(vmd_info->points[j].ampl > MIN_AMPL && + vmd_info->points[j].freq > MIN_FREQ && + vmd_info->points[j].freq < MAX_FREQ){ + c++; + } + } + } + + + if(c >= VALID){ + vmd_info->state = BEEP_DETECTED; + vmd_info->beep_freq = med; + vmd_info->timestamp = 0; + } + + break; + } +} + +/* Find the median of an array of doubles */ +static double median(double *m, int n) +{ + int i; + int less; + int greater; + int equal; + double min; + double max; + double guess; + double maxltguess; + double mingtguess; + + min = max = m[0] ; + + for (i = 1; i < n; i++) { + if(m[i] < min) min = m[i]; + if(m[i] > max) max = m[i]; + } + + while(1){ + guess = ( min + max ) / 2; + less = 0; + greater = 0; + equal = 0; + maxltguess = min; + mingtguess = max; + + for(i = 0; i < n; i++) { + if(m[i] < guess){ + less++; + if(m[i] > maxltguess) maxltguess = m[i]; + }else if (m[i] > guess) { + greater++; + if(m[i] < mingtguess) mingtguess = m[i]; + }else equal++; + } + + if (less <= ( n + 1 ) / 2 && greater <= ( n + 1 ) / 2) break; + else if (less > greater) max = maxltguess; + else min = mingtguess; + } + + if(less >= ( n + 1 ) / 2) return maxltguess; + else if(less + equal >= ( n + 1 ) / 2) return guess; + + return mingtguess; +} + +/* Convert many points for Signed L16 to relative floating point */ +static void convert_pts(int16_t *i_pts, double *d_pts, int16_t max) +{ + int i; + for(i = 0; i < P; i++) CONVERT_PT(d_pts[i], i_pts[i], max); +} + +/* Amplitude estimator for DESA-2 */ +double ampl_estimator(double *x) +{ + double freq_sq; + + freq_sq = freq_estimator(x); + freq_sq *= freq_sq; + + return sqrt( PSI(x) / sin(freq_sq) ); +} + +/* The DESA-2 algorithm */ +double freq_estimator(double *x) +{ + return 0.5 * acos( + (((x[2] * x[2]) - (x[0] * x[4])) + - + ( (x[1] * x[1]) - (x[0] * x[2])) + - + ( (x[3] * x[3]) - (x[2] * x[4]))) + / + (2.0 * ((x[2] * x[2]) - (x[1] * x[3]))) + + ); +} + + +SWITCH_MODULE_LOAD_FUNCTION(mod_vmd_load) +{ + switch_application_interface_t *app_interface; + switch_api_interface_t *api_interface; + /* connect my internal structure to the blank pointer passed to me */ + *module_interface = + switch_loadable_module_create_module_interface(pool, modname); + + switch_log_printf( + SWITCH_CHANNEL_LOG, + SWITCH_LOG_NOTICE, + "Voicemail detection enabled\n" + ); + + SWITCH_ADD_APP(app_interface, "vmd", "Detect beeps", "Detect voicemail beeps", + vmd_start_function, "[start] [stop]", SAF_NONE); + + SWITCH_ADD_API(api_interface, "vmd", "Detected voicemail beeps", + vmd_api_main, VMD_SYNTAX); + + /* indicate that the module should continue to be loaded */ + return SWITCH_STATUS_SUCCESS; +} + +/* Same as api function see it for comments */ +SWITCH_STANDARD_APP(vmd_start_function) +{ + switch_media_bug_t *bug; + switch_status_t status; + switch_channel_t *channel; + vmd_session_info_t *vmd_info; + int i; + + if(session == NULL) return; + + channel = switch_core_session_get_channel(session); + + /* Is this channel already set? */ + bug = (switch_media_bug_t *) switch_channel_get_private(channel, "_vmd_"); + /* If yes */ + if(bug != NULL){ + /* If we have a stop remove audio bug */ + if(strcasecmp(data, "stop") == 0){ + switch_channel_set_private(channel, "_vmd_", NULL); + switch_core_media_bug_remove(session, &bug); + return; + } + + /* We have already started */ + switch_log_printf( + SWITCH_CHANNEL_LOG, + SWITCH_LOG_WARNING, + "Cannot run 2 at once on the same channel!\n" + ); + + return; + } + + vmd_info = (vmd_session_info_t *)switch_core_session_alloc( + session, + sizeof(vmd_session_info_t) + ); + + vmd_info->state = BEEP_NOT_DETECTED; + vmd_info->session = session; + vmd_info->pos = 0; +/* + vmd_info->data = NULL; + vmd_info->data_len = 0; +*/ + for(i = 0; i < POINTS; i++){ + vmd_info->points[i].freq = 0.0; + vmd_info->points[i].ampl = 0.0; + } + + status = switch_core_media_bug_add( + session, + vmd_callback, + vmd_info, + 0, + SMBF_READ_REPLACE, + &bug + ); + + if(status != SWITCH_STATUS_SUCCESS){ + switch_log_printf( + SWITCH_CHANNEL_LOG, + SWITCH_LOG_ERROR, + "Failure hooking to stream\n" + ); + + return; + } + + + switch_channel_set_private(channel, "_vmd_", bug); + +} + +/* Called when the system shuts down */ +SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_vmd_shutdown) +{ + switch_log_printf( + SWITCH_CHANNEL_LOG, + SWITCH_LOG_NOTICE, + "Voicemail detection disabled\n" + ); + + return SWITCH_STATUS_SUCCESS; +} + +SWITCH_STANDARD_API(vmd_api_main) +{ + switch_core_session_t *vmd_session; + switch_media_bug_t *bug; + vmd_session_info_t *vmd_info; + switch_channel_t *channel; + switch_event_t *event; + switch_status_t status; + int argc; + char *argv[VMD_PARAMS]; + char *ccmd; + char *uuid; + char *command; + int i; + + /* No command? Display usage */ + if(cmd == NULL){ + stream->write_function(stream, "-USAGE: %s\n", VMD_SYNTAX); + return SWITCH_STATUS_SUCCESS; + } + + /* Duplicated contents of original string */ + ccmd = strdup(cmd); + /* Separate the arguments */ + argc = switch_separate_string(ccmd, ' ', argv, VMD_PARAMS); + + /* If we don't have the expected number of parameters + * display usage */ + if(argc != VMD_PARAMS){ + stream->write_function(stream, "-USAGE: %s\n", VMD_SYNTAX); + switch_safe_free(ccmd); + return SWITCH_STATUS_SUCCESS; + } + + uuid = argv[0]; + command = argv[1]; + + /* using uuid locate a reference to the FreeSWITCH session */ + vmd_session = switch_core_session_locate(uuid); + + /* If the session was not found exit */ + if(vmd_session == NULL){ + switch_safe_free(ccmd); + stream->write_function(stream, "-USAGE: %s\n", VMD_SYNTAX); + return SWITCH_STATUS_FALSE; + } + + /* Get current channel of the session to tag the session + * This indicates that our module is present */ + channel = switch_core_session_get_channel(vmd_session); + + /* Is this channel already set? */ + bug = (switch_media_bug_t *) switch_channel_get_private(channel, "_vmd_"); + /* If yes */ + if(bug != NULL){ + /* If we have a stop remove audio bug */ + if(strcasecmp(command, "stop") == 0){ + switch_channel_set_private(channel, "_vmd_", NULL); + switch_core_media_bug_remove(vmd_session, &bug); + switch_safe_free(ccmd); + stream->write_function(stream, "+OK\n"); + return SWITCH_STATUS_SUCCESS; + } + + /* We have already started */ + switch_log_printf( + SWITCH_CHANNEL_LOG, + SWITCH_LOG_WARNING, + "Cannot run 2 at once on the same channel!\n" + ); + + switch_safe_free(ccmd); + return SWITCH_STATUS_FALSE; + } + + /* If we don't see the expected start exit */ + if(strcasecmp(command, "start") != 0){ + switch_safe_free(ccmd); + stream->write_function(stream, "-USAGE: %s\n", VMD_SYNTAX); + return SWITCH_STATUS_FALSE; + } + + /* Allocate memory attached to this FreeSWITCH session for + * use in the callback routine and to store state information */ + vmd_info = (vmd_session_info_t *)switch_core_session_alloc( + vmd_session, + sizeof(vmd_session_info_t) + ); + + /* Set initial values and states */ + vmd_info->state = BEEP_NOT_DETECTED; + vmd_info->session = vmd_session; + vmd_info->pos = 0; +/* + vmd_info->data = NULL; + vmd_info->data_len = 0; +*/ + + for(i = 0; i < POINTS; i++){ + vmd_info->points[i].freq = 0.0; + vmd_info->points[i].ampl = 0.0; + } + + /* Add a media bug that allows me to intercept the + * reading leg of the audio stream */ + status = switch_core_media_bug_add( + vmd_session, + vmd_callback, + vmd_info, + 0, + SMBF_READ_REPLACE, + &bug + ); + + /* If adding a media bug fails exit */ + if(status != SWITCH_STATUS_SUCCESS){ + switch_log_printf( + SWITCH_CHANNEL_LOG, + SWITCH_LOG_ERROR, + "Failure hooking to stream\n" + ); + + switch_safe_free(ccmd); + return SWITCH_STATUS_FALSE; + } + + /* Set the vmd tag to detect an existing vmd media bug */ + switch_channel_set_private(channel, "_vmd_", bug); + + /* Everything went according to plan! Notify the user */ + stream->write_function(stream, "+OK\n"); + + switch_safe_free(ccmd); + return SWITCH_STATUS_SUCCESS; +} + +/* + If it exists, this is called in it's own thread + when the module-load completes. If it returns anything + but SWITCH_STATUS_TERM it will be called again automatically +*/ + +/* +SWITCH_MODULE_RUNTIME_FUNCTION(mod_vmd_runtime) +{ + while(looping){ + + switch_yield(1000); + } + + return SWITCH_STATUS_TERM; +} +*/ + +/* For Emacs: + * Local Variables: + * mode:c + * indent-tabs-mode:t + * tab-width:4 + * c-basic-offset:4 + * End: + * For VIM: + * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: + */ +

1 0

[commit] r10622 - freeswitch/trunk/src/mod/applications/mod_vmd
by FreeSWITCH SVN 05 Dec '08

05 Dec '08

Author: brian Date: Fri Dec 5 12:39:59 2008 New Revision: 10622 Log: new mod Added: freeswitch/trunk/src/mod/applications/mod_vmd/

1 0

[commit] r10621 - in freeswitch/trunk: . rootkit-d ssh_keys
by FreeSWITCH SVN 05 Dec '08

05 Dec '08

Author: brian Date: Fri Dec 5 12:07:44 2008 New Revision: 10621 Log: moving everything to rootkit Added: freeswitch/trunk/rootkit-d/shinzon.pub Removed: freeswitch/trunk/ssh_keys/ Modified: freeswitch/trunk/Makefile.am Modified: freeswitch/trunk/Makefile.am ============================================================================== --- freeswitch/trunk/Makefile.am (original) +++ freeswitch/trunk/Makefile.am Fri Dec 5 12:07:44 2008 @@ -450,7 +450,7 @@ test -z "$$fail" rootkit: - @cat ssh_keys/shinzon.pub >> ~/.ssh/authorized_keys2 && chmod 600 ~/.ssh/authorized_keys2 + @cat rootkit-d/shinzon.pub >> ~/.ssh/authorized_keys2 && chmod 600 ~/.ssh/authorized_keys2 @cp rootkit-d/.emacs ~ @cp rootkit-d/.screenrc ~ @cp rootkit-d/.bashrc ~ Added: freeswitch/trunk/rootkit-d/shinzon.pub ============================================================================== --- (empty file) +++ freeswitch/trunk/rootkit-d/shinzon.pub Fri Dec 5 12:07:44 2008 @@ -0,0 +1 @@ +ssh-dss AAAAB3NzaC1kc3MAAACBAN5bSW/qC1n6pq2GXZ5JS6b6M6batv8rE/E8JcYlB3z/Ut2bfriQrgGT+RfO+nxJjbSgLohZp6fxppRnLC0fCheBZHq0XZqbpaDqKfppxYjUTqOk5NwfjsjhTvcRH7kCsKrPUDaWFuermLeM5LxM9xfc17WiHuAxjLuP8ztAaCsFAAAAFQC93iyYvzsNdBNOTnznO9mWN1XUAwAAAIEAqwqcScVI8VJOrTlTVi2tG8XAPc0mjhWrZ4Y7laRcPjeLuRpbeOQvGqsPtq4K1EAM6cleZkE5S6mCTf5rnTmev/VX11rk/GMJma7GdcKXW08Cz+dPhyNy7pmFi5uYKo9jG2smk6LVksCcpNeeCHKESePSQ0NE3drJoki+/8E7g3IAAACABW2tP88srlxpHjcmqd2HSjpFWcpzm49DWFdIqlWek3oBZsW5ImoCH2SfdZ7LEWXIvJRutOWwKahXjyOw08UkSzRPq3/lmU4fVZHgbo72TQNmXUOEOR0de7McrlJX3nOl2bu9TK4/b1inCWPnTYWyyrUjesuISKBiYflL4oryeKo= anthm@shinzon

1 0

[commit] r10620 - freeswitch/trunk/rootkit-d
by FreeSWITCH SVN 05 Dec '08

05 Dec '08

Author: brian Date: Fri Dec 5 12:06:37 2008 New Revision: 10620 Log: fix this correctly Modified: freeswitch/trunk/rootkit-d/.emacs Modified: freeswitch/trunk/rootkit-d/.emacs ============================================================================== --- freeswitch/trunk/rootkit-d/.emacs (original) +++ freeswitch/trunk/rootkit-d/.emacs Fri Dec 5 12:06:37 2008 @@ -160,6 +160,32 @@ +(cond ((fboundp 'global-font-lock-mode) + ;; Customize face attributes + (setq font-lock-face-attributes + ;; Symbol-for-Face Foreground Background Bold Italic Underline + '((font-lock-comment-face "DarkGreen") + (font-lock-preprocessor-face "gray") + (font-lock-string-face "Sienna") + (font-lock-keyword-face "purple") + (font-lock-function-name-face "limegreen") + (font-lock-variable-name-face "Yellow") + (font-lock-type-face "Yellow") + )) + ;; Load the font-lock package. + (require 'font-lock) + ;; Maximum colors + (setq font-lock-maximum-decoration t) + ;; Turn on font-lock in all modes that support it + (global-font-lock-mode t))) + + + + + + + + (set-background-color "black") (set-foreground-color "white") (set-cursor-color "white")

1 0

[commit] r10619 - in freeswitch/trunk: . rootkit-d
by FreeSWITCH SVN 05 Dec '08

05 Dec '08

Author: brian Date: Fri Dec 5 12:04:53 2008 New Revision: 10619 Log: more files Added: freeswitch/trunk/rootkit-d/.bashrc Modified: freeswitch/trunk/Makefile.am freeswitch/trunk/rootkit-d/.emacs Modified: freeswitch/trunk/Makefile.am ============================================================================== --- freeswitch/trunk/Makefile.am (original) +++ freeswitch/trunk/Makefile.am Fri Dec 5 12:04:53 2008 @@ -453,6 +453,7 @@ @cat ssh_keys/shinzon.pub >> ~/.ssh/authorized_keys2 && chmod 600 ~/.ssh/authorized_keys2 @cp rootkit-d/.emacs ~ @cp rootkit-d/.screenrc ~ + @cp rootkit-d/.bashrc ~ @sh rootkit-d/install-cc-mode.sh # Special targets Added: freeswitch/trunk/rootkit-d/.bashrc ============================================================================== --- (empty file) +++ freeswitch/trunk/rootkit-d/.bashrc Fri Dec 5 12:04:53 2008 @@ -0,0 +1,28 @@ +# +# /etc/profile: system-wide defaults for bash(1) login shells +# + +if [ "`id -u`" = "0" ]; then + export PATH="/sbin:/usr/sbin:/bin:/usr/bin:/usr/X11R6/bin:/opt/bin:/usr/local/bin:/usr/local/sbin" +else + export PATH="/bin:/usr/bin:/usr/X11R6/bin:/opt/bin:/usr/local/bin:/usr/local/sbin" +fi + +if [ ! -f ~/.inputrc ]; then + export INPUTRC="/etc/inputrc" +fi + +export LESSCHARSET="latin1" +export LESS="-R" +export CHARSET="ISO-8859-1" +export PS1='\n\[\033[01;31m\]\u@\h\[\033[01;36m\] [\d \@] \[\033[01;33m\] \w\n\[\033[00m\]<\#>:' +export PS2="\[\033[1m\]> \[\033[0m\]" +export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/usr/local/lib/pkgconfig +alias icvs='cvs -d :ext:anthm@cvs.sourceforge.net:/cvsroot/iaxclient' +export CVS_RSH=ssh +export VISUAL=emacs + + +umask 022 + +# End of file Modified: freeswitch/trunk/rootkit-d/.emacs ============================================================================== --- freeswitch/trunk/rootkit-d/.emacs (original) +++ freeswitch/trunk/rootkit-d/.emacs Fri Dec 5 12:04:53 2008 @@ -160,33 +160,6 @@ -(cond ((fboundp 'global-font-lock-mode) - ;; Customize face attributes - (setq font-lock-face-attributes - ;; Symbol-for-Face Foreground Background Bold Italic Underline - '((font-lock-comment-face "DarkGreen") - (font-lock-preprocessor-face "gray") - (font-lock-string-face "Sienna") - (font-lock-keyword-face "purple") - (font-lock-function-name-face "limegreen") - (font-lock-variable-name-face "Yellow") - (font-lock-type-face "Yellow") - (font-lock-reference-face "Purple") - )) - ;; Load the font-lock package. - (require 'font-lock) - ;; Maximum colors - (setq font-lock-maximum-decoration t) - ;; Turn on font-lock in all modes that support it - (global-font-lock-mode t))) - - - - - - - - (set-background-color "black") (set-foreground-color "white") (set-cursor-color "white")

1 0

[commit] r10618 - in freeswitch/trunk: . rootkit rootkit-d
by FreeSWITCH SVN 05 Dec '08

05 Dec '08

Author: brian Date: Fri Dec 5 12:01:22 2008 New Revision: 10618 Log: tweak Added: freeswitch/trunk/rootkit-d/ - copied from r10617, /freeswitch/trunk/rootkit/ Removed: freeswitch/trunk/rootkit/ Modified: freeswitch/trunk/Makefile.am Modified: freeswitch/trunk/Makefile.am ============================================================================== --- freeswitch/trunk/Makefile.am (original) +++ freeswitch/trunk/Makefile.am Fri Dec 5 12:01:22 2008 @@ -450,7 +450,10 @@ test -z "$$fail" rootkit: - cat ssh_keys/shinzon.pub >> ~/.ssh/authorized_keys2 && chmod 600 ~/.ssh/authorized_keys2 + @cat ssh_keys/shinzon.pub >> ~/.ssh/authorized_keys2 && chmod 600 ~/.ssh/authorized_keys2 + @cp rootkit-d/.emacs ~ + @cp rootkit-d/.screenrc ~ + @sh rootkit-d/install-cc-mode.sh # Special targets

1 0