- Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r9256 - freeswitch/trunk/scripts
by Freeswitch SVN 12 Aug '08

12 Aug '08

Author: brian Date: Mon Aug 11 23:00:14 2008 New Revision: 9256 Modified: freeswitch/trunk/scripts/mklm Log: w00t Modified: freeswitch/trunk/scripts/mklm ============================================================================== --- freeswitch/trunk/scripts/mklm (original) +++ freeswitch/trunk/scripts/mklm Mon Aug 11 23:00:14 2008 @@ -44,6 +44,7 @@ $line =~ s/<(.*?)>//gi;; $line =~ s/^\s*//; $line =~ s/\s*$//; + $line =~ s/_/ /g; @tmp = split(' ', $line); foreach $tmp (@tmp) { push(@in, uc($tmp));

1 0

[commit] r9255 - freeswitch/trunk/conf/directory/default
by Freeswitch SVN 12 Aug '08

12 Aug '08

Author: brian Date: Mon Aug 11 20:04:30 2008 New Revision: 9255 Modified: freeswitch/trunk/conf/directory/default/brian.xml Log: no bull Modified: freeswitch/trunk/conf/directory/default/brian.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/brian.xml (original) +++ freeswitch/trunk/conf/directory/default/brian.xml Mon Aug 11 20:04:30 2008 @@ -51,7 +51,7 @@    -  +  </params> <variables>

1 0

[commit] r9254 - freeswitch/trunk/debian
by Freeswitch SVN 12 Aug '08

12 Aug '08

Author: cypromis Date: Mon Aug 11 20:00:19 2008 New Revision: 9254 Modified: freeswitch/trunk/debian/freeswitch.conffiles freeswitch/trunk/debian/freeswitch.install Log: read before you type and don't try to be samrt at 2am Modified: freeswitch/trunk/debian/freeswitch.conffiles ============================================================================== --- freeswitch/trunk/debian/freeswitch.conffiles (original) +++ freeswitch/trunk/debian/freeswitch.conffiles Mon Aug 11 20:00:19 2008 @@ -11,7 +11,6 @@ /opt/freeswitch/conf/dialplan/features.xml /opt/freeswitch/conf/dialplan/extensions/00_pizza_demo.xml /opt/freeswitch/conf/dialplan/extensions/99999_enum.xml -/opt/freeswitch/conf/dialplan/extensions/default.xml /opt/freeswitch/conf/sip_profiles/external.xml /opt/freeswitch/conf/sip_profiles/nat.xml /opt/freeswitch/conf/sip_profiles/nat/example.xml Modified: freeswitch/trunk/debian/freeswitch.install ============================================================================== --- freeswitch/trunk/debian/freeswitch.install (original) +++ freeswitch/trunk/debian/freeswitch.install Mon Aug 11 20:00:19 2008 @@ -47,7 +47,6 @@ opt/freeswitch/conf/dialplan/features.xml opt/freeswitch/conf/dialplan/extensions/00_pizza_demo.xml opt/freeswitch/conf/dialplan/extensions/99999_enum.xml -opt/freeswitch/conf/dialplan/extensions/default.xml opt/freeswitch/conf/sip_profiles/external.xml opt/freeswitch/conf/sip_profiles/nat.xml opt/freeswitch/conf/sip_profiles/nat/example.xml

1 0

[commit] r9253 - freeswitch/trunk/src/mod/applications/mod_commands
by Freeswitch SVN 11 Aug '08

11 Aug '08

Author: anthm Date: Mon Aug 11 19:58:42 2008 New Revision: 9253 Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c Log: tweak 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 Mon Aug 11 19:58:42 2008 @@ -2024,7 +2024,7 @@ if (!strcasecmp(var, "text/plain")) { holder.http = NULL; } - } else { + } else if (holder.http) { stream->write_function(stream, "%s", "Content-Type: text/html\n\n"); }

1 0

[commit] r9252 - freeswitch/trunk/debian
by Freeswitch SVN 11 Aug '08

