January 2007 - Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r3943 - in freeswitch/trunk: conf src/include src/mod/applications/mod_conference
by Freeswitch SVN 11 Jan '07

11 Jan '07

Author: anthm Date: Thu Jan 11 13:14:02 2007 New Revision: 3943 Modified: freeswitch/trunk/conf/freeswitch.xml freeswitch/trunk/src/include/switch_utils.h freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Log: update conference to add lock sounds, sound prefix, and use say: syntax Modified: freeswitch/trunk/conf/freeswitch.xml ============================================================================== --- freeswitch/trunk/conf/freeswitch.xml (original) +++ freeswitch/trunk/conf/freeswitch.xml Thu Jan 11 13:14:02 2007 @@ -397,6 +397,7 @@  <profiles> +  <profile name="default">  <param name="domain" value="sub.mydomain.com"/> @@ -406,38 +407,43 @@ <param name="interval" value="20"/>  <param name="energy-level" value="300"/> -  -  +  +      -  -  - +  +  +  +   -  +   -  +   -  +   -  +   -  +   -  +   -  +   -  +   -  +  +  +  +  +   -  +   -  +     Modified: freeswitch/trunk/src/include/switch_utils.h ============================================================================== --- freeswitch/trunk/src/include/switch_utils.h (original) +++ freeswitch/trunk/src/include/switch_utils.h Thu Jan 11 13:14:02 2007 @@ -62,6 +62,12 @@ apr_size_t *len); +#ifdef WIN32 +#define switch_is_file_path(file) (*(file +1) == ':' || *file == '/') +#else +#define switch_is_file_path(file) (*file == '/') +#endif + /*! \brief Evaluate the truthfullness of a string expression \param expr a string expression 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 Thu Jan 11 13:14:02 2007 @@ -170,9 +170,12 @@ char *muted_sound; char *unmuted_sound; char *locked_sound; + char *is_locked_sound; + char *is_unlocked_sound; char *kicked_sound; char *caller_id_name; char *caller_id_number; + char *sound_prefix; switch_ivr_digit_stream_parser_t *dtmf_parser; char *pin; char *pin_sound; @@ -1805,7 +1808,7 @@ conference_file_node_t *fnode, *nptr; switch_memory_pool_t *pool; uint32_t count; - char *expanded = NULL; + char *dfile = NULL, *expanded = NULL; assert(conference != NULL); @@ -1828,16 +1831,22 @@ } } - if -#ifdef WIN32 - (*(file +1) != ':' && *file != '/') -#else - (*file != '/') -#endif - { - status = conference_say(conference, file, leadin); + if (!strncasecmp(file, "say:", 4)) { + status = conference_say(conference, file + 4, leadin); + goto done; + } + + if (!switch_is_file_path(file)) { + if (conference->sound_prefix) { + if (!(dfile = switch_mprintf("%s/%s", conference->sound_prefix, file))) { goto done; } + file = dfile; + } else { + status = conference_say(conference, file + 4, leadin); + goto done; + } + } /* Setup a memory pool to use. */ if (switch_core_new_memory_pool(&pool) != SWITCH_STATUS_SUCCESS) { @@ -1884,6 +1893,7 @@ switch_safe_free(expanded); + switch_safe_free(dfile); @@ -2831,6 +2841,10 @@ assert(conference != NULL); assert(stream != NULL); + if (conference->is_locked_sound) { + conference_play_file(conference, conference->is_locked_sound, CONF_DEFAULT_LEADIN, NULL); + } + switch_set_flag_locked(conference, CFLAG_LOCKED); stream->write_function(stream, "OK %s locked\n", argv[0]); if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { @@ -2849,6 +2863,10 @@ assert(conference != NULL); assert(stream != NULL); + if (conference->is_unlocked_sound) { + conference_play_file(conference, conference->is_unlocked_sound, CONF_DEFAULT_LEADIN, NULL); + } + switch_clear_flag_locked(conference, CFLAG_LOCKED); stream->write_function(stream, "OK %s unlocked\n", argv[0]); if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { @@ -4187,6 +4205,7 @@ char *tts_engine = NULL; char *tts_voice = NULL; char *enter_sound = NULL; + char *sound_prefix = NULL; char *exit_sound = NULL; char *alone_sound = NULL; char *ack_sound = NULL; @@ -4194,6 +4213,8 @@ char *muted_sound = NULL; char *unmuted_sound = NULL; char *locked_sound = NULL; + char *is_locked_sound = NULL; + char *is_unlocked_sound = NULL; char *kicked_sound = NULL; char *pin = NULL; char *pin_sound = NULL; @@ -4256,6 +4277,10 @@ unmuted_sound = val; } else if (!strcasecmp(var, "locked-sound")) { locked_sound = val; + } else if (!strcasecmp(var, "is-locked-sound")) { + is_locked_sound = val; + } else if (!strcasecmp(var, "is-unlocked-sound")) { + is_unlocked_sound = val; } else if (!strcasecmp(var, "kicked-sound")) { kicked_sound = val; } else if (!strcasecmp(var, "pin")) { @@ -4272,6 +4297,8 @@ caller_id_number = val; } else if (!strcasecmp(var, "caller-controls")) { caller_controls = val; + } else if (!strcasecmp(var, "sound-prefix")) { + sound_prefix = val; } } @@ -4333,6 +4360,11 @@ conference->caller_id_name = switch_core_strdup(conference->pool, caller_id_name); conference->caller_id_number = switch_core_strdup(conference->pool, caller_id_number); + + if (sound_prefix) { + conference->sound_prefix = switch_core_strdup(conference->pool, sound_prefix); + } + if (!switch_strlen_zero(enter_sound)) { conference->enter_sound = switch_core_strdup(conference->pool, enter_sound); } @@ -4381,6 +4413,14 @@ conference->locked_sound = switch_core_strdup(conference->pool, locked_sound); } + if (!switch_strlen_zero(is_locked_sound)) { + conference->is_locked_sound = switch_core_strdup(conference->pool, is_locked_sound); + } + + if (!switch_strlen_zero(is_unlocked_sound)) { + conference->is_unlocked_sound = switch_core_strdup(conference->pool, is_unlocked_sound); + } + if (!switch_strlen_zero(energy_level)) { conference->energy_level = atoi(energy_level); }

