- Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r10122 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 23 Oct '08

23 Oct '08

Author: mikej Date: Wed Oct 22 22:46:36 2008 New Revision: 10122 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Log: tweak Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Wed Oct 22 22:46:36 2008 @@ -2114,11 +2114,6 @@ tech_pvt->dest_to = tech_pvt->dest; } - switch_channel_set_flag(nchannel, CF_OUTBOUND); - switch_set_flag_locked(tech_pvt, TFLAG_OUTBOUND); - - sofia_glue_attach_private(nsession, profile, tech_pvt, dest); - if (tech_pvt->local_url) { switch_channel_set_variable(nchannel, "sip_local_url", tech_pvt->local_url); if (profile->pres_type) { @@ -2130,7 +2125,12 @@ caller_profile = switch_caller_profile_clone(nsession, outbound_profile); caller_profile->destination_number = switch_core_strdup(caller_profile->pool, dest); switch_channel_set_caller_profile(nchannel, caller_profile); + switch_channel_set_flag(nchannel, CF_OUTBOUND); + switch_set_flag_locked(tech_pvt, TFLAG_OUTBOUND); switch_clear_flag_locked(tech_pvt, TFLAG_LATE_NEGOTIATION); + + sofia_glue_attach_private(nsession, profile, tech_pvt, dest); + if (switch_channel_get_state(nchannel) == CS_NEW) { switch_channel_set_state(nchannel, CS_INIT); }

1 0

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

23 Oct '08

Author: mikej Date: Wed Oct 22 21:39:04 2008 New Revision: 10121 Modified: freeswitch/trunk/src/switch_channel.c freeswitch/trunk/src/switch_ivr_originate.c Log: build tweaks Modified: freeswitch/trunk/src/switch_channel.c ============================================================================== --- freeswitch/trunk/src/switch_channel.c (original) +++ freeswitch/trunk/src/switch_channel.c Wed Oct 22 21:39:04 2008 @@ -1534,14 +1534,14 @@ switch_mutex_lock(channel->profile_mutex); channel->caller_profile->times->progress_media = switch_timestamp_now(); if (channel->caller_profile->originator_caller_profile) { - switch_core_session_t *other_session; - if ((other_session = switch_core_session_locate(channel->caller_profile->originator_caller_profile->uuid))) { + switch_core_session_t *osession; + if ((osession = switch_core_session_locate(channel->caller_profile->originator_caller_profile->uuid))) { switch_channel_t *other_channel; - other_channel = switch_core_session_get_channel(other_session); + other_channel = switch_core_session_get_channel(osession); if (other_channel->caller_profile) { other_channel->caller_profile->times->progress_media = channel->caller_profile->times->progress_media; } - switch_core_session_rwunlock(other_session); + switch_core_session_rwunlock(osession); } channel->caller_profile->originator_caller_profile->times->progress_media = channel->caller_profile->times->progress_media; } 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 22 21:39:04 2008 @@ -878,7 +878,7 @@ for (r = 0; r < or_argc; r++) { uint32_t hups; - char *p, *e = NULL; + char *p, *end = NULL; const char *var_begin, *var_end; reason = SWITCH_CAUSE_NONE; @@ -914,14 +914,14 @@ p = pipe_names[r]; while(p && *p) { if (*p == '[') { - e = switch_find_end_paren(p, '[', ']'); + end = switch_find_end_paren(p, '[', ']'); } - if (e && p && *p == ',') { + if (end && p && *p == ',') { *p = '|'; } - if (p == e) { + if (p == end) { e = NULL; } @@ -937,7 +937,7 @@ for (i = 0; i < and_argc; i++) { char *vdata; - e = NULL; + end = NULL; chan_type = peer_names[i]; while (chan_type && *chan_type && *chan_type == ' ') { @@ -945,12 +945,12 @@ } vdata = chan_type; - e = switch_find_end_paren(vdata, '[', ']'); + end = switch_find_end_paren(vdata, '[', ']'); - if (e) { + if (end) { vdata++; - *e++ = '\0'; - chan_type = e; + *end++ = '\0'; + chan_type = end; } else { vdata = NULL; }

1 0

[commit] r10120 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 23 Oct '08

23 Oct '08

Author: mikej Date: Wed Oct 22 21:14:07 2008 New Revision: 10120 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Log: don't put CN in sdp answer if it was not in the offer. Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Wed Oct 22 21:14:07 2008 @@ -2114,6 +2114,9 @@ tech_pvt->dest_to = tech_pvt->dest; } + switch_channel_set_flag(nchannel, CF_OUTBOUND); + switch_set_flag_locked(tech_pvt, TFLAG_OUTBOUND); + sofia_glue_attach_private(nsession, profile, tech_pvt, dest); if (tech_pvt->local_url) { @@ -2127,8 +2130,6 @@ caller_profile = switch_caller_profile_clone(nsession, outbound_profile); caller_profile->destination_number = switch_core_strdup(caller_profile->pool, dest); switch_channel_set_caller_profile(nchannel, caller_profile); - switch_channel_set_flag(nchannel, CF_OUTBOUND); - switch_set_flag_locked(tech_pvt, TFLAG_OUTBOUND); switch_clear_flag_locked(tech_pvt, TFLAG_LATE_NEGOTIATION); if (switch_channel_get_state(nchannel) == CS_NEW) { switch_channel_set_state(nchannel, CS_INIT); Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Wed Oct 22 21:14:07 2008 @@ -413,7 +413,7 @@ tech_pvt->dtmf_type = profile->dtmf_type; - if (!(tech_pvt->profile->pflags & PFLAG_SUPPRESS_CNG)) { + if (switch_channel_test_flag(tech_pvt->channel, CF_OUTBOUND) && !(tech_pvt->profile->pflags & PFLAG_SUPPRESS_CNG)) { if (tech_pvt->bcng_pt) { tech_pvt->cng_pt = tech_pvt->bcng_pt; } else if (!tech_pvt->cng_pt) {

1 0

[commit] r10119 - freeswitch/trunk/src/mod/languages/mod_managed/managed
by Freeswitch SVN 22 Oct '08

22 Oct '08

Author: michaelgg Date: Wed Oct 22 18:10:58 2008 New Revision: 10119 Modified: freeswitch/trunk/src/mod/languages/mod_managed/managed/Demo.cs Log: de-oops demo Modified: freeswitch/trunk/src/mod/languages/mod_managed/managed/Demo.cs ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_managed/managed/Demo.cs (original) +++ freeswitch/trunk/src/mod/languages/mod_managed/managed/Demo.cs Wed Oct 22 18:10:58 2008 @@ -36,68 +36,45 @@ using System.Linq; using System.Text; -namespace FreeSWITCH.Demo -{ - public class AppDemo : AppFunction - { - new protected static bool Load() - { +namespace FreeSWITCH.Demo { + public class AppDemo : AppFunction { + new protected static bool Load() { Log.WriteLine(LogLevel.Info, "Inside AppDemo::Load."); return true; } protected override void Run() { - bool isRecording = false; + Session.Answer(); Session.DtmfReceivedFunction = (d, t) => { - Log.WriteLine(LogLevel.Critical, "RECORDING is {0}", Session.GetVariable("RECORDING")); Log.WriteLine(LogLevel.Info, "Received {0} for {1}.", d, t); - - if (isRecording) { - Log.WriteLine(LogLevel.Info, "Recording: [TRUE] Returning crap"); - return "1"; - } else { - Log.WriteLine(LogLevel.Info, "Recording: [FALSE] Returning null"); - return null; - } + return ""; }; - Session.StreamFile(@"C:\freeswitch\Debug\sounds\en\us\callie\voicemail\8000\vm-hello.wav", 0); - var fn = @"C:\" + Session.GetHashCode() + ".wav"; - isRecording = true; - Session.SetVariable("RECORDING", "true"); - Session.RecordFile(fn, 600, 500, 3); - isRecording = false; - Session.SetVariable("RECORDING", "false"); - Session.sleep(500); - Log.WriteLine(LogLevel.Info, "WW GROUP: Finished Recording file"); - var res = Session.PlayAndGetDigits(1, 1, 3, 3000, "*", @"C:\freeswitch\libs\sounds\en\us\callie\ivr\8000\ivr-sample_submenu.wav", @"C:\freeswitch\libs\sounds\en\us\callie\ivr\8000\ivr-sample_submenu.wav", "1|2|3|9|#"); - Log.WriteLine(LogLevel.Info, "WW GROUP: Message Menu [" + res + "]"); - } - - void hangupHook() - { + Log.WriteLine(LogLevel.Info, "Inside AppDemo.Run (args '{0}'); HookState is {1}. Now will collect digits.", Arguments, Session.HookState); + Session.CollectDigits(5000); // Hanging up here will cause an abort and the next line won't be written + Log.WriteLine(LogLevel.Info, "AppDemo is finishing its run and will now hang up."); + Session.Hangup("USER_BUSY"); + } + + void hangupHook() { Log.WriteLine(LogLevel.Debug, "AppDemo hanging up, UUID: {0}.", this.Uuid); } - protected override bool AbortOnHangup { get { return true; } } + protected override bool AbortOnHangup { get { return true; } } } - public class ApiDemo : ApiFunction - { - new protected static bool Load() - { + public class ApiDemo : ApiFunction { + new protected static bool Load() { Log.WriteLine(LogLevel.Debug, "Inside ApiDemo::Load."); return true; } - public override void ExecuteBackground(string args) - { + public override void ExecuteBackground(string args) { Log.WriteLine(LogLevel.Debug, "ApiDemo on a background thread #({0}), with args '{1}'.", System.Threading.Thread.CurrentThread.ManagedThreadId, args); } - public override void Execute(Native.Stream stream, Native.Event evt, string args) - { + public override void Execute(Native.Stream stream, Native.Event evt, string args) { stream.Write(string.Format("ApiDemo executed with args '{0}' and event type {1}.", args, evt == null ? "<none>" : evt.GetEventType())); }

1 0

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

22 Oct '08

Author: michaelgg Date: Wed Oct 22 18:02:58 2008 New Revision: 10118 Modified: freeswitch/trunk/src/mod/languages/mod_managed/freeswitch_managed.cpp freeswitch/trunk/src/mod/languages/mod_managed/managed/Demo.cs freeswitch/trunk/src/mod/languages/mod_managed/mod_managed.cpp Log: Make cpp code as unmanaged as possible Modified: freeswitch/trunk/src/mod/languages/mod_managed/freeswitch_managed.cpp ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_managed/freeswitch_managed.cpp (original) +++ freeswitch/trunk/src/mod/languages/mod_managed/freeswitch_managed.cpp Wed Oct 22 18:02:58 2008 @@ -34,6 +34,10 @@ #include <switch_cpp.h> #include "freeswitch_managed.h" +#ifdef _MANAGED +#pragma unmanaged +#endif + ManagedSession::ManagedSession():CoreSession() { Modified: freeswitch/trunk/src/mod/languages/mod_managed/managed/Demo.cs ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_managed/managed/Demo.cs (original) +++ freeswitch/trunk/src/mod/languages/mod_managed/managed/Demo.cs Wed Oct 22 18:02:58 2008 @@ -46,17 +46,31 @@ return true; } - protected override void Run() - { - Session.Answer(); + protected override void Run() { + bool isRecording = false; Session.DtmfReceivedFunction = (d, t) => { + Log.WriteLine(LogLevel.Critical, "RECORDING is {0}", Session.GetVariable("RECORDING")); Log.WriteLine(LogLevel.Info, "Received {0} for {1}.", d, t); - return ""; + + if (isRecording) { + Log.WriteLine(LogLevel.Info, "Recording: [TRUE] Returning crap"); + return "1"; + } else { + Log.WriteLine(LogLevel.Info, "Recording: [FALSE] Returning null"); + return null; + } }; - Log.WriteLine(LogLevel.Info, "Inside AppDemo.Run (args '{0}'); HookState is {1}. Now will collect digits.", Arguments, Session.HookState); - Session.CollectDigits(5000); // Hanging up here will cause an abort and the next line won't be written - Log.WriteLine(LogLevel.Info, "AppDemo is finishing its run and will now hang up."); - Session.Hangup("USER_BUSY"); + Session.StreamFile(@"C:\freeswitch\Debug\sounds\en\us\callie\voicemail\8000\vm-hello.wav", 0); + var fn = @"C:\" + Session.GetHashCode() + ".wav"; + isRecording = true; + Session.SetVariable("RECORDING", "true"); + Session.RecordFile(fn, 600, 500, 3); + isRecording = false; + Session.SetVariable("RECORDING", "false"); + Session.sleep(500); + Log.WriteLine(LogLevel.Info, "WW GROUP: Finished Recording file"); + var res = Session.PlayAndGetDigits(1, 1, 3, 3000, "*", @"C:\freeswitch\libs\sounds\en\us\callie\ivr\8000\ivr-sample_submenu.wav", @"C:\freeswitch\libs\sounds\en\us\callie\ivr\8000\ivr-sample_submenu.wav", "1|2|3|9|#"); + Log.WriteLine(LogLevel.Info, "WW GROUP: Message Menu [" + res + "]"); } void hangupHook() 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 22 18:02:58 2008 @@ -362,6 +362,9 @@ return SWITCH_STATUS_SUCCESS; } +#ifdef _MANAGED +#pragma unmanaged +#endif SWITCH_STANDARD_API(managedrun_api_function) { if (switch_strlen_zero(cmd)) {

1 0

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

22 Oct '08

Author: mikej Date: Wed Oct 22 17:55:06 2008 New Revision: 10117 Modified: freeswitch/trunk/src/switch_ivr_originate.c Log: windows build 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 22 17:55:06 2008 @@ -625,6 +625,7 @@ *e = '\0'; data = e + 1; } else { + int j = 0, k = 0; if (e) { *e = ','; } @@ -633,11 +634,10 @@ goto var_extract_error; } /* swallow the opening bracket */ - int i = 0, j = 0; - while ((data + i) && *(data + i)) { - j = i; i++; + while ((data + k) && *(data + k)) { + j = k; k++; /* note that this affects vars[] */ - data[j] = data[i]; + data[j] = data[k]; } *(--e) = '\0'; data = e + 1;

1 0

[commit] r10116 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 22 Oct '08

22 Oct '08

Author: anthm Date: Wed Oct 22 14:33:12 2008 New Revision: 10116 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c Log: update to previous patch Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c Wed Oct 22 14:33:12 2008 @@ -795,7 +795,7 @@ if (multi_reg) { if (multi_reg_contact) { - sql = switch_mprintf("delete from sip_registrations where contact='%q'", contact_str); + sql = switch_mprintf("delete from sip_registrations where sip_user='%q' and sip_host='%q' and contact='%q'", to_user, reg_host, contact_str); } else { sql = switch_mprintf("delete from sip_registrations where call_id='%q'", call_id); } @@ -863,7 +863,7 @@ } if (multi_reg_contact) { - sql = switch_mprintf("delete from sip_subscriptions where contact='%q'", contact_str); + sql = switch_mprintf("delete from sip_subscriptions where sip_user='%q' and sip_host='%q' and contact='%q'", to_user, reg_host, contact_str); } else { sql = switch_mprintf("delete from sip_subscriptions where call_id='%q'", call_id); } @@ -871,7 +871,7 @@ sofia_glue_execute_sql(profile, &sql, SWITCH_TRUE); if (multi_reg_contact) { - sql = switch_mprintf("delete from sip_registrations where contact='%q'", contact_str); + sql = switch_mprintf("delete from sip_registrations where sip_user='%q' and sip_host='%q' and contact='%q'", to_user, reg_host, contact_str); } else { sql = switch_mprintf("delete from sip_registrations where call_id='%q'", call_id); }

1 0

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

22 Oct '08

Author: anthm Date: Wed Oct 22 14:32:54 2008 New Revision: 10115 Modified: freeswitch/trunk/src/switch_channel.c Log: pass pdd data to a leg on oubound calls using bridge Modified: freeswitch/trunk/src/switch_channel.c ============================================================================== --- freeswitch/trunk/src/switch_channel.c (original) +++ freeswitch/trunk/src/switch_channel.c Wed Oct 22 14:32:54 2008 @@ -740,6 +740,9 @@ { switch_assert(channel != NULL); switch_set_flag_locked(channel, flags); + if (flags & CF_OUTBOUND) { + switch_channel_set_variable(channel, "is_outbound", "true"); + } } SWITCH_DECLARE(void) switch_channel_set_state_flag(switch_channel_t *channel, switch_channel_flag_t flags) @@ -755,6 +758,9 @@ { switch_assert(channel != NULL); switch_clear_flag_locked(channel, flags); + if (flags & CF_OUTBOUND) { + switch_channel_set_variable(channel, "is_outbound", NULL); + } } SWITCH_DECLARE(switch_channel_state_t) switch_channel_get_state(switch_channel_t *channel) @@ -1254,6 +1260,11 @@ switch_assert(channel != NULL); switch_assert(channel->caller_profile != NULL); switch_mutex_lock(channel->profile_mutex); + + if (!caller_profile->times) { + caller_profile->times = (switch_channel_timetable_t *) switch_core_alloc(caller_profile->pool, sizeof(*caller_profile->times)); + } + if (channel->caller_profile) { caller_profile->next = channel->caller_profile->originator_caller_profile; channel->caller_profile->originator_caller_profile = caller_profile; @@ -1464,6 +1475,18 @@ if (channel->caller_profile && channel->caller_profile->times) { switch_mutex_lock(channel->profile_mutex); channel->caller_profile->times->progress = switch_timestamp_now(); + if (channel->caller_profile->originator_caller_profile) { + switch_core_session_t *other_session; + if ((other_session = switch_core_session_locate(channel->caller_profile->originator_caller_profile->uuid))) { + switch_channel_t *other_channel; + other_channel = switch_core_session_get_channel(other_session); + if (other_channel->caller_profile) { + other_channel->caller_profile->times->progress = channel->caller_profile->times->progress; + } + switch_core_session_rwunlock(other_session); + } + channel->caller_profile->originator_caller_profile->times->progress = channel->caller_profile->times->progress; + } switch_mutex_unlock(channel->profile_mutex); } @@ -1506,10 +1529,22 @@ switch_channel_event_set_data(channel, event); switch_event_fire(&event); } - + if (channel->caller_profile && channel->caller_profile->times) { switch_mutex_lock(channel->profile_mutex); channel->caller_profile->times->progress_media = switch_timestamp_now(); + if (channel->caller_profile->originator_caller_profile) { + switch_core_session_t *other_session; + if ((other_session = switch_core_session_locate(channel->caller_profile->originator_caller_profile->uuid))) { + switch_channel_t *other_channel; + other_channel = switch_core_session_get_channel(other_session); + if (other_channel->caller_profile) { + other_channel->caller_profile->times->progress_media = channel->caller_profile->times->progress_media; + } + switch_core_session_rwunlock(other_session); + } + channel->caller_profile->originator_caller_profile->times->progress_media = channel->caller_profile->times->progress_media; + } switch_mutex_unlock(channel->profile_mutex); }

1 0

[commit] r10114 - freeswitch/trunk/debian
by Freeswitch SVN 22 Oct '08

22 Oct '08

Author: cypromis Date: Wed Oct 22 14:14:58 2008 New Revision: 10114 Modified: freeswitch/trunk/debian/freeswitch.init Log: make freeswitch stop graceflly with /etc/init.d/freeswitch stop on debian add working dir to start-stop-dir so freeswitch dumps core in workdir Modified: freeswitch/trunk/debian/freeswitch.init ============================================================================== --- freeswitch/trunk/debian/freeswitch.init (original) +++ freeswitch/trunk/debian/freeswitch.init Wed Oct 22 14:14:58 2008 @@ -22,6 +22,7 @@ USER=freeswitch PIDFILE=/opt/freeswitch/log/$NAME.pid SCRIPTNAME=/etc/init.d/$NAME +WORKDIR=/opt/$NAME # Check if we are being executed by init @@ -45,7 +46,7 @@ # Define LSB log_* functions. # Depend on lsb-base (>= 3.0-6) to ensure that this file is present. -[ -x /lib/init/vars.sh ] && . /lib/lsb/init-functions +. /lib/lsb/init-functions # # Function that starts the daemon/service @@ -56,9 +57,9 @@ # 0 if daemon has been started # 1 if daemon was already running # 2 if daemon could not be started - start-stop-daemon -c $USER --start --quiet --pidfile $PIDFILE --exec $DAEMON --test > /dev/null \ + start-stop-daemon -d $WORKDIR -c $USER --start --quiet --pidfile $PIDFILE --exec $DAEMON --test > /dev/null \ || return 1 - start-stop-daemon -c $USER --start --quiet --pidfile $PIDFILE --exec $DAEMON -- \ + start-stop-daemon -d $WORKDIR -c $USER --start --quiet --pidfile $PIDFILE --exec $DAEMON -- \ $FREESWITCH_PARAMS \ || return 2 # Add code here, if necessary, that waits for the process to be ready @@ -76,7 +77,8 @@ # 1 if daemon was already stopped # 2 if daemon could not be stopped # other if a failure occurred - start-stop-daemon -c $USER --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE --name $NAME + $DAEMON -stop + start-stop-daemon -d $WORKDIR -c $USER --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE --name $NAME RETVAL="$?" [ "$RETVAL" = 2 ] && return 2 # Wait for children to finish too if this is a daemon that forks @@ -85,7 +87,7 @@ # that waits for the process to drop all resources that could be # needed by services started subsequently. A last resort is to # sleep for some time. - start-stop-daemon -c $USER --stop --quiet --oknodo --retry=0/30/KILL/5 --exec $DAEMON + start-stop-daemon -d $WORKDIR -c $USER --stop --quiet --oknodo --retry=0/30/KILL/5 --exec $DAEMON [ "$?" = 2 ] && return 2 # Many daemons don't delete their pidfiles when they exit. rm -f $PIDFILE

1 0

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

22 Oct '08

Author: anthm Date: Wed Oct 22 13:51:34 2008 New Revision: 10113 Modified: freeswitch/trunk/src/switch_ivr_originate.c Log: add patch from FSCORE-208 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 22 13:51:34 2008 @@ -25,6 +25,7 @@ * * Anthony Minessale II <anthmct(a)yahoo.com> * Michael Jerris <mike(a)jerris.com> + * Travis Cross <tc(a)traviscross.com> * * switch_ivr_originate.c -- IVR Library (originate) * @@ -577,6 +578,8 @@ switch_call_cause_t reason = SWITCH_CAUSE_NONE; uint8_t to = 0; char *var_val, *vars = NULL; + int var_block_count = 0; + char *e = NULL; const char *ringback_data = NULL; switch_codec_t *read_codec = NULL; uint8_t sent_ring = 0, early_ok = 1, return_ring_ready = 0, progress = 0; @@ -611,18 +614,41 @@ data++; } - if (*data == '{') { - char *e = switch_find_end_paren(data, '{', '}'); - - if (e) { + /* extract channel variables, allowing multiple sets of braces */ + while (*data == '{') { + if (!var_block_count) { + e = switch_find_end_paren(data, '{', '}'); + if (!e || !*e) { + goto var_extract_error; + } vars = data + 1; - *e++ = '\0'; - data = e; + *e = '\0'; + data = e + 1; } else { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Parse Error!\n"); - status = SWITCH_STATUS_GENERR; - goto done; - } + if (e) { + *e = ','; + } + e = switch_find_end_paren(data, '{', '}'); + if (!e || !*e) { + goto var_extract_error; + } + /* swallow the opening bracket */ + int i = 0, j = 0; + while ((data + i) && *(data + i)) { + j = i; i++; + /* note that this affects vars[] */ + data[j] = data[i]; + } + *(--e) = '\0'; + data = e + 1; + } + var_block_count++; + continue; + + var_extract_error: + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Parse Error!\n"); + status = SWITCH_STATUS_GENERR; + goto done; } /* strip leading spaces (again) */

1 0