- Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r7845 - in freeswitch/trunk/src: . include
by Freeswitch SVN 08 Mar '08

08 Mar '08

Author: anthm Date: Sat Mar 8 16:07:15 2008 New Revision: 7845 Modified: freeswitch/trunk/src/include/switch_channel.h freeswitch/trunk/src/switch_channel.c freeswitch/trunk/src/switch_core_state_machine.c Log: fix super sonic race at 400 cps conditions Modified: freeswitch/trunk/src/include/switch_channel.h ============================================================================== --- freeswitch/trunk/src/include/switch_channel.h (original) +++ freeswitch/trunk/src/include/switch_channel.h Sat Mar 8 16:07:15 2008 @@ -80,9 +80,9 @@ SWITCH_DECLARE(switch_channel_state_t) switch_channel_perform_set_state(switch_channel_t *channel, const char *file, const char *func, int line, switch_channel_state_t state); -SWITCH_DECLARE(switch_channel_state_t) switch_channel_perform_set_running_state(switch_channel_t *channel, +SWITCH_DECLARE(switch_channel_state_t) switch_channel_perform_set_running_state(switch_channel_t *channel, switch_channel_state_t state, const char *file, const char *func, int line); -#define switch_channel_set_running_state(channel) switch_channel_perform_set_running_state(channel, __FILE__, __SWITCH_FUNC__, __LINE__) +#define switch_channel_set_running_state(channel, state) switch_channel_perform_set_running_state(channel, state, __FILE__, __SWITCH_FUNC__, __LINE__) /*! \brief Set the current state of a channel Modified: freeswitch/trunk/src/switch_channel.c ============================================================================== --- freeswitch/trunk/src/switch_channel.c (original) +++ freeswitch/trunk/src/switch_channel.c Sat Mar 8 16:07:15 2008 @@ -763,13 +763,13 @@ return CS_DONE; } -SWITCH_DECLARE(switch_channel_state_t) switch_channel_perform_set_running_state(switch_channel_t *channel, +SWITCH_DECLARE(switch_channel_state_t) switch_channel_perform_set_running_state(switch_channel_t *channel, switch_channel_state_t state, const char *file, const char *func, int line) { switch_mutex_lock(channel->flag_mutex); switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, func, line, NULL, SWITCH_LOG_DEBUG, "%s Running State Change %s\n", - channel->name, state_names[channel->state]); - channel->running_state = channel->state; + channel->name, state_names[state]); + channel->running_state = state; if (channel->state_flags) { channel->flags |= channel->state_flags; @@ -778,18 +778,18 @@ if (channel->state >= CS_RING) { switch_clear_flag(channel, CF_TRANSFER); - switch_channel_presence(channel, "unknown", (char *) state_names[channel->state]); + switch_channel_presence(channel, "unknown", (char *) state_names[state]); } - if (channel->state < CS_HANGUP) { + if (state < CS_HANGUP) { switch_event_t *event; if (switch_event_create(&event, SWITCH_EVENT_CHANNEL_STATE) == SWITCH_STATUS_SUCCESS) { - if (channel->state == CS_RING) { + if (state == CS_RING) { switch_channel_event_set_data(channel, event); } else { char state_num[25]; - switch_snprintf(state_num, sizeof(state_num), "%d", channel->state); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Channel-State", "%s", (char *) switch_channel_state_name(channel->state)); + switch_snprintf(state_num, sizeof(state_num), "%d", state); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Channel-State", "%s", (char *) switch_channel_state_name(state)); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Channel-State-Number", "%s", (char *) state_num); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Channel-Name", "%s", channel->name); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Unique-ID", "%s", switch_core_session_get_uuid(channel->session)); @@ -1013,12 +1013,9 @@ } else { switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, func, line, NULL, SWITCH_LOG_WARNING, "%s Invalid State Change %s -> %s\n", channel->name, state_names[last_state], state_names[state]); - /* we won't tolerate an invalid state change so we can make sure we are as robust as a nice cup of dark coffee! */ - if (channel->state < CS_HANGUP) { - /* not cool lets crash this bad boy and figure out wtf is going on */ - switch_assert(0); - } + /* not cool lets crash this bad boy and figure out wtf is going on */ + switch_assert(channel->state >= CS_HANGUP); } done: Modified: freeswitch/trunk/src/switch_core_state_machine.c ============================================================================== --- freeswitch/trunk/src/switch_core_state_machine.c (original) +++ freeswitch/trunk/src/switch_core_state_machine.c Sat Mar 8 16:07:15 2008 @@ -398,7 +398,7 @@ int proceed = 1; int do_extra_handlers = 1; - switch_channel_set_running_state(session->channel); + switch_channel_set_running_state(session->channel, state); switch (state) { case CS_NEW: /* Just created, Waiting for first instructions */

1 0

[commit] r7844 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 08 Mar '08

08 Mar '08

Author: mikej Date: Fri Mar 7 23:26:02 2008 New Revision: 7844 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c Log: Bitwise operation on logical result: ! has higher precedence than &. Use && or (!(x & y)) instead 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 Fri Mar 7 23:26:02 2008 @@ -1986,7 +1986,7 @@ char *full_ref_by = NULL; char *full_ref_to = NULL; - if (!profile->mflags & MFLAG_REFER) { + if (!(profile->mflags & MFLAG_REFER)) { nua_respond(nh, SIP_403_FORBIDDEN, NUTAG_WITH_THIS(nua), TAG_END()); goto done; } Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c Fri Mar 7 23:26:02 2008 @@ -638,7 +638,7 @@ char key[128] = ""; switch_event_t *v_event = NULL; - if (!profile->mflags & MFLAG_REGISTER) { + if (!(profile->mflags & MFLAG_REGISTER)) { nua_respond(nh, SIP_403_FORBIDDEN, NUTAG_WITH_THIS(nua), TAG_END()); goto end; }

1 0

[commit] r7843 - freeswitch/trunk/src
by Freeswitch SVN 08 Mar '08

08 Mar '08

Author: mikej Date: Fri Mar 7 23:18:23 2008 New Revision: 7843 Modified: freeswitch/trunk/src/switch_ivr_play_say.c Log: type tweak Modified: freeswitch/trunk/src/switch_ivr_play_say.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_play_say.c (original) +++ freeswitch/trunk/src/switch_ivr_play_say.c Fri Mar 7 23:18:23 2008 @@ -1108,7 +1108,7 @@ switch_input_args_t args = { 0 }; switch_status_t status = SWITCH_STATUS_SUCCESS; char terminator; - int len; + size_t len; switch_assert(session);

1 0

[commit] r7842 - freeswitch/trunk/src
by Freeswitch SVN 08 Mar '08

08 Mar '08

Author: mikej Date: Fri Mar 7 23:16:22 2008 New Revision: 7842 Modified: freeswitch/trunk/src/switch_console.c Log: ifdef for windows build Modified: freeswitch/trunk/src/switch_console.c ============================================================================== --- freeswitch/trunk/src/switch_console.c (original) +++ freeswitch/trunk/src/switch_console.c Fri Mar 7 23:16:22 2008 @@ -35,6 +35,7 @@ #include <switch_version.h> #define CMD_BUFLEN 1024; +#ifdef SWITCH_HAVE_LIBEDIT /* * store a strdup() of the string configured in XML * bound to each of the 12 function key @@ -82,7 +83,7 @@ return SWITCH_STATUS_SUCCESS; } - +#endif SWITCH_DECLARE_NONSTD(switch_status_t) switch_console_stream_raw_write(switch_stream_handle_t *handle, uint8_t *data, switch_size_t datalen) {

1 0

[commit] r7841 - in freeswitch/trunk/src: . mod/endpoints/mod_sofia
by Freeswitch SVN 08 Mar '08

08 Mar '08

Author: anthm Date: Fri Mar 7 21:11:21 2008 New Revision: 7841 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c freeswitch/trunk/src/switch_event.c freeswitch/trunk/src/switch_rtp.c Log: update 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 Fri Mar 7 21:11:21 2008 @@ -1920,6 +1920,11 @@ break; case nua_callstate_terminating: + if (session) { + if (!switch_test_flag(tech_pvt, TFLAG_BYE)) { + switch_set_flag_locked(tech_pvt, TFLAG_BYE); + } + } break; case nua_callstate_terminated: if (session) { Modified: freeswitch/trunk/src/switch_event.c ============================================================================== --- freeswitch/trunk/src/switch_event.c (original) +++ freeswitch/trunk/src/switch_event.c Fri Mar 7 21:11:21 2008 @@ -411,8 +411,8 @@ switch_queue_create(&EVENT_QUEUE[0], POOL_COUNT_MAX + 10, THRUNTIME_POOL); switch_queue_create(&EVENT_QUEUE[1], POOL_COUNT_MAX + 10, THRUNTIME_POOL); switch_queue_create(&EVENT_QUEUE[2], POOL_COUNT_MAX + 10, THRUNTIME_POOL); - switch_queue_create(&EVENT_RECYCLE_QUEUE, SWITCH_CORE_QUEUE_LEN, THRUNTIME_POOL); - switch_queue_create(&EVENT_HEADER_RECYCLE_QUEUE, SWITCH_CORE_QUEUE_LEN, THRUNTIME_POOL); + switch_queue_create(&EVENT_RECYCLE_QUEUE, 250000, THRUNTIME_POOL); + switch_queue_create(&EVENT_HEADER_RECYCLE_QUEUE, 250000, THRUNTIME_POOL); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Activate Eventing Engine.\n"); switch_mutex_init(&BLOCK, SWITCH_MUTEX_NESTED, RUNTIME_POOL); Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Fri Mar 7 21:11:21 2008 @@ -765,12 +765,17 @@ if (switch_rtp_create(&rtp_session, payload, samples_per_interval, ms_per_packet, flags, timer_name, err, pool) != SWITCH_STATUS_SUCCESS) { goto end; } - + + switch_mutex_lock(rtp_session->flag_mutex); + if (switch_rtp_set_local_address(rtp_session, rx_host, rx_port, err) != SWITCH_STATUS_SUCCESS) { + switch_mutex_unlock(rtp_session->flag_mutex); rtp_session = NULL; + goto end; } if (switch_rtp_set_remote_address(rtp_session, tx_host, tx_port, err) != SWITCH_STATUS_SUCCESS) { + switch_mutex_unlock(rtp_session->flag_mutex); rtp_session = NULL; goto end; } @@ -778,6 +783,7 @@ end: if (rtp_session) { + switch_mutex_unlock(rtp_session->flag_mutex); rtp_session->ready = 2; rtp_session->rx_host = switch_core_strdup(rtp_session->pool, rx_host); rtp_session->rx_port = rx_port;

1 0

[commit] r7840 - freeswitch/trunk/src/mod/applications/mod_dptools
by Freeswitch SVN 08 Mar '08

08 Mar '08

Author: anthm Date: Fri Mar 7 20:34:08 2008 New Revision: 7840 Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c Log: update 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 Fri Mar 7 20:34:08 2008 @@ -1571,8 +1571,8 @@ SWITCH_ADD_APP(app_interface, "strftime", NULL, NULL, strftime_function, NULL, SAF_SUPPORT_NOMEDIA); SWITCH_ADD_APP(app_interface, "phrase", "Say a Phrase", "Say a Phrase", phrase_function, "<macro_name>,<data>", SAF_NONE); SWITCH_ADD_APP(app_interface, "eval", "Do Nothing", "Do Nothing", eval_function, "", SAF_SUPPORT_NOMEDIA); - SWITCH_ADD_APP(app_interface, "pre_answer", "Pre-Answer the call", "Pre-Answer the call for a channel.", pre_answer_function, "", SAF_NONE); - SWITCH_ADD_APP(app_interface, "answer", "Answer the call", "Answer the call for a channel.", answer_function, "", SAF_NONE); + SWITCH_ADD_APP(app_interface, "pre_answer", "Pre-Answer the call", "Pre-Answer the call for a channel.", pre_answer_function, "", SAF_SUPPORT_NOMEDIA); + SWITCH_ADD_APP(app_interface, "answer", "Answer the call", "Answer the call for a channel.", answer_function, "", SAF_SUPPORT_NOMEDIA); SWITCH_ADD_APP(app_interface, "hangup", "Hangup the call", "Hangup the call for a channel.", hangup_function, "[<cause>]", SAF_SUPPORT_NOMEDIA); SWITCH_ADD_APP(app_interface, "set_name", "Name the channel", "Name the channel", set_name_function, "<name>", SAF_SUPPORT_NOMEDIA); SWITCH_ADD_APP(app_interface, "log", "Logs a channel variable", LOG_LONG_DESC, log_function, "<varname>", SAF_SUPPORT_NOMEDIA);

1 0

[commit] r7839 - freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua
by Freeswitch SVN 08 Mar '08

08 Mar '08

Author: mikej Date: Fri Mar 7 19:12:57 2008 New Revision: 7839 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_params.c Log: revert part of the reverting from the reverted revert. (see r7833, the fun continues) Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_params.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_params.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_params.c Fri Mar 7 19:12:57 2008 @@ -177,6 +177,7 @@ NHP_SET(nhp, refer_with_id, 1); NHP_SET(nhp, substate, nua_substate_active); + NHP_SET(nhp, sub_expires, 3600); NHP_SET(nhp, allow, sip_allow_make(home, nua_allow_str)); NHP_SET(nhp, supported, sip_supported_make(home, "timer, 100rel"));

1 0

[commit] r7838 - freeswitch/trunk/src/mod/applications/mod_voicemail
by Freeswitch SVN 07 Mar '08

07 Mar '08

Author: anthm Date: Fri Mar 7 18:34:14 2008 New Revision: 7838 Modified: freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c Log: udpate 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 Fri Mar 7 18:34:14 2008 @@ -1791,7 +1791,7 @@ if ((voicemail_greeting_number = switch_channel_get_variable(channel, "voicemail_greeting_number"))) { int num = atoi(voicemail_greeting_number); - if (num > 0 && num < VM_MAX_GREETINGS) { + if (num > 0 && num <= VM_MAX_GREETINGS) { greet_path = switch_mprintf("%s%sgreeting_%d.%s", dir_path, SWITCH_PATH_SEPARATOR, num, profile->file_ext); } } else {

1 0

[commit] r7837 - freeswitch/trunk/src/mod/applications/mod_voicemail
by Freeswitch SVN 07 Mar '08

07 Mar '08

Author: anthm Date: Fri Mar 7 18:21:08 2008 New Revision: 7837 Modified: freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c Log: udpate 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 Fri Mar 7 18:21:08 2008 @@ -44,6 +44,8 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_voicemail_load); SWITCH_MODULE_DEFINITION(mod_voicemail, mod_voicemail_load, NULL, NULL); +#define VM_MAX_GREETINGS 9 + static struct { switch_hash_t *profile_hash; int debug; @@ -1445,7 +1447,7 @@ num = atoi(input); file_path = switch_mprintf("%s%sgreeting_%d.%s", dir_path, SWITCH_PATH_SEPARATOR, num, profile->file_ext); - if (num < 1 || num > 3) { + if (num < 1 || num > VM_MAX_GREETINGS) { status = SWITCH_STATUS_FALSE; } else { switch_file_handle_t fh = { 0 }; @@ -1472,7 +1474,7 @@ TRY_CODE(vm_macro_get(session, VM_CHOOSE_GREETING_MACRO, key_buf, input, sizeof(input), 1, "", &term, timeout)); num = atoi(input); - if (num < 1 || num > 9) { + if (num < 1 || num > VM_MAX_GREETINGS) { TRY_CODE(switch_ivr_phrase_macro(session, VM_CHOOSE_GREETING_FAIL_MACRO, NULL, NULL, NULL)); } else { file_path = switch_mprintf("%s%sgreeting_%d.%s", dir_path, SWITCH_PATH_SEPARATOR, num, profile->file_ext); @@ -1789,7 +1791,7 @@ if ((voicemail_greeting_number = switch_channel_get_variable(channel, "voicemail_greeting_number"))) { int num = atoi(voicemail_greeting_number); - if (num > 0 && num < 3) { + if (num > 0 && num < VM_MAX_GREETINGS) { greet_path = switch_mprintf("%s%sgreeting_%d.%s", dir_path, SWITCH_PATH_SEPARATOR, num, profile->file_ext); } } else {

1 0

[commit] r7836 - freeswitch/trunk/src/mod/applications/mod_voicemail
by Freeswitch SVN 07 Mar '08

07 Mar '08

Author: anthm Date: Fri Mar 7 18:17:01 2008 New Revision: 7836 Modified: freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c Log: udpate 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 Fri Mar 7 18:17:01 2008 @@ -1472,7 +1472,7 @@ TRY_CODE(vm_macro_get(session, VM_CHOOSE_GREETING_MACRO, key_buf, input, sizeof(input), 1, "", &term, timeout)); num = atoi(input); - if (num < 1 || num > 3) { + if (num < 1 || num > 9) { TRY_CODE(switch_ivr_phrase_macro(session, VM_CHOOSE_GREETING_FAIL_MACRO, NULL, NULL, NULL)); } else { file_path = switch_mprintf("%s%sgreeting_%d.%s", dir_path, SWITCH_PATH_SEPARATOR, num, profile->file_ext);

1 0