1 0

[commit] r3942 - in freeswitch/trunk/src: include mod/applications/mod_dptools mod/endpoints/mod_sofia
by Freeswitch SVN 10 Jan '07

10 Jan '07

Author: mikej Date: Wed Jan 10 16:26:10 2007 New Revision: 3942 Modified: freeswitch/trunk/src/include/switch_types.h freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Log: completely untested redirect support, need to try this from a machine that can take sip calls. Modified: freeswitch/trunk/src/include/switch_types.h ============================================================================== --- freeswitch/trunk/src/include/switch_types.h (original) +++ freeswitch/trunk/src/include/switch_types.h Wed Jan 10 16:26:10 2007 @@ -302,6 +302,7 @@ SWITCH_MESSAGE_INDICATE_NOMEDIA - indicate no-media is required SWITCH_MESSAGE_INDICATE_HOLD - indicate hold SWITCH_MESSAGE_INDICATE_UNHOLD - indicate unhold + SWITCH_MESSAGE_INDICATE_REDIRECT - indicate redirect </pre> */ typedef enum { @@ -316,6 +317,7 @@ SWITCH_MESSAGE_INDICATE_NOMEDIA, SWITCH_MESSAGE_INDICATE_HOLD, SWITCH_MESSAGE_INDICATE_UNHOLD, + SWITCH_MESSAGE_INDICATE_REDIRECT } switch_core_session_message_types_t; Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c (original) +++ freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c Wed Jan 10 16:26:10 2007 @@ -153,6 +153,20 @@ switch_channel_answer(channel); } +static void redirect_function(switch_core_session_t *session, char *data) +{ + switch_core_session_message_t msg = {0}; + + /* Tell the channel to redirect */ + msg.from = __FILE__; + msg.string_arg = data; + msg.message_id = SWITCH_MESSAGE_INDICATE_REDIRECT; + switch_core_session_receive_message(session, &msg); + +} + + + static void set_function(switch_core_session_t *session, char *data) { switch_channel_t *channel; @@ -455,13 +469,22 @@ /*.next */ &dptools_api_interface }; +static const switch_application_interface_t redirect_application_interface = { + /*.interface_name */ "redirect", + /*.application_function */ redirect_function, + /* long_desc */ "Send a redirect message to a session.", + /* short_desc */ "Send session redirect", + /* syntax */ "<redirect_data>", + /*.next */ NULL +}; + static const switch_application_interface_t ivr_application_interface = { /*.interface_name */ "ivr", /*.application_function */ ivr_application_function, /* long_desc */ "Run an ivr menu.", /* short_desc */ "Run an ivr menu", /* syntax */ "<menu_name>", - /*.next */ NULL + /*.next */ &redirect_application_interface }; static const switch_application_interface_t detect_speech_application_interface = { 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 Jan 10 16:26:10 2007 @@ -1885,6 +1885,12 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Re-activate timed RTP!\n"); } break; + case SWITCH_MESSAGE_INDICATE_REDIRECT: + if(msg->string_arg) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Re-directing to %s\n", msg->string_arg); + nua_respond(tech_pvt->nh, SIP_302_MOVED_TEMPORARILY, SIPTAG_CONTACT_STR(msg->string_arg), TAG_END()); + } + break; case SWITCH_MESSAGE_INDICATE_RINGING: nua_respond(tech_pvt->nh, SIP_180_RINGING, SIPTAG_CONTACT_STR(tech_pvt->profile->url), TAG_END()); break;

