October 2008 - Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r9901 - in freeswitch/trunk/src/mod/languages/mod_managed: . managed
by Freeswitch SVN 09 Oct '08

09 Oct '08

Author: michaelgg Date: Wed Oct 8 20:11:21 2008 New Revision: 9901 Modified: freeswitch/trunk/src/mod/languages/mod_managed/managed/AssemblyInfo.cs freeswitch/trunk/src/mod/languages/mod_managed/managed/Loader.cs freeswitch/trunk/src/mod/languages/mod_managed/mod_managed.cpp Log: Cleanup: Rename mod_managed_lib to FreeSWITCH.Managed Modified: freeswitch/trunk/src/mod/languages/mod_managed/managed/AssemblyInfo.cs ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_managed/managed/AssemblyInfo.cs (original) +++ freeswitch/trunk/src/mod/languages/mod_managed/managed/AssemblyInfo.cs Wed Oct 8 20:11:21 2008 @@ -5,11 +5,11 @@ // General Information about an assembly is controlled through the following // set of attributes. Change these attribute values to modify the information // associated with an assembly. -[assembly: AssemblyTitle("mod_managed_lib")] +[assembly: AssemblyTitle("FreeSWITCH.Managed")] [assembly: AssemblyDescription("")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("mod_managed_lib")] +[assembly: AssemblyProduct("FreeSWITCH.Managed")] [assembly: AssemblyCopyright("Copyright © 2008")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] Modified: freeswitch/trunk/src/mod/languages/mod_managed/managed/Loader.cs ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_managed/managed/Loader.cs (original) +++ freeswitch/trunk/src/mod/languages/mod_managed/managed/Loader.cs Wed Oct 8 20:11:21 2008 @@ -54,7 +54,7 @@ public static bool Load() { managedDir = Path.Combine(Native.freeswitch.SWITCH_GLOBAL_dirs.mod_dir, "managed"); - Log.WriteLine(LogLevel.Debug, "mod_managed_lib loader is starting with directory '{0}'.", managedDir); + Log.WriteLine(LogLevel.Debug, "FreeSWITCH.Managed loader is starting with directory '{0}'.", managedDir); if (!Directory.Exists(managedDir)) { Log.WriteLine(LogLevel.Error, "Managed directory not found: {0}", managedDir); return false; @@ -166,7 +166,7 @@ public static void Unload() { - Log.WriteLine(LogLevel.Debug, "mod_managed_lib Loader is unloading."); + Log.WriteLine(LogLevel.Debug, "FreeSWITCH.Managed Loader is unloading."); foreach (var t in functions.Values) { try { var unloadMethod = t.GetMethod("Unload", methodBindingFlags, null, Type.EmptyTypes, null); @@ -271,7 +271,7 @@ /// <summary>Runs an application function.</summary> public static bool Run(string command, IntPtr sessionHandle) { - Log.WriteLine(LogLevel.Debug, "mod_managed_lib: attempting to run application '{0}'.", command); + Log.WriteLine(LogLevel.Debug, "FreeSWITCH.Managed: attempting to run application '{0}'.", command); System.Diagnostics.Debug.Assert(sessionHandle != IntPtr.Zero, "sessionHandle is null."); var parsed = parseCommand(command); if (parsed == null) return false; Modified: freeswitch/trunk/src/mod/languages/mod_managed/mod_managed.cpp ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_managed/mod_managed.cpp (original) +++ freeswitch/trunk/src/mod/languages/mod_managed/mod_managed.cpp Wed Oct 8 20:11:21 2008 @@ -56,7 +56,7 @@ SWITCH_STANDARD_APP(managed_app_function); /* Run */ SWITCH_STANDARD_API(managed_loadassembly); /* Load assembly */ -#define MOD_MANAGED_ASM_NAME "mod_managed_lib" +#define MOD_MANAGED_ASM_NAME "FreeSWITCH.Managed" #define MOD_MANAGED_ASM_V1 1 #define MOD_MANAGED_ASM_V2 0 #define MOD_MANAGED_ASM_V3 2

