October 2008 - freeswitch-svn@lists.freeswitch.org

[Freeswitch-svn] [commit] r10195 - freeswitch/trunk/src
by Freeswitch SVN 29 Oct '08

29 Oct '08

Author: anthm Date: Wed Oct 29 16:22:34 2008 New Revision: 10195 Modified: freeswitch/trunk/src/switch_channel.c Log: declinatio mortuus obfirmo! Modified: freeswitch/trunk/src/switch_channel.c ============================================================================== --- freeswitch/trunk/src/switch_channel.c (original) +++ freeswitch/trunk/src/switch_channel.c Wed Oct 29 16:22:34 2008 @@ -473,19 +473,15 @@ const char *uuid; const char *val = NULL; switch_assert(channel != NULL); - + if (!switch_strlen_zero(varname)) { if ((uuid = switch_channel_get_variable(channel, SWITCH_SIGNAL_BOND_VARIABLE))) { switch_core_session_t *session; - switch_mutex_lock(channel->profile_mutex); if ((session = switch_core_session_locate(uuid))) { switch_channel_t *tchannel = switch_core_session_get_channel(session); - switch_mutex_lock(tchannel->profile_mutex); val = switch_channel_get_variable(tchannel, varname); - switch_mutex_unlock(tchannel->profile_mutex); switch_core_session_rwunlock(session); } - switch_mutex_unlock(channel->profile_mutex); } } @@ -619,18 +615,11 @@ if (!switch_strlen_zero(varname)) { if ((uuid = switch_channel_get_variable(channel, SWITCH_SIGNAL_BOND_VARIABLE))) { switch_core_session_t *session; - switch_mutex_lock(channel->profile_mutex); if ((session = switch_core_session_locate(uuid))) { switch_channel_t *tchannel = switch_core_session_get_channel(session); - switch_mutex_lock(tchannel->profile_mutex); - switch_event_del_header(tchannel->variables, varname); - if (value) { - switch_event_add_header_string(tchannel->variables, SWITCH_STACK_BOTTOM, varname, value); - } - switch_mutex_unlock(tchannel->profile_mutex); + switch_channel_set_variable(tchannel, varname, value); switch_core_session_rwunlock(session); } - switch_mutex_unlock(channel->profile_mutex); return SWITCH_STATUS_SUCCESS; } }

1 0

[Freeswitch-svn] [commit] r10194 - freeswitch/trunk/src/mod/event_handlers/mod_event_socket
by Freeswitch SVN 29 Oct '08

29 Oct '08