1 0

[commit] r3938 - freeswitch/trunk/src/mod/codecs/mod_g729
by Freeswitch SVN 10 Jan '07

10 Jan '07

Author: brian Date: Wed Jan 10 14:40:06 2007 New Revision: 3938 Modified: freeswitch/trunk/src/mod/codecs/mod_g729/mod_g729.c Log: add g729a as a registered codec type. Modified: freeswitch/trunk/src/mod/codecs/mod_g729/mod_g729.c ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_g729/mod_g729.c (original) +++ freeswitch/trunk/src/mod/codecs/mod_g729/mod_g729.c Wed Jan 10 14:40:06 2007 @@ -262,9 +262,51 @@ &g729_10ms_8k_implementation }; +static const switch_codec_implementation_t g729a_10ms_8k_implementation = { + /*.codec_type */ SWITCH_CODEC_TYPE_AUDIO, + /*.ianacode */ 18, + /*.iananame */ "G729a", + /*.fmtp */ NULL, + /*.samples_per_second */ 8000, + /*.bits_per_second */ 32000, + /*.microseconds_per_frame */ 10000, + /*.samples_per_frame */ 80, + /*.bytes_per_frame */ 160, + /*.encoded_bytes_per_frame */ 10, + /*.number_of_channels */ 1, + /*.pref_frames_per_packet */ 1, + /*.max_frames_per_packet */ 1, + /*.init */ switch_g729_init, + /*.encode */ switch_g729_encode, + /*.decode */ switch_g729_decode, + /*.destroy */ switch_g729_destroy, + &g729_8k_implementation +}; + +static const switch_codec_implementation_t g729a_8k_implementation = { + /*.codec_type */ SWITCH_CODEC_TYPE_AUDIO, + /*.ianacode */ 18, + /*.iananame */ "G729a", + /*.fmtp */ NULL, + /*.samples_per_second */ 8000, + /*.bits_per_second */ 64000, + /*.microseconds_per_frame */ 20000, + /*.samples_per_frame */ 160, + /*.bytes_per_frame */ 320, + /*.encoded_bytes_per_frame */ 20, + /*.number_of_channels */ 1, + /*.pref_frames_per_packet */ 1, + /*.max_frames_per_packet */ 1, + /*.init */ switch_g729_init, + /*.encode */ switch_g729_encode, + /*.decode */ switch_g729_decode, + /*.destroy */ switch_g729_destroy, + &g729a_10ms_8k_implementation +}; + static const switch_codec_interface_t g729_codec_interface = { /*.interface_name */ "g729", - /*.implementations */ &g729_8k_implementation, + /*.implementations */ &g729a_8k_implementation, /*.next */ NULL };

1 0

[commit] r3937 - freeswitch/trunk
by Freeswitch SVN 10 Jan '07

10 Jan '07

Author: anthm Date: Wed Jan 10 12:43:57 2007 New Revision: 3937 Modified: freeswitch/trunk/modules.conf.in Log: add mod_say_en to default modules.conf.in Modified: freeswitch/trunk/modules.conf.in ============================================================================== --- freeswitch/trunk/modules.conf.in (original) +++ freeswitch/trunk/modules.conf.in Wed Jan 10 12:43:57 2007 @@ -47,3 +47,5 @@ #languages/mod_spidermonkey_etpan timers/mod_softtimer #xml_int/mod_xml_rpc +say/mod_say_en +

1 0