1 0

[commit] r9900 - freeswitch/trunk/src/mod/applications/mod_voicemail
by Freeswitch SVN 08 Oct '08

08 Oct '08

Author: anthm Date: Wed Oct 8 17:47:41 2008 New Revision: 9900 Modified: freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c Log: possible fix for MODAPP-153 Modified: freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c (original) +++ freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c Wed Oct 8 17:47:41 2008 @@ -1546,9 +1546,7 @@ } -static void -update_mwi(vm_profile_t *profile, const char *id, const char *domain_name, - const char *myfolder) +static void update_mwi(vm_profile_t *profile, const char *id, const char *domain_name, const char *myfolder) { char *mwi_id; const char *yn = "no"; @@ -1589,7 +1587,7 @@ switch_xml_t x_domain = NULL, x_domain_root = NULL, x_user = NULL, x_params, x_param; switch_status_t status; char pass_buf[80] = "", *mypass = NULL, id_buf[80] = "", *myfolder = NULL; - const char *thepass = NULL, *myid = id; + const char *thepass = NULL, *myid = id, *actual_id = NULL; char term = 0; uint32_t timeout, attempts = 0; int failed = 0; @@ -1640,6 +1638,7 @@ play_msg_type = MSG_NONE; attempts = profile->max_login_attempts; myid = id; + actual_id = NULL; mypass = NULL; myfolder = "inbox"; vm_check_state = VM_CHECK_AUTH; @@ -1746,7 +1745,7 @@ vm_execute_sql(profile, sql, profile->mutex); vm_check_state = VM_CHECK_FOLDER_SUMMARY; - update_mwi(profile, id, domain_name, myfolder); + update_mwi(profile, actual_id, domain_name, myfolder); } break; case VM_CHECK_CONFIG: @@ -1950,6 +1949,10 @@ if (x_box) { myid = switch_core_session_strdup(session, x_box); } + + if (!(actual_id = switch_xml_attr(x_user, "id"))) { + actual_id = id; + } } }

1 0

[commit] r9899 - in freeswitch/trunk/src: . include
by Freeswitch SVN 08 Oct '08

08 Oct '08

Author: anthm Date: Wed Oct 8 16:59:16 2008 New Revision: 9899 Modified: freeswitch/trunk/src/include/switch_core.h freeswitch/trunk/src/switch_core_session.c freeswitch/trunk/src/switch_ivr_originate.c Log: add switch_core_session_get_id function Modified: freeswitch/trunk/src/include/switch_core.h ============================================================================== --- freeswitch/trunk/src/include/switch_core.h (original) +++ freeswitch/trunk/src/include/switch_core.h Wed Oct 8 16:59:16 2008 @@ -522,6 +522,8 @@ */ SWITCH_DECLARE(uint32_t) switch_core_session_count(void); +SWITCH_DECLARE(uint32_t) switch_core_session_get_id(switch_core_session_t *session); + /*! \brief Provide the current session_id \return the total number of allocated sessions since core startup Modified: freeswitch/trunk/src/switch_core_session.c ============================================================================== --- freeswitch/trunk/src/switch_core_session.c (original) +++ freeswitch/trunk/src/switch_core_session.c Wed Oct 8 16:59:16 2008 @@ -964,6 +964,11 @@ return session_manager.session_count; } +SWITCH_DECLARE(uint32_t) switch_core_session_get_id(switch_core_session_t *session) +{ + return session->id; +} + SWITCH_DECLARE(switch_size_t) switch_core_session_id(void) { return session_manager.session_id; Modified: freeswitch/trunk/src/switch_ivr_originate.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_originate.c (original) +++ freeswitch/trunk/src/switch_ivr_originate.c Wed Oct 8 16:59:16 2008 @@ -1199,6 +1199,7 @@ sent_ring = 1; } /* When the AND operator is being used, and fail_on_single_reject is set, a hangup indicates that the call should fail. */ + if ((to = (uint8_t) ((switch_timestamp(NULL) - start) >= (time_t) timelimit_sec)) || (fail_on_single_reject && hups)) { idx = IDX_TIMEOUT; @@ -1282,9 +1283,9 @@ } } else { - switch_yield(1000); + switch_yield(10000); } - + } notready:

