- Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r13217 - freeswitch/trunk/libs/esl/src
by FreeSWITCH SVN 01 May '09

01 May '09

Author: anthm Date: Fri May 1 10:00:31 2009 New Revision: 13217 Log: ESL-12 Modified: freeswitch/trunk/libs/esl/src/esl.c Modified: freeswitch/trunk/libs/esl/src/esl.c ============================================================================== --- freeswitch/trunk/libs/esl/src/esl.c (original) +++ freeswitch/trunk/libs/esl/src/esl.c Fri May 1 10:00:31 2009 @@ -789,7 +789,9 @@ } esl_mutex_lock(handle->mutex); - + esl_event_safe_destroy(&handle->last_event); + esl_event_safe_destroy(&handle->last_ievent); + if (check_q && handle->race_event) { qevent = handle->race_event; handle->race_event = handle->race_event->next; @@ -806,7 +808,6 @@ return ESL_SUCCESS; } - esl_event_safe_destroy(&handle->last_event); memset(handle->header_buf, 0, sizeof(handle->header_buf)); c = handle->header_buf; @@ -907,13 +908,11 @@ if (!esl_safe_strcasecmp(hval, "text/disconnect-notice") && revent->body) { goto fail; } - + if (!esl_safe_strcasecmp(hval, "text/event-plain") && revent->body) { esl_event_types_t et = ESL_EVENT_COMMAND; char *body = strdup(revent->body); - esl_event_safe_destroy(&handle->last_ievent); - esl_event_create(&handle->last_ievent, et); beg = body;

1 0

[commit] r13216 - freeswitch/trunk/src/mod/applications/mod_conference
by FreeSWITCH SVN 01 May '09

01 May '09

Author: rupa Date: Fri May 1 08:13:44 2009 New Revision: 13216 Log: add execute_application to custom controls Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c (original) +++ freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Fri May 1 08:13:44 2009 @@ -28,6 +28,7 @@ * Bret McDanel <trixter at 0xdecafbad dot com> * Dale Thatcher <freeswitch at dalethatcher dot com> * Chris Danielson <chris at maxpowersoft dot com> + * Rupa Schomaker <rupa(a)rupa.com> * * mod_conference.c -- Software Conference Bridge * @@ -96,7 +97,8 @@ CALLER_CONTROL_DIAL, CALLER_CONTROL_EVENT, CALLER_CONTROL_LOCK, - CALLER_CONTROL_TRANSFER + CALLER_CONTROL_TRANSFER, + CALLER_CONTROL_EXEC_APP } caller_control_t; /* forward declaration for conference_obj and caller_control */ @@ -948,7 +950,7 @@ switch_size_t file_data_len = samples * 2; int has_file_data = 0, members_with_video = 0; - if (conference->perpetual_sound && !conference->async_fnode) { + if (conference->perpetual_sound && !conference->async_fnode) { conference_play_file(conference, conference->perpetual_sound, CONF_DEFAULT_LEADIN, NULL, 1); } else if (conference->moh_sound && conference->count == 1 && !conference->async_fnode) { conference_play_file(conference, conference->moh_sound, CONF_DEFAULT_LEADIN, NULL, 1); @@ -1582,6 +1584,7 @@ conference_add_event_member_data(member, event); switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Action", "dtmf"); switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "DTMF-Key", action->binded_dtmf); + switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Data", action->data); switch_event_fire(&event); } } @@ -1634,6 +1637,54 @@ return; } +static void conference_loop_fn_exec_app(conference_member_t *member, caller_control_action_t *action) +{ + char *app = NULL; + char *arg = ""; + + char *argv[2] = { 0 }; + int argc; + char *mydata = NULL; + switch_event_t *event = NULL; + switch_channel_t *channel = NULL; + + if (test_eflag(member->conference, EFLAG_DTMF) && switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { + conference_add_event_member_data(member, event); + switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Action", "execute_app"); + switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Application", action->data); + switch_event_fire(&event); + } + + if ((mydata = switch_core_session_strdup(member->session, action->data))) { + if ((argc = switch_separate_string(mydata, ' ', argv, (sizeof(argv) / sizeof(argv[0]))))) { + if (argc > 0) { + app = argv[0]; + } + if (argc > 1) { + arg = argv[1]; + } + + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Empty execute app string [%s]\n", (char *) action->data); + goto done; + } + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Unable to allocate memory to duplicate execute_app data.\n"); + goto done; + } + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Execute app: %s, %s\n", app, arg); + + channel = switch_core_session_get_channel(member->session); + + switch_channel_set_app_flag(channel, CF_APP_TAGGED); + switch_core_session_set_read_codec(member->session, NULL); + switch_core_session_execute_application(member->session, app, arg); + switch_core_session_set_read_codec(member->session, &member->read_codec); + switch_channel_clear_app_flag(channel, CF_APP_TAGGED); +done: + return; +} + static void conference_loop_fn_hangup(conference_member_t *member, caller_control_action_t *action) { switch_clear_flag_locked(member, MFLAG_RUNNING); @@ -1872,7 +1923,8 @@ {"hangup", "#", CALLER_CONTROL_HANGUP, conference_loop_fn_hangup}, {"event", NULL, CALLER_CONTROL_EVENT, conference_loop_fn_event}, {"lock", NULL, CALLER_CONTROL_LOCK, conference_loop_fn_lock_toggle}, - {"transfer", NULL, CALLER_CONTROL_TRANSFER, conference_loop_fn_transfer} + {"transfer", NULL, CALLER_CONTROL_TRANSFER, conference_loop_fn_transfer}, + {"execute_application", NULL, CALLER_CONTROL_EXEC_APP, conference_loop_fn_exec_app} }; #define CCFNTBL_QTY (sizeof(ccfntbl)/sizeof(ccfntbl[0]))

1 0

[commit] r13215 - freeswitch/trunk/src/mod/applications/mod_commands
by FreeSWITCH SVN 01 May '09

01 May '09

Author: anthm Date: Fri May 1 07:32:44 2009 New Revision: 13215 Log: MODAPP-269 Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c (original) +++ freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c Fri May 1 07:32:44 2009 @@ -2750,11 +2750,11 @@ } } if (strchr(argv[2], '%')) { - sprintf(sql, "select * from channels where name like '%s' or cid_name like '%s' or cid_num like '%s' order by created_epoch", - argv[2], argv[2], argv[2]); + sprintf(sql, "select * from channels where uuid like '%s' or name like '%s' or cid_name like '%s' or cid_num like '%s' order by created_epoch", + argv[2], argv[2], argv[2], argv[2]); } else { - sprintf(sql, "select * from channels where name like '%%%s%%' or cid_name like '%%%s%%' or cid_num like '%%%s%%' order by created_epoch", - argv[2], argv[2], argv[2]); + sprintf(sql, "select * from channels where uuid like '%%%s%%' or name like '%%%s%%' or cid_name like '%%%s%%' or cid_num like '%%%s%%' order by created_epoch", + argv[2], argv[2], argv[2], argv[2]); }