[commit] r3935 - in freeswitch/trunk: libs/libetpan/build-windows libs/sofia-sip/win32 libs/win32 libs/win32/etpan libs/win32/udns src/mod/codecs/mod_g723_1 src/mod/codecs/mod_g729 src/mod/directories/mod_ldap src/mod/say/mod_say_en
by Freeswitch SVN 10 Jan '07

10 Jan '07

Author: mikej Date: Wed Jan 10 10:37:05 2007 New Revision: 3935 Modified: freeswitch/trunk/libs/libetpan/build-windows/ (props changed) freeswitch/trunk/libs/sofia-sip/win32/ (props changed) freeswitch/trunk/libs/win32/ (props changed) freeswitch/trunk/libs/win32/etpan/ (props changed) freeswitch/trunk/libs/win32/udns/ (props changed) freeswitch/trunk/src/mod/codecs/mod_g723_1/ (props changed) freeswitch/trunk/src/mod/codecs/mod_g729/ (props changed) freeswitch/trunk/src/mod/directories/mod_ldap/ (props changed) freeswitch/trunk/src/mod/say/mod_say_en/ (props changed) Log: svn:ignore props

1 0

[commit] r3933 - freeswitch/trunk/src
by Freeswitch SVN 10 Jan '07

10 Jan '07