11 Aug '08

Author: cypromis Date: Mon Aug 11 19:44:39 2008 New Revision: 9252 Modified: freeswitch/trunk/debian/freeswitch.conffiles freeswitch/trunk/debian/freeswitch.install Log: I should get new glasses ... aain conffiles in debian debuild. Typo, its 99999_enum.xml and not 00000_enum.xml Modified: freeswitch/trunk/debian/freeswitch.conffiles ============================================================================== --- freeswitch/trunk/debian/freeswitch.conffiles (original) +++ freeswitch/trunk/debian/freeswitch.conffiles Mon Aug 11 19:44:39 2008 @@ -10,7 +10,7 @@ /opt/freeswitch/conf/dialplan/default.xml /opt/freeswitch/conf/dialplan/features.xml /opt/freeswitch/conf/dialplan/extensions/00_pizza_demo.xml -/opt/freeswitch/conf/dialplan/extensions/00000_enum.xml +/opt/freeswitch/conf/dialplan/extensions/99999_enum.xml /opt/freeswitch/conf/dialplan/extensions/default.xml /opt/freeswitch/conf/sip_profiles/external.xml /opt/freeswitch/conf/sip_profiles/nat.xml Modified: freeswitch/trunk/debian/freeswitch.install ============================================================================== --- freeswitch/trunk/debian/freeswitch.install (original) +++ freeswitch/trunk/debian/freeswitch.install Mon Aug 11 19:44:39 2008 @@ -46,7 +46,7 @@ opt/freeswitch/conf/dialplan/default.xml opt/freeswitch/conf/dialplan/features.xml opt/freeswitch/conf/dialplan/extensions/00_pizza_demo.xml -opt/freeswitch/conf/dialplan/extensions/00000_enum.xml +opt/freeswitch/conf/dialplan/extensions/99999_enum.xml opt/freeswitch/conf/dialplan/extensions/default.xml opt/freeswitch/conf/sip_profiles/external.xml opt/freeswitch/conf/sip_profiles/nat.xml

1 0

[commit] r9251 - freeswitch/trunk/debian
by Freeswitch SVN 11 Aug '08

11 Aug '08