1 0

[commit] r13214 - freeswitch/trunk/src/mod/endpoints/mod_loopback
by FreeSWITCH SVN 01 May '09

01 May '09

Author: anthm Date: Fri May 1 07:29:44 2009 New Revision: 13214 Log: MODENDP-216 Modified: freeswitch/trunk/src/mod/endpoints/mod_loopback/mod_loopback.c 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 Fri May 1 07:29:44 2009 @@ -573,6 +573,7 @@ tech_pvt->cng_frame.codec = &tech_pvt->read_codec; tech_pvt->cng_frame.datalen = tech_pvt->read_codec.implementation->decoded_bytes_per_packet; memset(tech_pvt->cng_frame.data, 0, tech_pvt->cng_frame.datalen); + memset(&data, 0, sizeof(data)); if (strcasecmp(tech_pvt->read_codec.implementation->iananame, "L16")) { status = switch_core_codec_encode(&tech_pvt->read_codec,

1 0

[commit] r13213 - freeswitch/trunk/docs
by FreeSWITCH SVN 30 Apr '09

30 Apr '09

Author: mcollins Date: Thu Apr 30 18:28:36 2009 New Revision: 13213 Log: Update changelog through 4/29/2009 (r13208) Modified: freeswitch/trunk/docs/ChangeLog Modified: freeswitch/trunk/docs/ChangeLog ============================================================================== --- freeswitch/trunk/docs/ChangeLog (original) +++ freeswitch/trunk/docs/ChangeLog Thu Apr 30 18:28:36 2009 @@ -49,12 +49,14 @@ build: de-couple version numbers and builds of sound files and moh files (FSBUILD-153/r:13096) build: use sound_version.txt and moh_version.txt to determine sound file version on windows (FSBUILD-152/r:13097) build: use in tree libtiff for msvc build and fix some header generation checks (r:13150) + build: clean esl on make current (r:13204,13205) config: default config, calling own extension no longer goes to voicemail (r:12596) config: default config, 1000-1019 uses $${default_password} instead of hard-coded 1234 (FSCONFIG-5/r:12838) config: tweak the configs to bind siptrace on and off to F10 and F11 (r:12938) config: Update sample IVR to include ClueCon reg option :) (r:13043) config: Add ext 9991 as ClueCon ext; use transfer instead of bridge on demo ivr opt #4 (r:13046) config: remove invalid options from profiles (r:13153) + config: add documention for dist-dtmf member flag in conference.conf.xml core: fix suncc visibility support in libteletone (r:12154-12157) core: fix crash on FS shutdown with "..." (FSCORE-297/r:12173,12361,12402) core: add separate mutex for state related methods (r:12191) @@ -128,10 +130,15 @@ core: Do not use struct fd_set uninitialized (always FD_ZERO() them, before using FD_SET() on a new one, or reusing them after select()). Fixes a segfault on solaris (r:13125) core: Fix missing UNPROTECT_INTERFACE in case pre_answer fails (r:13130) core: add record_waste_resources channel variable to send blank audio during recording (r:13144) + core: add auto-sync idle timers in switch_time.c (r:13161) + core: Add Q850 hangup cause variable (FSCORE-356/r:13163) + core: keep presence up to date (r:13166) + core: fix failed_xml_cdr_prefix is processed before all variables for the b-leg have been generated (FSCORE-357/r:13167,13176) docs: Fix filename references in phrase_en.xml (r:12976) docs: Update phrase_en.xml to include v1.0.8 sound prompts (r:13041) docs: Updates to phrase_es.xml (r:13067) docs: Latest revision of Spanish prompts file (r:13115) + docs: switch_core.h doxygen update (r:13181) formats: add mod_portaudio_stream to get audio from any dev (MODFORM-25/r:12178) fs_cli: fix solaris build (r:12160) ivr: make tts-engine and tts-voice valid attributes on the menu xml (r:12278) @@ -160,11 +167,14 @@ libesl: kill zombies (r:13013) libesl: don't double encode events when sending them (r:13078) libesl: adding sendevent example for esl perl (r:13079) + libesl: send content len with body in esl sendevent (r:13168) + libesl: add arbitrary notify (r:13188) libiksemel: let return 0 be a failure on read in iks to avoid cpu race (r:13123,13124,13133) libsndfile: add executable permissions to libs/libsndfile/src/create_symbols_file.py (FSBUILD-134/r:12535) libsofiasip: Fix compile time out-of-bounds error in su_uniqueid.c (SFSIP-136/r:12914) libsofiasip: make info work out of dialog (r:13087) libspandsp: update to snapshot spandsp-20090421 (r:13086) + libspandsp: update to snapshot spandsp-20090427 (r:13177) libspeex: Add visibility support for suncc on solaris (r:13117,13118) libteletone: update api visibility macros for windows libtiff: add libtiff, v3.8.2 @@ -180,6 +190,7 @@ mod_commands: add echo api command (echo back exact input) and add expand api command (executes another api command with variable expansion) (r:13101,13102) mod_commands: add "stun" fsapi command (r:13137) mod_commands: mod_commands: if no bind ip specified for stun fsapi command, use the guess ip (r:13140) + mod_commands: add show channels like %foo% (no % in the string implies wrapped in %, no spaces allowed in match string (r:13193) mod_conference: fix read terminating on single digit when called from a meta-app inside a conference (MODAPP-226/r:12466) mod_conference: recording members should be invisible to commands (MODAPP-233/r:12582) mod_conference: add lock caller_control (r:12787) @@ -191,6 +202,9 @@ mod_conference: set perpetual_sound from channel var (r:13048) mod_conference: increase sanity timer for conference auto-record to 120 seconds (r:13104) mod_conference: serialize (r:13116) + mod_conference: dist-dtmf flag in conference (r:13191) + mod_conference: add transfer action to caller-controls (r:13194) + mod_conference: fix dtmf queue issue in dist-dtmf feature (MODAPP-268/r:13206) mod_console: Fix mod_console (missing FD_ZERO before FD_SET) (r:13126) mod_dahdi_codec: delay init of resources until the first time they are actually used to avoid unnecessary waste of resources in hardware codec (r:12962) mod_dingaling: fix crash when unloading/reload mod_dingaling (LBDING-13/r:12612) @@ -203,6 +217,7 @@ mod_dptools: fix b & c legs not bridging when attended transfer used (FSCORE-334/r:12649) mod_dptools: Custom events fired from event application bypass filtering mechanism (MODAPP-249/r:12894) mod_dptools: change inline limit from 4 to 128 apps (MODAPP-253/r:12957) + mod_dptools: improvements to presence function (r:13164) mod_enum: fix enum_auto_route (MODAPP220/r:12243) mod_erlang_event: Bind to 0.0.0.0 instead of 127.0.0.1 by default; like most erlang nodes do. (r:12249) mod_erlang_event: Reply appropriately to net_adm:ping() (r:13066) @@ -216,6 +231,7 @@ mod_fifo: fix uuid_transfer into mod_conference audio issue (MODAPP-259/r:13030) mod_fifo: add fifo_orbit_dialplan and fifo_orbit_context vars (MODAPP-189/r:13038) mod_fifo: don't do wrapup when agent is in nowait mode or call has ended (r:13094) + mod_file_string: add new module, allows for playing ! delimited lists of sound files (r:13182) mod_flite: three new voices - rms, awb (male), slt (female) (r:12166) mod_iax: make mod_iax async (r:13021) mod_iax: autoflush these channels that use queues (r:13057) @@ -224,9 +240,8 @@ mod_limit: close odbc handle (r:12632) mod_limit: Add more error checking to hash api/app (r:13007) mod_limit: prevent multiple bindings of the same event_hooks to make code simpler in mod_limit (MODAPP-264/r:13113) - mod_lua: windows build changes to support externally built modules. (MODLANG-101/r:12237) - mod_lua: fix visibility support (FSCORE-302/r:12239-12240) - mod_lua: fix windows build (FSBUILD-149/r:12919) + mod_local_stream: Add show_local_stream [stream name] (MODFORM-27/r:13165) + mod_local_stream: fail over to default if desired stream is not found (r:13184,13185,13186) mod_loopback: mod_lopback: other_loopback _leg_uuid variables are sometimes unset while executing the dialplan (MODENDP-210/r:12905) mod_loopback: destroy codec (r:12936) mod_loopback: fix loopback channels that stay alive (FSCORE-349/r:12944,12953) @@ -235,6 +250,10 @@ mod_loopback: pass flush indications across to the b leg (r:13146) mod_loopback: make mod_loopback render silence to prevent livelock (r:13147) mod_loopback: drop excess frames on loopback channel (r:13156,13157,13158) + mod_loopback: add loopback_bowout variable (set to false to skip auto-bowout) (r:13162) + mod_lua: windows build changes to support externally built modules. (MODLANG-101/r:12237) + mod_lua: fix visibility support (FSCORE-302/r:12239-12240) + mod_lua: fix windows build (FSBUILD-149/r:12919) mod_memcache: add new module, mod_memcache; API for memcached (r:12871) mod_memcache: make -ERR for API call less verbose (r:12949) mod_memcache: add hook reloadxml event (r:12950) @@ -313,6 +332,10 @@ mod_sofia: only pass 2833 while bridged and while bridged to another channel that uses our RTP stack (r:13131) mod_sofia: send-message-query-on-register profile param, set it to false to disable default of true (r:13139) mod_sofia: fix segfault in sofia xmlstatus profile command (MODENDP-214/r:13141) + mod_sofia: add contact lookup (r:13169) + mod_sofia: parse out alert-info and call-info from infos (r:13173) + mod_sofia: add arbitrary notify (r:13187,13189) + mod_sofia: add experimental NDLB-connectile-dysfunction-2.0 (r:13197~13203) mod_spy: add new module, mod_spy (MODAPP-260/r:13035,13036) mod_syslog: Keep the indent string in memory (LOGGER-1/r:12852) mod_t38gateway: Introduction of the skeleton of a media bug implementing a T.38 gateway, so the

1 0

[commit] r13212 - in freeswitch/trunk/src: . include mod/event_handlers/mod_event_socket
by FreeSWITCH SVN 30 Apr '09

30 Apr '09

Author: anthm Date: Thu Apr 30 17:45:46 2009 New Revision: 13212 Log: add resume command to event socket and socket_resume variable Modified: freeswitch/trunk/src/include/switch_types.h freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c freeswitch/trunk/src/switch_ivr.c Modified: freeswitch/trunk/src/include/switch_types.h ============================================================================== --- freeswitch/trunk/src/include/switch_types.h (original) +++ freeswitch/trunk/src/include/switch_types.h Thu Apr 30 17:45:46 2009 @@ -885,6 +885,7 @@ CF_BLOCK_STATE, CF_FS_RTP, CF_REPORTING, + CF_PARK, /* WARNING: DO NOT ADD ANY FLAGS BELOW THIS LINE */ CF_FLAG_MAX } switch_channel_flag_t; Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c Thu Apr 30 17:45:46 2009 @@ -51,7 +51,9 @@ LFLAG_STATEFUL = (1 << 8), LFLAG_OUTBOUND = (1 << 9), LFLAG_LINGER = (1 << 10), - LFLAG_HANDLE_DISCO = (1 << 11) + LFLAG_HANDLE_DISCO = (1 << 11), + LFLAG_CONNECTED = (1 << 12), + LFLAG_RESUME = (1 << 13), } event_flag_t; typedef enum { @@ -422,9 +424,29 @@ } } - if (switch_test_flag(listener, LFLAG_ASYNC)) { + if (switch_test_flag(listener, LFLAG_ASYNC)) { + const char *var; + launch_listener_thread(listener); + + if (switch_channel_pre_answer(channel) != SWITCH_STATUS_SUCCESS) { + return; + } + + while(switch_channel_ready(channel) && !switch_test_flag(listener, LFLAG_CONNECTED)) { + switch_cond_next(); + } + switch_ivr_park(session, NULL); + + if (switch_core_session_private_event_count(session)) { + switch_ivr_parse_all_events(session); + } + + if (switch_test_flag(listener, LFLAG_RESUME) || ((var = switch_channel_get_variable(channel, "socket_resume")) && switch_true(var))) { + switch_channel_set_state(channel, CS_EXECUTE); + } + return; } else { listener_run(NULL, (void *) listener); @@ -1425,7 +1447,13 @@ goto done; } - + + if (listener->session && !strncasecmp(cmd, "resume", 6)) { + switch_set_flag_locked(listener, LFLAG_RESUME); + switch_channel_set_variable(switch_core_session_get_channel(listener->session), "socket_resume", "true"); + switch_snprintf(reply, reply_len, "+OK"); + goto done; + } if (listener->session || !strncasecmp(cmd, "myevents ", 9)) { switch_channel_t *channel = NULL; @@ -1438,6 +1466,8 @@ switch_event_t *call_event; char *event_str; switch_size_t len; + + switch_set_flag_locked(listener, LFLAG_CONNECTED); switch_event_create(&call_event, SWITCH_EVENT_CHANNEL_DATA); switch_caller_profile_event_set_data(switch_channel_get_caller_profile(channel), "Channel", call_event); @@ -1935,6 +1965,7 @@ switch_core_session_t *session = NULL; switch_channel_t *channel = NULL; switch_event_t *revent = NULL; + const char *var; switch_mutex_lock(globals.listener_mutex); prefs.threads++; @@ -2084,6 +2115,12 @@ switch_event_destroy(&listener->filters); } switch_mutex_unlock(listener->filter_mutex); + + if (listener->session && (switch_test_flag(listener, LFLAG_RESUME) || + ((var = switch_channel_get_variable(channel, "socket_resume")) && switch_true(var)))) { + channel = switch_core_session_get_channel(listener->session); + switch_channel_set_state(channel, CS_RESET); + } if (listener->sock) { char disco_buf[512] = ""; const char message[] = "Disconnected, goodbye.\nSee you at ClueCon! http://www.cluecon.com/\n"; Modified: freeswitch/trunk/src/switch_ivr.c ============================================================================== --- freeswitch/trunk/src/switch_ivr.c (original) +++ freeswitch/trunk/src/switch_ivr.c Thu Apr 30 17:45:46 2009 @@ -650,9 +650,7 @@ switch_codec_implementation_t read_impl = {0}; switch_core_session_get_read_impl(session, &read_impl); - - - + if (switch_channel_test_flag(channel, CF_CONTROLLED)) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot park channels that are under control already.\n"); return SWITCH_STATUS_FALSE; @@ -665,8 +663,8 @@ return SWITCH_STATUS_FALSE; } } - - if (switch_channel_test_flag(channel, CF_PROXY_MODE)) { + + if (switch_channel_test_flag(channel, CF_PROXY_MODE) || switch_channel_get_state(channel) == CS_RESET) { return SWITCH_STATUS_FALSE; } @@ -684,16 +682,20 @@ } else { expires = switch_epoch_time_now(NULL) + timeout; } + switch_channel_set_variable(channel, "park_timeout", NULL); } switch_channel_set_flag(channel, CF_CONTROLLED); + switch_channel_set_flag(channel, CF_PARK); + if (switch_event_create(&event, SWITCH_EVENT_CHANNEL_PARK) == SWITCH_STATUS_SUCCESS) { switch_channel_event_set_data(channel, event); switch_event_fire(&event); } - while (switch_channel_media_ready(channel) && switch_channel_ready(channel) && switch_channel_test_flag(channel, CF_CONTROLLED)) { - + while (switch_channel_media_ready(channel) && switch_channel_ready(channel) && switch_channel_test_flag(channel, CF_CONTROLLED) + && switch_channel_test_flag(channel, CF_PARK)) { + if ((status = switch_core_session_read_frame(session, &read_frame, SWITCH_IO_FLAG_NONE, stream_id)) == SWITCH_STATUS_SUCCESS) { if (!SWITCH_READ_ACCEPTABLE(status)) { break; @@ -798,6 +800,7 @@ } switch_channel_clear_flag(channel, CF_CONTROLLED); + switch_channel_clear_flag(channel, CF_PARK); if (switch_event_create(&event, SWITCH_EVENT_CHANNEL_UNPARK) == SWITCH_STATUS_SUCCESS) { switch_channel_event_set_data(channel, event);

1 0

[commit] r13211 - freeswitch/trunk/src/mod/applications/mod_lcr
by FreeSWITCH SVN 30 Apr '09

30 Apr '09

Author: rupa Date: Thu Apr 30 12:22:24 2009 New Revision: 13211 Log: check for escape chars too Modified: freeswitch/trunk/src/mod/applications/mod_lcr/mod_lcr.c Modified: freeswitch/trunk/src/mod/applications/mod_lcr/mod_lcr.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_lcr/mod_lcr.c (original) +++ freeswitch/trunk/src/mod/applications/mod_lcr/mod_lcr.c Thu Apr 30 12:22:24 2009 @@ -892,7 +892,7 @@ custom_sql = sql_stream.data; } - if (switch_string_var_check_const(custom_sql)) { + if (switch_string_var_check_const(custom_sql) || switch_string_has_escaped_data(custom_sql)) { profile->custom_sql_has_vars = SWITCH_TRUE; } if (strstr(custom_sql, "%")) {

1 0

[commit] r13210 - freeswitch/trunk/src
by FreeSWITCH SVN 30 Apr '09

30 Apr '09

Author: anthm Date: Thu Apr 30 09:02:24 2009 New Revision: 13210 Log: FSCORE-355 Modified: freeswitch/trunk/src/switch_utils.c Modified: freeswitch/trunk/src/switch_utils.c ============================================================================== --- freeswitch/trunk/src/switch_utils.c (original) +++ freeswitch/trunk/src/switch_utils.c Thu Apr 30 09:02:24 2009 @@ -1156,9 +1156,9 @@ if (flags & SWITCH_URI_NO_SCOPE && sa->family == AF_INET6) { memcpy(&ss, &sa->sa, sa->salen); ((struct sockaddr_in6*) (intptr_t) &ss)->sin6_scope_id = 0; - addr = (const struct sockaddr*) &ss; + addr = (const struct sockaddr*) (intptr_t)&ss; } else { - addr = (const struct sockaddr*) &sa->sa; + addr = (const struct sockaddr*) (intptr_t)&sa->sa; } if (getnameinfo(addr, sa->salen, host, sizeof(host), serv, sizeof(serv),

1 0

[commit] r13209 - freeswitch/trunk/src
by FreeSWITCH SVN 30 Apr '09

30 Apr '09

Author: anthm Date: Thu Apr 30 08:53:29 2009 New Revision: 13209 Log: FSCORE-359 Modified: freeswitch/trunk/src/switch_ivr_originate.c Modified: freeswitch/trunk/src/switch_ivr_originate.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_originate.c (original) +++ freeswitch/trunk/src/switch_ivr_originate.c Thu Apr 30 08:53:29 2009 @@ -918,6 +918,7 @@ uint32_t progress_timelimit_sec = 0; const char *cid_tmp; originate_global_t oglobals = { 0 }; + int cdr_total = 0; oglobals.idx = IDX_NADA; oglobals.early_ok = 1; @@ -1007,8 +1008,18 @@ if (oglobals.session) { switch_event_header_t *hi; + const char *cdr_total_var; + caller_channel = switch_core_session_get_channel(oglobals.session); + if ((cdr_total_var = switch_channel_get_variable(caller_channel, "failed_xml_cdr_total"))) { + int tmp = atoi(cdr_total_var); + if (tmp > 0) { + cdr_total = tmp; + } + } + + /* Copy all the applicable channel variables into the event */ if ((hi = switch_channel_variable_first(caller_channel))) { for (; hi; hi = hi->next) { @@ -2018,7 +2029,6 @@ } else { const char *cdr_var = NULL; - int cdr_total = 0; switch_xml_t cdr; char *xml_text; char buf[128] = "", buf2[128] = "";

1 0

[commit] r13208 - freeswitch/trunk/conf/autoload_configs
by FreeSWITCH SVN 30 Apr '09

30 Apr '09

Author: greenlizard Date: Wed Apr 29 23:55:40 2009 New Revision: 13208 Log: document dist-dtmf member flag Modified: freeswitch/trunk/conf/autoload_configs/conference.conf.xml Modified: freeswitch/trunk/conf/autoload_configs/conference.conf.xml ============================================================================== --- freeswitch/trunk/conf/autoload_configs/conference.conf.xml (original) +++ freeswitch/trunk/conf/autoload_configs/conference.conf.xml Wed Apr 29 23:55:40 2009 @@ -7,7 +7,7 @@ </advertise>  -  +  <caller-controls> <group name="default"> <control action="mute" digits="0"/> @@ -38,8 +38,9 @@  <param name="energy-level" value="300"/> -  +

1 0