Author: mikej Date: Wed Jan 10 09:42:47 2007 New Revision: 3933 Modified: freeswitch/trunk/src/switch_utils.c Log: The day before today Mike Murdock found a bug making switch_str_time return the day before, but it was already the day before today, so it returned 2 days ago, and that was just not right. Now time has all come back together. Modified: freeswitch/trunk/src/switch_utils.c ============================================================================== --- freeswitch/trunk/src/switch_utils.c (original) +++ freeswitch/trunk/src/switch_utils.c Wed Jan 10 09:42:47 2007 @@ -148,7 +148,7 @@ if (proceed > 3) { pcre_copy_substring(in, ovector, proceed, 3, replace, sizeof(replace)); - tm.tm_mday = atoi(replace)-1; + tm.tm_mday = atoi(replace); } if (proceed > 4) {

1 0

[commit] r3931 - freeswitch/trunk/src/mod/event_handlers/mod_event_socket
by Freeswitch SVN 09 Jan '07

09 Jan '07

Author: anthm Date: Mon Jan 8 19:39:11 2007 New Revision: 3931 Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c Log: add getvar 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 Mon Jan 8 19:39:11 2007 @@ -613,6 +613,9 @@ if (listener->session) { + switch_channel_t *channel = switch_core_session_get_channel(listener->session); + assert(channel != NULL); + if (!strncasecmp(cmd, "connect", 7)) { snprintf(reply, reply_len, "+OK"); goto done; @@ -628,6 +631,21 @@ snprintf(reply, reply_len, "+OK"); } goto done; + } else if (!strncasecmp(cmd, "getvar", 6)) { + char *arg; + char *val = ""; + + strip_cr(cmd); + + if ((arg = strchr(cmd, ' '))) { + *arg++ = '\0'; + if (!(val = switch_channel_get_variable(channel, arg))) { + val = ""; + } + + } + snprintf(reply, reply_len, val); + goto done; } else if (!strncasecmp(cmd, "myevents", 8)) { listener->event_list[SWITCH_EVENT_CHANNEL_CREATE] = 1; listener->event_list[SWITCH_EVENT_CHANNEL_DESTROY] = 1;

1 0

[commit] r3930 - freeswitch/trunk/src/mod/applications/mod_conference
by Freeswitch SVN 08 Jan '07

08 Jan '07

Author: anthm Date: Mon Jan 8 12:19:59 2007 New Revision: 3930 Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Log: minor tweaks in conference 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 Mon Jan 8 12:19:59 2007 @@ -207,7 +207,6 @@ uint32_t id; switch_core_session_t *session; conference_obj_t *conference; - conference_obj_t *last_conference; switch_memory_pool_t *pool; switch_buffer_t *audio_buffer; switch_buffer_t *mux_buffer; @@ -461,7 +460,7 @@ switch_mutex_lock(member->audio_in_mutex); switch_mutex_lock(member->audio_out_mutex); switch_mutex_lock(member->flag_mutex); - member->conference = member->last_conference = conference; + member->conference = conference; member->next = conference->members; member->energy_level = conference->energy_level; conference->members = member; @@ -2548,10 +2547,12 @@ switch_hash_this(hi, NULL, NULL, &val); conference = (conference_obj_t *) val; - stream->write_function(stream, "Conference %s (%u member%s)\n", + stream->write_function(stream, "Conference %s (%u member%s%s)\n", conference->name, conference->count, - conference->count == 1 ? "" : "s"); + conference->count == 1 ? "" : "s", + switch_test_flag(conference, CFLAG_LOCKED) ? " locked" : "" + ); if (pretty) { conference_list_pretty(conference, stream); } else { @@ -2896,7 +2897,7 @@ char *profile_name; switch_xml_t cxml = NULL, cfg = NULL, profiles = NULL; - if (!(member = conference_member_get(conference, id))) { + if (!id || !(member = conference_member_get(conference, id))) { stream->write_function(stream, "No Member %u in conference %s.\n", id, conference->name); continue; } @@ -2919,21 +2920,23 @@ if ((profile_name = strchr(conf_name, '@'))) { *profile_name++ = '\0'; + } else { + profile_name = "default"; + } + + /* Open the config from the xml registry */ + if (!(cxml = switch_xml_open_cfg(global_cf_name, &cfg, NULL))) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "open of %s failed\n", global_cf_name); + goto done; + } - /* Open the config from the xml registry */ - if (!(cxml = switch_xml_open_cfg(global_cf_name, &cfg, NULL))) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "open of %s failed\n", global_cf_name); - goto done; - } - - if ((profiles = switch_xml_child(cfg, "profiles"))) { - xml_cfg.profile = switch_xml_find_child(profiles, "profile", "name", profile_name); - } - xml_cfg.controls = switch_xml_child(cfg, "caller-controls"); + if ((profiles = switch_xml_child(cfg, "profiles"))) { + xml_cfg.profile = switch_xml_find_child(profiles, "profile", "name", profile_name); + } + xml_cfg.controls = switch_xml_child(cfg, "caller-controls"); #ifdef OPTION_IVR_MENU_SUPPORT - xml_cfg.menus = switch_xml_child(cfg, "menus"); + xml_cfg.menus = switch_xml_child(cfg, "menus"); #endif - } /* Release the config registry handle */ if (cxml) { @@ -2958,13 +2961,18 @@ /* Indicate the conference is dynamic */ switch_set_flag_locked(new_conference, CFLAG_DYNAMIC); + switch_mutex_lock(new_conference->mutex); + /* Start the conference thread for this conference */ launch_conference_thread(new_conference); + } else { + switch_mutex_lock(new_conference->mutex); } /* move the member from the old conference to the new one */ - conference_del_member(member->last_conference, member); + conference_del_member(conference, member); conference_add_member(new_conference, member); + switch_mutex_unlock(new_conference->mutex); stream->write_function(stream, "OK Members sent to conference %s.\n", argv[2]); @@ -3204,13 +3212,13 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Read Lock Fail\n"); goto done; } - + switch_mutex_lock(conference->mutex); if (argc >= 2) { conf_api_dispatch(conference, stream, argc, argv, (const char *)buf, 1); } else { stream->write_function(stream, "Conference command, not specified.\nTry 'help'\n"); } - + switch_mutex_unlock(conference->mutex); switch_thread_rwlock_unlock(conference->rwlock); } else { @@ -3464,22 +3472,24 @@ /* is there profile specification ? */ if ((profile_name = strchr(conf_name, '@'))) { *profile_name++ = '\0'; + } else { + profile_name = "default"; + } - /* Open the config from the xml registry */ - if (!(cxml = switch_xml_open_cfg(global_cf_name, &cfg, NULL))) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "open of %s failed\n", global_cf_name); - goto done; - } + /* Open the config from the xml registry */ + if (!(cxml = switch_xml_open_cfg(global_cf_name, &cfg, NULL))) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "open of %s failed\n", global_cf_name); + goto done; + } - if ((profiles = switch_xml_child(cfg, "profiles"))) { - xml_cfg.profile = switch_xml_find_child(profiles, "profile", "name", profile_name); - } + if ((profiles = switch_xml_child(cfg, "profiles"))) { + xml_cfg.profile = switch_xml_find_child(profiles, "profile", "name", profile_name); + } - xml_cfg.controls = switch_xml_child(cfg, "caller-controls"); + xml_cfg.controls = switch_xml_child(cfg, "caller-controls"); #ifdef OPTION_IVR_MENU_SUPPORT - xml_cfg.menus = switch_xml_child(cfg, "menus"); -#endif - } + xml_cfg.menus = switch_xml_child(cfg, "menus"); +#endif /* if this is a bridging call, and it's not a duplicate, build a */ /* conference object, and skip pin handling, and locked checking */ @@ -3730,7 +3740,7 @@ switch_core_session_receive_message(session, &msg); /* Remove the caller from the conference */ - conference_del_member(member.last_conference, &member); + conference_del_member(member.conference, &member); /* Put the original codec back */ switch_core_session_set_read_codec(member.session, read_codec);