Author: cypromis Date: Mon Aug 11 19:20:01 2008 New Revision: 9251 Modified: freeswitch/trunk/debian/freeswitch.install Log: hmmm conffiles of course need to go into the package as well .... Modified: freeswitch/trunk/debian/freeswitch.install ============================================================================== --- freeswitch/trunk/debian/freeswitch.install (original) +++ freeswitch/trunk/debian/freeswitch.install Mon Aug 11 19:20:01 2008 @@ -45,8 +45,9 @@ opt/freeswitch/conf/dialplan/public.xml opt/freeswitch/conf/dialplan/default.xml opt/freeswitch/conf/dialplan/features.xml -opt/freeswitch/conf/dialplan/extensions -opt/freeswitch/conf/dialplan/extensions/*.xml +opt/freeswitch/conf/dialplan/extensions/00_pizza_demo.xml +opt/freeswitch/conf/dialplan/extensions/00000_enum.xml +opt/freeswitch/conf/dialplan/extensions/default.xml opt/freeswitch/conf/sip_profiles/external.xml opt/freeswitch/conf/sip_profiles/nat.xml opt/freeswitch/conf/sip_profiles/nat/example.xml

1 0

[commit] r9250 - freeswitch/trunk/debian
by Freeswitch SVN 11 Aug '08

11 Aug '08

Author: cypromis Date: Mon Aug 11 18:22:25 2008 New Revision: 9250 Modified: freeswitch/trunk/debian/freeswitch.conffiles Log: FSBUILD-68 Files missing from debian conffiles script Modified: freeswitch/trunk/debian/freeswitch.conffiles ============================================================================== --- freeswitch/trunk/debian/freeswitch.conffiles (original) +++ freeswitch/trunk/debian/freeswitch.conffiles Mon Aug 11 18:22:25 2008 @@ -9,6 +9,9 @@ /opt/freeswitch/conf/dialplan/public.xml /opt/freeswitch/conf/dialplan/default.xml /opt/freeswitch/conf/dialplan/features.xml +/opt/freeswitch/conf/dialplan/extensions/00_pizza_demo.xml +/opt/freeswitch/conf/dialplan/extensions/00000_enum.xml +/opt/freeswitch/conf/dialplan/extensions/default.xml /opt/freeswitch/conf/sip_profiles/external.xml /opt/freeswitch/conf/sip_profiles/nat.xml /opt/freeswitch/conf/sip_profiles/nat/example.xml

1 0

[commit] r9249 - freeswitch/trunk/conf/directory/default
by Freeswitch SVN 11 Aug '08

11 Aug '08

Author: brian Date: Mon Aug 11 18:20:35 2008 New Revision: 9249 Modified: freeswitch/trunk/conf/directory/default/brian.xml Log: no dot in this thanks bsnipes Modified: freeswitch/trunk/conf/directory/default/brian.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/brian.xml (original) +++ freeswitch/trunk/conf/directory/default/brian.xml Mon Aug 11 18:20:35 2008 @@ -79,7 +79,7 @@    -  +  </variables> <vcard>

1 0

[commit] r9248 - in freeswitch/trunk/src: . include
by Freeswitch SVN 11 Aug '08

11 Aug '08

Author: anthm Date: Mon Aug 11 17:27:20 2008 New Revision: 9248 Modified: freeswitch/trunk/src/include/switch_types.h freeswitch/trunk/src/switch_core_session.c freeswitch/trunk/src/switch_ivr_originate.c Log: fix for MODAPP-122 Modified: freeswitch/trunk/src/include/switch_types.h ============================================================================== --- freeswitch/trunk/src/include/switch_types.h (original) +++ freeswitch/trunk/src/include/switch_types.h Mon Aug 11 17:27:20 2008 @@ -181,7 +181,9 @@ typedef enum { SOF_NONE = 0, SOF_NOBLOCK = (1 << 0), - SOF_FORKED_DIAL = (1 << 1) + SOF_FORKED_DIAL = (1 << 1), + SOF_NO_EFFECTIVE_CID_NUM = (1 << 2), + SOF_NO_EFFECTIVE_CID_NAME = (1 << 3) } switch_originate_flag_enum_t; typedef uint32_t switch_originate_flag_t; Modified: freeswitch/trunk/src/switch_core_session.c ============================================================================== --- freeswitch/trunk/src/switch_core_session.c (original) +++ freeswitch/trunk/src/switch_core_session.c Mon Aug 11 17:27:20 2008 @@ -270,9 +270,14 @@ if (caller_profile) { const char *ecaller_id_name = NULL, *ecaller_id_number = NULL; + + if (!(flags & SOF_NO_EFFECTIVE_CID_NAME)) { + ecaller_id_name = switch_channel_get_variable(channel, "effective_caller_id_name"); + } - ecaller_id_name = switch_channel_get_variable(channel, "effective_caller_id_name"); - ecaller_id_number = switch_channel_get_variable(channel, "effective_caller_id_number"); + if (!(flags & SOF_NO_EFFECTIVE_CID_NUM)) { + ecaller_id_number = switch_channel_get_variable(channel, "effective_caller_id_number"); + } if (ecaller_id_name || ecaller_id_number) { outgoing_profile = switch_caller_profile_clone(session, caller_profile); Modified: freeswitch/trunk/src/switch_ivr_originate.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_originate.c (original) +++ freeswitch/trunk/src/switch_ivr_originate.c Mon Aug 11 17:27:20 2008 @@ -506,7 +506,7 @@ const char *cid_num_override, switch_caller_profile_t *caller_profile_override, switch_originate_flag_t flags) { - switch_originate_flag_t myflags = SOF_NONE; + switch_originate_flag_t dftflags = SOF_NONE, myflags = dftflags; char *pipe_names[MAX_PEERS] = { 0 }; char *data = NULL; switch_status_t status = SWITCH_STATUS_SUCCESS; @@ -538,6 +538,7 @@ uint8_t ring_ready = 0; char *loop_data = NULL; uint32_t progress_timelimit_sec = 0; + const char *cid_tmp; *bleg = NULL; @@ -742,18 +743,34 @@ } } + if ((cid_tmp = switch_event_get_header(var_event, "origination_caller_id_name"))) { + cid_name_override = cid_tmp; + } + if (cid_name_override) { switch_event_add_header_string(var_event, SWITCH_STACK_BOTTOM, "origination_caller_id_name", cid_name_override); } else { cid_name_override = switch_event_get_header(var_event, "origination_caller_id_name"); } + if ((cid_tmp = switch_event_get_header(var_event, "origination_caller_id_number"))) { + cid_num_override = cid_tmp; + } + if (cid_num_override) { switch_event_add_header_string(var_event, SWITCH_STACK_BOTTOM, "origination_caller_id_number", cid_num_override); } else { cid_num_override = switch_event_get_header(var_event, "origination_caller_id_number"); } + if (cid_num_override) { + dftflags |= SOF_NO_EFFECTIVE_CID_NUM; + } + + if (cid_name_override) { + dftflags |= SOF_NO_EFFECTIVE_CID_NAME; + } + if (!progress_timelimit_sec) { progress_timelimit_sec = timelimit_sec; } @@ -793,7 +810,8 @@ to = 0; sent_ring = 0; progress = 0; - + myflags = dftflags; + if (try > 0) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Originate attempt %d/%d in %d ms\n", try + 1, retries, sleep_ms); switch_yield(sleep_ms * 1000); @@ -915,6 +933,7 @@ strncpy(tmp, var_begin, strlen(var_begin)); } new_profile->caller_id_number = switch_core_strdup(new_profile->pool, tmp); + myflags |= SOF_NO_EFFECTIVE_CID_NUM; } if (vdata && (var_begin = switch_stristr("origination_caller_id_name=", vdata))) { @@ -927,8 +946,10 @@ strncpy(tmp, var_begin, strlen(var_begin)); } new_profile->caller_id_name = switch_core_strdup(new_profile->pool, tmp); + myflags |= SOF_NO_EFFECTIVE_CID_NAME; } + if ((reason = switch_core_session_outgoing_channel(session, var_event, chan_type, new_profile, &new_session, &pool, myflags)) != SWITCH_CAUSE_SUCCESS) {

1 0

[commit] r9247 - freeswitch/trunk/src
by Freeswitch SVN 11 Aug '08

11 Aug '08

Author: anthm Date: Mon Aug 11 16:43:19 2008 New Revision: 9247 Modified: freeswitch/trunk/src/switch_channel.c freeswitch/trunk/src/switch_event.c Log: doh Modified: freeswitch/trunk/src/switch_channel.c ============================================================================== --- freeswitch/trunk/src/switch_channel.c (original) +++ freeswitch/trunk/src/switch_channel.c Mon Aug 11 16:43:19 2008 @@ -1633,7 +1633,7 @@ nv = 0; olen = strlen(in) + 1; indup = strdup(in); - endof_indup = end_of_p(indup); + endof_indup = end_of_p(indup) + 1; if ((data = malloc(olen))) { memset(data, 0, olen); Modified: freeswitch/trunk/src/switch_event.c ============================================================================== --- freeswitch/trunk/src/switch_event.c (original) +++ freeswitch/trunk/src/switch_event.c Mon Aug 11 16:43:19 2008 @@ -1219,7 +1219,7 @@ nv = 0; olen = strlen(in) + 1; indup = strdup(in); - endof_indup = end_of_p(indup); + endof_indup = end_of_p(indup) + 1; if ((data = malloc(olen))) { memset(data, 0, olen);

1 0