1 0

[commit] r9898 - freeswitch/trunk/src/mod/endpoints/mod_loopback
by Freeswitch SVN 08 Oct '08

08 Oct '08

Author: brian Date: Wed Oct 8 15:32:25 2008 New Revision: 9898 Modified: freeswitch/trunk/src/mod/endpoints/mod_loopback/mod_loopback.c Log: tweak Modified: freeswitch/trunk/src/mod/endpoints/mod_loopback/mod_loopback.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_loopback/mod_loopback.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_loopback/mod_loopback.c Wed Oct 8 15:32:25 2008 @@ -693,7 +693,7 @@ caller_profile->dialplan = switch_core_strdup(caller_profile->pool, "xml"); } - switch_snprintf(name, sizeof(name), "Loopback/%s-a", caller_profile->destination_number); + switch_snprintf(name, sizeof(name), "loopback/%s-a", caller_profile->destination_number); switch_channel_set_name(channel, name); switch_channel_set_caller_profile(channel, caller_profile);

1 0

[commit] r9897 - freeswitch/trunk/conf/dialplan
by Freeswitch SVN 08 Oct '08

08 Oct '08

Author: brian Date: Wed Oct 8 14:33:57 2008 New Revision: 9897 Modified: freeswitch/trunk/conf/dialplan/default.xml Log: various examples of how to override the ringback on a call Modified: freeswitch/trunk/conf/dialplan/default.xml ============================================================================== --- freeswitch/trunk/conf/dialplan/default.xml (original) +++ freeswitch/trunk/conf/dialplan/default.xml Wed Oct 8 14:33:57 2008 @@ -413,6 +413,72 @@ </condition> </extension> +  + +  + <extension name="wait"> + <condition field="destination_number" expression="^wait$"> + <action application="pre_answer"/> + <action application="sleep" data="20000"/> + <action application="answer"/> + <action application="sleep" data="1000"/> + <action application="playback" data="voicemail/vm-goodbye.wav"/> + <action application="hangup"/> + </condition> + </extension> + +  + <extension name="ringback_180"> + <condition field="destination_number" expression="^9980$"> + <action application="ring_ready"/> + <action application="sleep" data="20000"/> + <action application="answer"/> + <action application="sleep" data="1000"/> + <action application="playback" data="voicemail/vm-goodbye.wav"/> + <action application="hangup"/> + </condition> + </extension> + +  + <extension name="ringback_183_uk_ring"> + <condition field="destination_number" expression="^9981$"> + <action application="set" data="ringback=$${uk-ring}"/> + <action application="bridge" data="loopback/wait"/> + </condition> + </extension> + +  + <extension name="ringback_183_music_ring"> + <condition field="destination_number" expression="^9982$"> + <action application="set" data="ringback=$${hold_music}"/> + <action application="bridge" data="loopback/wait"/> + </condition> + </extension> + +  + <extension name="ringback_post_answer_uk_ring"> + <condition field="destination_number" expression="^9983$"> + <action application="set" data="transfer_ringback=$${uk-ring}"/> + <action application="answer"/> + <action application="bridge" data="loopback/wait"/> + </condition> + </extension> + +  + <extension name="ringback_post_answer_music"> + <condition field="destination_number" expression="^9984$"> + <action application="set" data="transfer_ringback=$${hold_music}"/> + <action application="answer"/> + <action application="bridge" data="loopback/wait"/> + </condition> + </extension> + <extension name="show_info"> <condition field="destination_number" expression="^9992$"> <action application="answer"/>