1 0

[commit] r3929 - in freeswitch/trunk/src/mod: directories/mod_ldap event_handlers/mod_cdr
by Freeswitch SVN 08 Jan '07

08 Jan '07

Author: mikej Date: Mon Jan 8 08:48:41 2007 New Revision: 3929 Modified: freeswitch/trunk/src/mod/directories/mod_ldap/mod_ldap.vcproj freeswitch/trunk/src/mod/event_handlers/mod_cdr/mod_cdr.vcproj Log: switch all libs and mods to use the dynamic instead of the static runtime so everything in freeswitch runs in a single instance of the runtime. Modified: freeswitch/trunk/src/mod/directories/mod_ldap/mod_ldap.vcproj ============================================================================== --- freeswitch/trunk/src/mod/directories/mod_ldap/mod_ldap.vcproj (original) +++ freeswitch/trunk/src/mod/directories/mod_ldap/mod_ldap.vcproj Mon Jan 8 08:48:41 2007 @@ -46,7 +46,7 @@ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS;LDAP_DEPRECATED" MinimalRebuild="true" BasicRuntimeChecks="3" - RuntimeLibrary="1" + RuntimeLibrary="3" UsePrecompiledHeader="0" WarningLevel="4" WarnAsError="true" @@ -127,7 +127,7 @@ Name="VCCLCompilerTool" AdditionalIncludeDirectories=""$(InputDir)..\..\..\include";"$(InputDir)include";"$(InputDir)..\..\..\..\libs\include";"$(InputDir)..\..\..\..\libs\openldap\include"" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS;LDAP_DEPRECATED" - RuntimeLibrary="0" + RuntimeLibrary="2" UsePrecompiledHeader="0" WarningLevel="4" WarnAsError="true" Modified: freeswitch/trunk/src/mod/event_handlers/mod_cdr/mod_cdr.vcproj ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_cdr/mod_cdr.vcproj (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_cdr/mod_cdr.vcproj Mon Jan 8 08:48:41 2007 @@ -208,7 +208,7 @@ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS" MinimalRebuild="true" BasicRuntimeChecks="3" - RuntimeLibrary="1" + RuntimeLibrary="3" UsePrecompiledHeader="0" WarningLevel="4" WarnAsError="true" @@ -288,7 +288,7 @@ Name="VCCLCompilerTool" AdditionalIncludeDirectories=""$(InputDir)..\..\..\include";"$(InputDir)include";"$(InputDir)..\..\..\..\libs\include";"C:\Program Files\MySQL\MySQL Server 5.0\include"" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS" - RuntimeLibrary="0" + RuntimeLibrary="2" UsePrecompiledHeader="0" WarningLevel="4" WarnAsError="true"

1 0

[commit] r3928 - freeswitch/trunk/src
by Freeswitch SVN 08 Jan '07

08 Jan '07

Author: mikej Date: Sun Jan 7 20:55:16 2007 New Revision: 3928 Modified: freeswitch/trunk/src/switch_ivr.c Log: Make sure we pass early media after the pre-answer (thanks Mike Murdock for the report and troubleshooting assistance) Modified: freeswitch/trunk/src/switch_ivr.c ============================================================================== --- freeswitch/trunk/src/switch_ivr.c (original) +++ freeswitch/trunk/src/switch_ivr.c Sun Jan 7 20:55:16 2007 @@ -1928,11 +1928,14 @@ switch_channel_answer(chan_a); ans_a++; } else if (!pre_b && switch_channel_test_flag(chan_b, CF_EARLY_MEDIA)) { - switch_channel_pre_answer(chan_a); - pre_b++; + if (switch_channel_pre_answer(chan_a) == SWITCH_STATUS_SUCCESS) { + pre_b++; + } + } + if (!pre_b) { + switch_yield(10000); + continue; } - switch_yield(10000); - continue; }

1 0