Author: anthm Date: Wed Oct 29 15:15:14 2008 New Revision: 10194 Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c Log: update 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 Wed Oct 29 15:15:14 2008 @@ -163,20 +163,33 @@ return SWITCH_STATUS_SUCCESS; } +static void flush_listener(listener_t *listener, switch_bool_t flush_log, switch_bool_t flush_events) +{ + void *pop; + + if (listener->log_queue) { + while (switch_queue_trypop(listener->log_queue, &pop) == SWITCH_STATUS_SUCCESS) { + if (pop) free(pop); + } + } + + if (listener->event_queue) { + while (switch_queue_trypop(listener->event_queue, &pop) == SWITCH_STATUS_SUCCESS) { + if (!pop) continue; + switch_event_t *pevent = (switch_event_t *) pop; + switch_event_destroy(&pevent); + } + } +} static void expire_listener(listener_t **listener) { - void *pop; + flush_listener(*listener, SWITCH_TRUE, SWITCH_TRUE); switch_thread_rwlock_unlock((*listener)->rwlock); switch_core_hash_destroy(&(*listener)->event_hash); switch_core_destroy_memory_pool(&(*listener)->pool); - while (switch_queue_trypop((*listener)->event_queue, &pop) == SWITCH_STATUS_SUCCESS) { - switch_event_t *pevent = (switch_event_t *) pop; - switch_event_destroy(&pevent); - } - *listener = NULL; } @@ -1310,9 +1323,7 @@ switch_snprintf(reply, reply_len, "-ERR invalid log level"); } } else if (!strncasecmp(cmd, "nolog", 5)) { - void *pop; - while (switch_queue_trypop(listener->log_queue, &pop) == SWITCH_STATUS_SUCCESS); - + flush_listener(listener, SWITCH_TRUE, SWITCH_FALSE); if (switch_test_flag(listener, LFLAG_LOG)) { switch_clear_flag_locked(listener, LFLAG_LOG); switch_snprintf(reply, reply_len, "+OK no longer logging"); @@ -1434,8 +1445,7 @@ switch_snprintf(reply, reply_len, "+OK events nixed"); } else if (!strncasecmp(cmd, "noevents", 8)) { - void *pop; - while (switch_queue_trypop(listener->event_queue, &pop) == SWITCH_STATUS_SUCCESS); + flush_listener(listener, SWITCH_FALSE, SWITCH_TRUE); if (switch_test_flag(listener, LFLAG_EVENTS)) { uint8_t x = 0; @@ -1640,6 +1650,7 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Session complete, waiting for children\n"); switch_thread_rwlock_wrlock(listener->rwlock); + flush_listener(listener, SWITCH_TRUE, SWITCH_TRUE); if (listener->sock) { char disco_buf[512] = "";

1 0

[Freeswitch-svn] [commit] r10193 - freeswitch/trunk/src/mod/event_handlers/mod_event_socket
by Freeswitch SVN 29 Oct '08

29 Oct '08

Author: anthm Date: Wed Oct 29 14:19:49 2008 New Revision: 10193 Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c Log: make connect event have chan vars 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 Wed Oct 29 14:19:49 2008 @@ -1535,7 +1535,7 @@ goto done; } - if (switch_event_create(&call_event, SWITCH_EVENT_COMMAND) != SWITCH_STATUS_SUCCESS) { + if (switch_event_create(&call_event, SWITCH_EVENT_CHANNEL_DATA) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Memory Error!\n"); switch_clear_flag_locked(listener, LFLAG_RUNNING); goto done;

1 0

[Freeswitch-svn] [commit] r10192 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 29 Oct '08

29 Oct '08

Author: anthm Date: Wed Oct 29 14:00:27 2008 New Revision: 10192 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Log: fix broken fix 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 29 14:00:27 2008 @@ -1948,6 +1948,9 @@ switch_mutex_init(&tech_pvt->flag_mutex, SWITCH_MUTEX_NESTED, switch_core_session_get_pool(nsession)); data = switch_core_session_strdup(nsession, outbound_profile->destination_number); + if ((dest_to = strchr(data, '^'))) { + *dest_to++ = '\0'; + } profile_name = data; nchannel = switch_core_session_get_channel(nsession); @@ -1988,10 +1991,6 @@ tech_pvt->transport = gateway_ptr->register_transport; - if ((dest_to = strchr(dest, '^'))) { - *dest_to++ = '\0'; - } - /* * Handle params, strip them off the destination and add them to the * invite contact.

1 0

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

29 Oct '08

Author: brian Date: Wed Oct 29 13:28:12 2008 New Revision: 10191 Modified: freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c Log: add events and pass-change dir lookup so xml_curl users can detect vm-pass change 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 29 13:28:12 2008 @@ -45,6 +45,7 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_voicemail_load); SWITCH_MODULE_DEFINITION(mod_voicemail, mod_voicemail_load, NULL, NULL); +#define VM_EVENT_MAINT "vm::maintenance" #define VM_MAX_GREETINGS 9 @@ -1646,7 +1647,8 @@ int informed = 0; char msg_count[80] = ""; switch_input_args_t folder_args = { 0 }; - + switch_event_t *params; + folder_args.input_callback = cancel_on_dtmf; folder_args.buf = &global_buf; folder_args.buflen = sizeof(global_buf); @@ -1655,6 +1657,18 @@ message_count(profile, myid, domain_name, myfolder, &total_new_messages, &total_saved_messages, &total_new_urgent_messages, &total_saved_urgent_messages); + + switch_event_create_subclass(&params, SWITCH_EVENT_CUSTOM, VM_EVENT_MAINT); + switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "VM-Action", "folder-summary"); + switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "VM-User", myid); + switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "VM-Domain", domain_name); + switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "VM-Folder", myfolder); + switch_event_add_header(params, SWITCH_STACK_BOTTOM, "VM-Total-New-Messages", "%u", total_new_messages); + switch_event_add_header(params, SWITCH_STACK_BOTTOM, "VM-Total-Saved-Messages", "%u", total_saved_messages); + switch_event_add_header(params, SWITCH_STACK_BOTTOM, "VM-Total-New-Urgent-Messages", "%u", total_new_urgent_messages); + switch_event_add_header(params, SWITCH_STACK_BOTTOM, "VM-Total-Saved-Urgent-Messages", "%u", total_saved_urgent_messages); + switch_event_fire(&params); + if (total_new_urgent_messages > 0) { switch_snprintf(msg_count, sizeof(msg_count), "%d:urgent-new", total_new_urgent_messages); TRY_CODE(switch_ivr_phrase_macro(session, VM_MESSAGE_COUNT_MACRO, msg_count, NULL, &folder_args)); @@ -1835,6 +1849,8 @@ } else if (!strcmp(input, profile->change_pass_key)) { char buf[256] = ""; char macro[256] = ""; + switch_event_t *params; + switch_xml_t xx_user, xx_domain, xx_domain_root; switch_snprintf(macro, sizeof(macro), "phrase:%s:%s", VM_ENTER_PASS_MACRO, profile->terminator_key); TRY_CODE(switch_ivr_read(session, 0, 255, macro, NULL, buf, sizeof(buf), 10000, profile->terminator_key)); @@ -1843,6 +1859,20 @@ switch_safe_free(file_path); switch_safe_free(sql); + switch_event_create_subclass(&params, SWITCH_EVENT_CUSTOM, VM_EVENT_MAINT); + switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "VM-Action", "change-password"); + switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "VM-User-Password", buf); + switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "VM-User", myid); + switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "VM-Domain", domain_name); + switch_channel_event_set_data(channel, params); + + if (switch_xml_locate_user("id", myid, domain_name, switch_channel_get_variable(channel, "network_addr"), + &xx_domain_root, &xx_domain, &xx_user, params) == SWITCH_STATUS_SUCCESS) { + switch_xml_free(xx_domain_root); + } + + switch_event_fire(&params); + } else if (!strcmp(input, profile->record_name_key)) { file_path = switch_mprintf("%s%srecorded_name.%s", dir_path, SWITCH_PATH_SEPARATOR, profile->file_ext); TRY_CODE(create_file(session, profile, VM_RECORD_NAME_MACRO, file_path, &message_len, SWITCH_FALSE)); @@ -1866,7 +1896,7 @@ } else { switch_snprintf(key_buf, sizeof(key_buf), "%s:%s:%s:%s", profile->play_new_messages_key, profile->play_saved_messages_key, profile->config_menu_key, profile->terminator_key); - + status = vm_macro_get(session, VM_MENU_MACRO, key_buf, input, sizeof(input), 1, "", &term, timeout); } @@ -1953,23 +1983,6 @@ } - if (!mypass) { - if (auth) { - mypass = "OK"; - } else { - status = vm_macro_get(session, VM_ENTER_PASS_MACRO, profile->terminator_key, - pass_buf, sizeof(pass_buf), 0, profile->terminator_key, &term, timeout); - if (status != SWITCH_STATUS_SUCCESS) { - goto end; - } - if (*pass_buf == '\0') { - continue; - } else { - mypass = pass_buf; - } - } - } - x_params = switch_xml_child(x_user, "params"); thepass = thehash = NULL; @@ -1978,7 +1991,7 @@ for (x_param = switch_xml_child(x_params, "param"); x_param; x_param = x_param->next) { const char *var = switch_xml_attr_soft(x_param, "name"); const char *val = switch_xml_attr_soft(x_param, "value"); - + if (!strcasecmp(var, "a1-hash")) { thehash = val; } else if (!strcasecmp(var, "vm-a1-hash")) { @@ -2003,6 +2016,26 @@ } + + if (!mypass) { + if (auth) { + mypass = "OK"; + } else { + status = vm_macro_get(session, VM_ENTER_PASS_MACRO, profile->terminator_key, + pass_buf, sizeof(pass_buf), 0, profile->terminator_key, &term, timeout); + if (status != SWITCH_STATUS_SUCCESS) { + goto end; + } + if (*pass_buf == '\0') { + continue; + } else { + mypass = pass_buf; + } + } + } + + + if (vmhash) { thehash = vmhash; } @@ -2216,7 +2249,22 @@ if (insert_db && switch_file_exists(file_path, pool) == SWITCH_STATUS_SUCCESS) { char *usql; + switch_event_t *params; + switch_event_create_subclass(&params, SWITCH_EVENT_CUSTOM, VM_EVENT_MAINT); + switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "VM-Action", "leave-message"); + switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "VM-User", myid); + switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "VM-Domain", domain_name); + switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "VM-Caller-ID-Name", caller_id_name); + switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "VM-Caller-ID-Number", caller_id_number); + switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "VM-File-Path", file_path); + switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "VM-Flags", read_flags); + switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "VM-Folder", myfolder); + switch_event_add_header(params, SWITCH_STACK_BOTTOM, "VM-Message-Len", "%u", message_len); + switch_event_add_header(params, SWITCH_STACK_BOTTOM, "VM-Timestamp", "%lu", (unsigned long) switch_timestamp(NULL)); + + switch_event_fire(&params); + usql = switch_mprintf("insert into voicemail_msgs values(%ld,0,'%q','%q','%q','%q','%q','%q','%q','%u','','%q')", (long) switch_timestamp(NULL), myid, domain_name, uuid_str, caller_id_name, caller_id_number, myfolder, file_path, message_len, read_flags); @@ -3577,6 +3625,12 @@ switch_api_interface_t *commands_api_interface; switch_status_t status; + /* create/register custom event message type */ + if (switch_event_reserve_subclass(VM_EVENT_MAINT) != SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Couldn't register subclass %s!\n", VM_EVENT_MAINT); + return SWITCH_STATUS_TERM; + } + if ((status = load_config()) != SWITCH_STATUS_SUCCESS) { return status; }

1 0

[Freeswitch-svn] [commit] r10190 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 29 Oct '08

29 Oct '08

Author: anthm Date: Wed Oct 29 12:29:28 2008 New Revision: 10190 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Log: sigh Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Wed Oct 29 12:29:28 2008 @@ -2966,7 +2966,8 @@ switch_clear_flag_locked(b_tech_pvt, TFLAG_SIP_HOLD); switch_clear_flag_locked(tech_pvt, TFLAG_HOLD_LOCK); - switch_ivr_park_session(b_session); + switch_channel_set_state(switch_core_session_get_channel(b_session), CS_PARK); + new_b_session = switch_core_session_locate(br_b); a_session = switch_core_session_locate(br_a); sofia_info_send_sipfrag(a_session, new_b_session);

1 0

[Freeswitch-svn] [commit] r10189 - freeswitch/trunk/src
by Freeswitch SVN 29 Oct '08

29 Oct '08

Author: anthm Date: Wed Oct 29 11:57:57 2008 New Revision: 10189 Modified: freeswitch/trunk/src/switch_core_codec.c freeswitch/trunk/src/switch_ivr_bridge.c Log: fix FSCORE-212 Modified: freeswitch/trunk/src/switch_core_codec.c ============================================================================== --- freeswitch/trunk/src/switch_core_codec.c (original) +++ freeswitch/trunk/src/switch_core_codec.c Wed Oct 29 11:57:57 2008 @@ -45,6 +45,10 @@ SWITCH_DECLARE(void) switch_core_session_unset_read_codec(switch_core_session_t *session) { session->real_read_codec = session->read_codec = NULL; + session->raw_read_frame.codec = session->read_codec; + session->raw_write_frame.codec = session->read_codec; + session->enc_read_frame.codec = session->read_codec; + session->enc_write_frame.codec = session->read_codec; } SWITCH_DECLARE(void) switch_core_session_unset_write_codec(switch_core_session_t *session) @@ -60,33 +64,37 @@ char tmp[30]; switch_status_t status = SWITCH_STATUS_SUCCESS; - if (!codec || !codec->implementation) { + if (codec && !codec->implementation) { + codec = NULL; + } + + if (codec) { + if (!session->real_read_codec) { + session->read_codec = session->real_read_codec = codec; + session->read_impl = *codec->implementation; + } else { + session->read_codec = codec; + session->read_impl = *codec->implementation; + } + } else { + if (session->read_codec == session->real_read_codec) { + goto end; + } if (session->real_read_codec) { session->read_codec = session->real_read_codec; + session->read_impl = *session->real_read_codec->implementation; switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Restore original codec.\n"); } else { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot set UNINITIALIZED codec!\n"); status = SWITCH_STATUS_FALSE; goto end; } - } else { - - if (!session->real_read_codec) { - session->read_codec = session->real_read_codec = codec; - } else { - session->read_codec = codec; - } } - + if (!session->read_codec) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No READ codec!\n"); status = SWITCH_STATUS_FALSE; goto end; } - session->read_impl = *session->read_codec->implementation; - - if (session->read_codec && session->read_impl.decoded_bytes_per_packet) { if (switch_event_create(&event, SWITCH_EVENT_CODEC) == SWITCH_STATUS_SUCCESS) { switch_channel_event_set_data(session->channel, event); @@ -101,8 +109,7 @@ switch_channel_set_variable(channel, "read_codec", session->read_impl.iananame); switch_snprintf(tmp, sizeof(tmp), "%d", session->read_impl.actual_samples_per_second); switch_channel_set_variable(channel, "read_rate", tmp); - - + session->raw_read_frame.codec = session->read_codec; session->raw_write_frame.codec = session->read_codec; session->enc_read_frame.codec = session->read_codec; Modified: freeswitch/trunk/src/switch_ivr_bridge.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_bridge.c (original) +++ freeswitch/trunk/src/switch_ivr_bridge.c Wed Oct 29 11:57:57 2008 @@ -445,6 +445,7 @@ switch_channel_set_private(channel, "_bridge_", NULL); if (bd->session == session && *bd->b_uuid) { audio_bridge_thread(NULL, (void *) bd); + switch_core_session_reset(session, SWITCH_TRUE); } else { switch_channel_hangup(channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER); } @@ -563,7 +564,7 @@ switch_channel_clear_flag(channel, CF_TRANSFER); switch_channel_clear_flag(other_channel, CF_TRANSFER); switch_core_session_reset(session, SWITCH_TRUE); - switch_core_session_reset(other_session, SWITCH_TRUE); + ready_a = switch_channel_ready(channel); ready_b = switch_channel_ready(other_channel);

1 0

[Freeswitch-svn] [commit] r10188 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 29 Oct '08

29 Oct '08

Author: anthm Date: Wed Oct 29 10:43:07 2008 New Revision: 10188 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Log: allow none to not generate an err in vad opts Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Wed Oct 29 10:43:07 2008 @@ -1133,7 +1133,7 @@ } else if (!strcasecmp(val, "both")) { switch_set_flag(profile, TFLAG_VAD_IN); switch_set_flag(profile, TFLAG_VAD_OUT); - } else { + } else if (strcasecmp(val, "none")) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid option %s for VAD\n", val); } } else if (!strcasecmp(var, "unregister-on-options-fail")) { @@ -1494,7 +1494,7 @@ } else if (!strcasecmp(val, "both")) { switch_set_flag(profile, TFLAG_VAD_IN); switch_set_flag(profile, TFLAG_VAD_OUT); - } else { + } else if (strcasecmp(val, "none")) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid option %s for VAD\n", val); } } else if (!strcasecmp(var, "ext-rtp-ip")) {

1 0

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

29 Oct '08

Author: brian Date: Tue Oct 28 20:04:20 2008 New Revision: 10182 Modified: freeswitch/trunk/src/include/switch_types.h freeswitch/trunk/src/switch_core_codec.c freeswitch/trunk/src/switch_core_io.c freeswitch/trunk/src/switch_core_media_bug.c freeswitch/trunk/src/switch_core_session.c Log: fix FSCORE-210 Modified: freeswitch/trunk/src/include/switch_types.h ============================================================================== --- freeswitch/trunk/src/include/switch_types.h (original) +++ freeswitch/trunk/src/include/switch_types.h Tue Oct 28 20:04:20 2008 @@ -623,7 +623,8 @@ SWITCH_STATUS_NOTFOUND, SWITCH_STATUS_UNLOAD, SWITCH_STATUS_NOUNLOAD, - SWITCH_STATUS_IGNORE + SWITCH_STATUS_IGNORE, + SWITCH_STATUS_NOT_INITALIZED } switch_status_t; Modified: freeswitch/trunk/src/switch_core_codec.c ============================================================================== --- freeswitch/trunk/src/switch_core_codec.c (original) +++ freeswitch/trunk/src/switch_core_codec.c Tue Oct 28 20:04:20 2008 @@ -60,45 +60,34 @@ char tmp[30]; switch_status_t status = SWITCH_STATUS_SUCCESS; - if (codec && !codec->implementation) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot set UNINITIALIZED codec!\n"); - status = SWITCH_STATUS_FALSE; - goto end; - } - - if (!codec || codec == session->real_read_codec) { - + if (!codec || !codec->implementation) { if (session->real_read_codec) { - if (session->real_read_codec->implementation) { - session->read_codec = session->real_read_codec; - session->read_impl = *session->real_read_codec->implementation; - } else { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "resetting to uninitilized codec, setting to NULL\n"); - session->read_codec = session->real_read_codec = NULL; - status = SWITCH_STATUS_FALSE; - goto end; - } + session->read_codec = session->real_read_codec; + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Restore original codec.\n"); } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot set UNINITIALIZED codec!\n"); status = SWITCH_STATUS_FALSE; goto end; } - - } else if (codec) { - if (session->read_codec != session->real_read_codec) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot double-set codec!\n"); - status = SWITCH_STATUS_FALSE; - goto end; - } - - session->read_codec = codec; - session->read_impl = *codec->implementation; + } else { if (!session->real_read_codec) { - session->real_read_codec = session->read_codec; + session->read_codec = session->real_read_codec = codec; + } else { + session->read_codec = codec; } } - if (session->read_codec && codec && session->read_impl.decoded_bytes_per_packet) { + if (!session->read_codec) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No READ codec!\n"); + status = SWITCH_STATUS_FALSE; + goto end; + } + + session->read_impl = *session->read_codec->implementation; + + + if (session->read_codec && session->read_impl.decoded_bytes_per_packet) { if (switch_event_create(&event, SWITCH_EVENT_CODEC) == SWITCH_STATUS_SUCCESS) { switch_channel_event_set_data(session->channel, event); switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "channel-read-codec-name", session->read_impl.iananame); @@ -477,12 +466,12 @@ if (!codec->implementation) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Codec is not initialized!\n"); - return SWITCH_STATUS_GENERR; + return SWITCH_STATUS_NOT_INITALIZED; } if (!switch_test_flag(codec, SWITCH_CODEC_FLAG_ENCODE)) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Codec encoder is not initialized!\n"); - return SWITCH_STATUS_GENERR; + return SWITCH_STATUS_NOT_INITALIZED; } return codec->implementation->encode(codec, other_codec, decoded_data, decoded_data_len, decoded_rate, encoded_data, encoded_data_len, encoded_rate, @@ -502,12 +491,12 @@ if (!codec->implementation) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Codec is not initialized!\n"); - return SWITCH_STATUS_GENERR; + return SWITCH_STATUS_NOT_INITALIZED; } if (!switch_test_flag(codec, SWITCH_CODEC_FLAG_DECODE)) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Codec decoder is not initialized!\n"); - return SWITCH_STATUS_GENERR; + return SWITCH_STATUS_NOT_INITALIZED; } return codec->implementation->decode(codec, other_codec, encoded_data, encoded_data_len, encoded_rate, decoded_data, decoded_data_len, decoded_rate, @@ -520,7 +509,7 @@ if (!codec->implementation) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Codec is not initialized!\n"); - return SWITCH_STATUS_GENERR; + return SWITCH_STATUS_NOT_INITALIZED; } codec->implementation->destroy(codec); Modified: freeswitch/trunk/src/switch_core_io.c ============================================================================== --- freeswitch/trunk/src/switch_core_io.c (original) +++ freeswitch/trunk/src/switch_core_io.c Tue Oct 28 20:04:20 2008 @@ -296,6 +296,9 @@ read_frame = &session->raw_read_frame; status = SWITCH_STATUS_SUCCESS; break; + case SWITCH_STATUS_NOT_INITALIZED: + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Codec init error!\n"); + goto done; default: switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Codec %s decoder error!\n", session->read_codec->codec_interface->interface_name); goto done; @@ -437,6 +440,11 @@ *frame = &session->raw_read_frame; status = SWITCH_STATUS_SUCCESS; break; + case SWITCH_STATUS_NOT_INITALIZED: + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Codec init error!\n"); + *frame = NULL; + status = SWITCH_STATUS_GENERR; + break; default: switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Codec %s encoder error!\n", session->read_codec->codec_interface->interface_name); @@ -650,11 +658,15 @@ status = SWITCH_STATUS_SUCCESS; break; default: + if (status == SWITCH_STATUS_NOT_INITALIZED) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Codec init error!\n"); + return status; + } if (ptime_mismatch) { status = perform_write(session, frame, flags, stream_id); return SWITCH_STATUS_SUCCESS; } - + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Codec %s decoder error!\n", frame->codec->codec_interface->interface_name); return status; } @@ -799,6 +811,10 @@ write_frame = enc_frame; status = SWITCH_STATUS_SUCCESS; break; + case SWITCH_STATUS_NOT_INITALIZED: + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Codec init error!\n"); + write_frame = NULL; + return status; default: switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Codec %s encoder error!\n", session->read_codec->codec_interface->interface_name); @@ -886,6 +902,10 @@ write_frame = enc_frame; status = SWITCH_STATUS_SUCCESS; break; + case SWITCH_STATUS_NOT_INITALIZED: + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Codec init error!\n"); + write_frame = NULL; + return status; default: switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Codec %s encoder error %d!\n", session->read_codec->codec_interface->interface_name, status); Modified: freeswitch/trunk/src/switch_core_media_bug.c ============================================================================== --- freeswitch/trunk/src/switch_core_media_bug.c (original) +++ freeswitch/trunk/src/switch_core_media_bug.c Tue Oct 28 20:04:20 2008 @@ -290,6 +290,7 @@ if (session->bug_codec.implementation) { switch_core_codec_destroy(&session->bug_codec); + memset(&session->bug_codec, 0, sizeof(session->bug_codec)); } return SWITCH_STATUS_FALSE; @@ -346,9 +347,10 @@ switch_thread_rwlock_unlock(session->bug_rwlock); status = switch_core_media_bug_close(&bp); } - + if (!session->bugs && session->bug_codec.implementation) { switch_core_codec_destroy(&session->bug_codec); + memset(&session->bug_codec, 0, sizeof(session->bug_codec)); } return status; Modified: freeswitch/trunk/src/switch_core_session.c ============================================================================== --- freeswitch/trunk/src/switch_core_session.c (original) +++ freeswitch/trunk/src/switch_core_session.c Tue Oct 28 20:04:20 2008 @@ -672,7 +672,7 @@ switch_size_t has; switch_core_session_set_read_codec(session, NULL); - + /* clear resamplers */ switch_mutex_lock(session->resample_mutex); switch_resample_destroy(&session->read_resampler);

1 0

[Freeswitch-svn] [commit] r10180 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 28 Oct '08

28 Oct '08

Author: anthm Date: Tue Oct 28 12:31:01 2008 New Revision: 10180 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Log: move code 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 Tue Oct 28 12:31:01 2008 @@ -1988,6 +1988,10 @@ tech_pvt->transport = gateway_ptr->register_transport; + if ((dest_to = strchr(dest, '^'))) { + *dest_to++ = '\0'; + } + /* * Handle params, strip them off the destination and add them to the * invite contact. @@ -2064,10 +2068,6 @@ profile_name = profile->domain_name; } - if ((dest_to = strchr(dest, '^'))) { - *dest_to++ = '\0'; - } - if (!strncasecmp(dest, "sip:", 4) || !strncasecmp(dest, "sips:", 5)) { tech_pvt->dest = switch_core_session_strdup(nsession, dest); } else if ((host = strchr(dest, '%'))) {

1 0