1 0

[commit] r9896 - in freeswitch/trunk/src: . mod/endpoints/mod_loopback
by Freeswitch SVN 08 Oct '08

08 Oct '08

Author: anthm Date: Wed Oct 8 14:15:00 2008 New Revision: 9896 Modified: freeswitch/trunk/src/mod/endpoints/mod_loopback/mod_loopback.c freeswitch/trunk/src/switch_ivr_originate.c Log: allow endpoints to realize the originator is ignoring early media and use that feature in mod_loopback to avoid obscure situation Modified: freeswitch/trunk/src/mod/endpoints/mod_loopback/mod_loopback.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_loopback/mod_loopback.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_loopback/mod_loopback.c Wed Oct 8 14:15:00 2008 @@ -51,7 +51,8 @@ TFLAG_WRITE = (1 << 2), TFLAG_CNG = (1 << 3), TFLAG_BRIDGE = (1 << 4), - TFLAG_BOWOUT = (1 << 5) + TFLAG_BOWOUT = (1 << 5), + TFLAG_NO_EARLY = (1 << 6) } TFLAGS; struct private_object { @@ -241,6 +242,11 @@ switch_set_flag_locked(b_tech_pvt, TFLAG_LINKED); switch_set_flag_locked(b_tech_pvt, TFLAG_OUTBOUND); + if (switch_test_flag(tech_pvt, TFLAG_NO_EARLY)) { + switch_set_flag_locked(b_tech_pvt, TFLAG_NO_EARLY); + switch_clear_flag_locked(tech_pvt, TFLAG_NO_EARLY); + } + switch_channel_set_flag(channel, CF_ACCEPT_CNG); switch_ivr_transfer_variable(session, tech_pvt->other_session, "process_cdr"); @@ -328,13 +334,17 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s CHANNEL HANGUP\n", switch_channel_get_name(channel)); switch_clear_flag_locked(tech_pvt, TFLAG_LINKED); + if (tech_pvt->other_tech_pvt) { switch_clear_flag_locked(tech_pvt->other_tech_pvt, TFLAG_LINKED); + tech_pvt->other_tech_pvt = NULL; } if (tech_pvt->other_session) { switch_channel_hangup(tech_pvt->other_channel, switch_channel_get_cause(channel)); switch_core_session_rwunlock(tech_pvt->other_session); + tech_pvt->other_channel = NULL; + tech_pvt->other_session = NULL; } return SWITCH_STATUS_SUCCESS; @@ -467,6 +477,10 @@ if (!switch_test_flag(tech_pvt, TFLAG_LINKED)) { goto end; } + + if (switch_test_flag(tech_pvt, TFLAG_NO_EARLY)) { + switch_set_flag(tech_pvt, TFLAG_CNG); + } *frame = NULL; @@ -582,13 +596,18 @@ switch (msg->message_id) { case SWITCH_MESSAGE_INDICATE_ANSWER: - if (switch_test_flag(tech_pvt, TFLAG_OUTBOUND)) { - switch_channel_answer(tech_pvt->other_channel); + if (tech_pvt->other_channel) { + if (switch_test_flag(tech_pvt, TFLAG_OUTBOUND)) { + switch_channel_answer(tech_pvt->other_channel); + switch_clear_flag(tech_pvt, TFLAG_NO_EARLY); + } } break; case SWITCH_MESSAGE_INDICATE_PROGRESS: - if (switch_test_flag(tech_pvt, TFLAG_OUTBOUND)) { - switch_channel_pre_answer(tech_pvt->other_channel); + if (tech_pvt->other_channel) { + if (switch_test_flag(tech_pvt, TFLAG_OUTBOUND)) { + switch_channel_pre_answer(tech_pvt->other_channel); + } } break; case SWITCH_MESSAGE_INDICATE_BRIDGE: @@ -623,12 +642,13 @@ private_t *tech_pvt; switch_channel_t *channel; switch_caller_profile_t *caller_profile; - + const char *var; + switch_core_session_add_stream(*new_session, NULL); if ((tech_pvt = (private_t *) switch_core_session_alloc(*new_session, sizeof(private_t))) != 0) { channel = switch_core_session_get_channel(*new_session); - switch_snprintf(name, sizeof(name), "Loopback/%s-a", outbound_profile->destination_number); + switch_snprintf(name, sizeof(name), "loopback/%s-a", outbound_profile->destination_number); switch_channel_set_name(channel, name); if (tech_init(tech_pvt, *new_session, session ? switch_core_session_get_read_codec(session) : NULL) != SWITCH_STATUS_SUCCESS) { switch_core_session_destroy(new_session); @@ -640,6 +660,10 @@ return SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER; } + if ((var = switch_event_get_header(var_event, "originate_early_media")) && !switch_true(var)) { + switch_set_flag(tech_pvt, TFLAG_NO_EARLY); + } + if (outbound_profile) { char *dialplan = NULL, *context = NULL; Modified: freeswitch/trunk/src/switch_ivr_originate.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_originate.c (original) +++ freeswitch/trunk/src/switch_ivr_originate.c Wed Oct 8 14:15:00 2008 @@ -685,6 +685,14 @@ } switch_channel_set_variable(caller_channel, "originate_disposition", "failure"); + + if (switch_channel_test_flag(caller_channel, CF_PROXY_MODE) || switch_channel_test_flag(caller_channel, CF_PROXY_MEDIA)) { + ringback_data = NULL; + } + } + + if (ringback_data) { + early_ok = 0; } if ((var = switch_event_get_header(var_event, "group_confirm_key"))) { @@ -957,6 +965,8 @@ myflags |= SOF_NO_EFFECTIVE_CID_NAME; } + switch_event_add_header_string(var_event, SWITCH_STACK_BOTTOM, "originate_early_media", early_ok ? "true" : "false"); + if ((reason = switch_core_session_outgoing_channel(session, var_event, chan_type, new_profile, &new_session, &pool,

1 0

[commit] r9895 - freeswitch/trunk/src
by Freeswitch SVN 08 Oct '08

08 Oct '08

Author: anthm Date: Wed Oct 8 14:12:11 2008 New Revision: 9895 Modified: freeswitch/trunk/src/switch_channel.c Log: s/Pre-Answer/Ring-Ready/ Modified: freeswitch/trunk/src/switch_channel.c ============================================================================== --- freeswitch/trunk/src/switch_channel.c (original) +++ freeswitch/trunk/src/switch_channel.c Wed Oct 8 14:12:11 2008 @@ -1458,7 +1458,7 @@ switch_event_t *event; if (!switch_channel_test_flag(channel, CF_RING_READY)) { - switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, func, line, NULL, SWITCH_LOG_NOTICE, "Ring-Ready %s!\n", channel->name); + switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, func, line, NULL, SWITCH_LOG_NOTICE, "Pre-Answer %s!\n", channel->name); switch_channel_set_flag(channel, CF_RING_READY); if (channel->caller_profile && channel->caller_profile->times) { switch_mutex_lock(channel->profile_mutex);

1 0

[commit] r9894 - freeswitch/trunk/src/mod/endpoints/mod_loopback
by Freeswitch SVN 08 Oct '08

08 Oct '08

Author: anthm Date: Wed Oct 8 12:39:43 2008 New Revision: 9894 Modified: freeswitch/trunk/src/mod/endpoints/mod_loopback/mod_loopback.c Log: fix cng frame issue Modified: freeswitch/trunk/src/mod/endpoints/mod_loopback/mod_loopback.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_loopback/mod_loopback.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_loopback/mod_loopback.c Wed Oct 8 12:39:43 2008 @@ -468,6 +468,8 @@ goto end; } + *frame = NULL; + while(switch_test_flag(tech_pvt, TFLAG_LINKED) && tech_pvt->other_tech_pvt && !switch_test_flag(tech_pvt->other_tech_pvt, TFLAG_WRITE)) { if (!switch_channel_ready(channel)) { goto end; @@ -478,17 +480,23 @@ switch_yield(1000); } - if (switch_test_flag(tech_pvt, TFLAG_CNG)) { - *frame = &tech_pvt->cng_frame; - switch_clear_flag_locked(tech_pvt, TFLAG_CNG); - } else if (tech_pvt->other_tech_pvt && switch_test_flag(tech_pvt->other_tech_pvt, TFLAG_WRITE)) { - *frame = &tech_pvt->other_tech_pvt->write_frame; - switch_clear_flag_locked(tech_pvt->other_tech_pvt, TFLAG_WRITE); + if (switch_test_flag(tech_pvt, TFLAG_LINKED)) { + if (switch_test_flag(tech_pvt, TFLAG_CNG)) { + *frame = &tech_pvt->cng_frame; + tech_pvt->cng_frame.codec = &tech_pvt->read_codec; + switch_set_flag((&tech_pvt->cng_frame), SFF_CNG); + switch_clear_flag_locked(tech_pvt, TFLAG_CNG); + } else if (tech_pvt->other_tech_pvt && switch_test_flag(tech_pvt->other_tech_pvt, TFLAG_WRITE)) { + *frame = &tech_pvt->other_tech_pvt->write_frame; + switch_clear_flag_locked(tech_pvt->other_tech_pvt, TFLAG_WRITE); + } } - //printf("READ %s %d\n", switch_channel_get_name(channel), (*frame)->datalen); - status = SWITCH_STATUS_SUCCESS; - + if (*frame) { + status = SWITCH_STATUS_SUCCESS; + } else { + status = SWITCH_STATUS_FALSE; + } end:

1 0

[commit] r9893 - freeswitch/trunk/src/mod/endpoints/mod_loopback
by Freeswitch SVN 08 Oct '08

08 Oct '08

Author: anthm Date: Wed Oct 8 12:04:39 2008 New Revision: 9893 Modified: freeswitch/trunk/src/mod/endpoints/mod_loopback/mod_loopback.c Log: tweak Modified: freeswitch/trunk/src/mod/endpoints/mod_loopback/mod_loopback.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_loopback/mod_loopback.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_loopback/mod_loopback.c Wed Oct 8 12:04:39 2008 @@ -332,8 +332,10 @@ switch_clear_flag_locked(tech_pvt->other_tech_pvt, TFLAG_LINKED); } - switch_channel_hangup(tech_pvt->other_channel, switch_channel_get_cause(channel)); - switch_core_session_rwunlock(tech_pvt->other_session); + if (tech_pvt->other_session) { + switch_channel_hangup(tech_pvt->other_channel, switch_channel_get_cause(channel)); + switch_core_session_rwunlock(tech_pvt->other_session); + } return SWITCH_STATUS_SUCCESS; }

1 0

[commit] r9892 - freeswitch/trunk/src
by Freeswitch SVN 08 Oct '08

08 Oct '08

Author: anthm Date: Wed Oct 8 10:53:31 2008 New Revision: 9892 Modified: freeswitch/trunk/src/switch_core.c Log: fix restart + -u issue FSCORE-199 Modified: freeswitch/trunk/src/switch_core.c ============================================================================== --- freeswitch/trunk/src/switch_core.c (original) +++ freeswitch/trunk/src/switch_core.c Wed Oct 8 10:53:31 2008 @@ -564,6 +564,11 @@ runas_gid = gr->gr_gid; } + if (runas_uid && getuid() == runas_uid && (!runas_gid || runas_gid == getgid())) { + /* already running as the right user and group, nothing to do! */ + return 0; + } + if (runas_uid) { #ifdef HAVE_SETGROUPS /*

1 0