November 2008 - Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r10501 - freeswitch/trunk/src
by FreeSWITCH SVN 21 Nov '08

21 Nov '08

Author: anthm Date: Fri Nov 21 13:00:15 2008 New Revision: 10501 Log: update Modified: freeswitch/trunk/src/switch_ivr_bridge.c Modified: freeswitch/trunk/src/switch_ivr_bridge.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_bridge.c (original) +++ freeswitch/trunk/src/switch_ivr_bridge.c Fri Nov 21 13:00:15 2008 @@ -484,7 +484,7 @@ } } - if (switch_channel_get_state(channel) < CS_HANGUP) { + if (switch_channel_get_state(channel) == CS_EXCHANGE_MEDIA) { switch_channel_set_state(channel, CS_RESET); }

1 0

[commit] r10498 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by FreeSWITCH SVN 21 Nov '08

21 Nov '08

Author: brian Date: Fri Nov 21 11:15:29 2008 New Revision: 10498 Log: MODENDP-150 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c 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 Nov 21 11:15:29 2008 @@ -638,7 +638,7 @@ } if (is_nat && (profile->pflags & PFLAG_RECIEVED_IN_NAT_REG_CONTACT)) { - switch_snprintf(received_data, sizeof(received_data), ";received=\"%s:%d\"", url_ip, network_port); + switch_snprintf(received_data, sizeof(received_data), ";received=%s:%d", url_ip, network_port); } if (contact->m_url->url_params) { @@ -699,7 +699,7 @@ if ((v_contact_str = switch_event_get_header(*v_event, "sip-force-contact"))) { if (*received_data && (profile->pflags & PFLAG_RECIEVED_IN_NAT_REG_CONTACT)) { - switch_snprintf(received_data, sizeof(received_data), ";received=\"%s:%d\"", url_ip, network_port); + switch_snprintf(received_data, sizeof(received_data), ";received=%s:%d", url_ip, network_port); } if (!strcasecmp(v_contact_str, "nat-connectile-dysfunction") ||

1 0

[commit] r10497 - in freeswitch/trunk/src: . mod/endpoints/mod_sofia
by FreeSWITCH SVN 21 Nov '08

21 Nov '08

Author: anthm Date: Fri Nov 21 11:14:02 2008 New Revision: 10497 Log: tweak Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c freeswitch/trunk/src/switch_core_io.c 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 Fri Nov 21 11:14:02 2008 @@ -702,9 +702,13 @@ *frame = NULL; return SWITCH_STATUS_GENERR; } + + if (tech_pvt->check_frames++ < MAX_CODEC_CHECK_FRAMES) { + if (!tech_pvt->read_codec.implementation->encoded_bytes_per_packet) { + tech_pvt->check_frames = MAX_CODEC_CHECK_FRAMES; + goto skip; + } - - if (tech_pvt->check_frames < MAX_CODEC_CHECK_FRAMES) { if (tech_pvt->last_ts && tech_pvt->read_frame.datalen != tech_pvt->read_codec.implementation->encoded_bytes_per_packet) { if (++tech_pvt->mismatch_count >= MAX_MISMATCH_FRAMES) { switch_size_t codec_ms = (int)(tech_pvt->read_frame.timestamp - @@ -712,6 +716,7 @@ if ((codec_ms % 10) != 0) { tech_pvt->check_frames = MAX_CODEC_CHECK_FRAMES; + goto skip; } else { if (switch_rtp_ready(tech_pvt->rtp_session) && codec_ms != tech_pvt->codec_ms) { const char *val; @@ -770,13 +775,13 @@ } } - tech_pvt->check_frames++; } } else { tech_pvt->mismatch_count = 0; } tech_pvt->last_ts = tech_pvt->read_frame.timestamp; } + skip: if ((bytes = tech_pvt->read_codec.implementation->encoded_bytes_per_packet)) { frames = (tech_pvt->read_frame.datalen / bytes); Modified: freeswitch/trunk/src/switch_core_io.c ============================================================================== --- freeswitch/trunk/src/switch_core_io.c (original) +++ freeswitch/trunk/src/switch_core_io.c Fri Nov 21 11:14:02 2008 @@ -155,6 +155,8 @@ } if (session->endpoint_interface->io_routines->read_frame) { + switch_mutex_unlock(session->read_codec->mutex); + switch_mutex_unlock(session->codec_read_mutex); if ((status = session->endpoint_interface->io_routines->read_frame(session, frame, flags, stream_id)) == SWITCH_STATUS_SUCCESS) { for (ptr = session->event_hooks.read_frame; ptr; ptr = ptr->next) { if ((status = ptr->read_frame(session, frame, flags, stream_id)) != SWITCH_STATUS_SUCCESS) { @@ -162,6 +164,14 @@ } } } + + if (!session->read_codec) { + *frame = NULL; + return SWITCH_STATUS_FALSE; + } + + switch_mutex_lock(session->codec_read_mutex); + switch_mutex_lock(session->read_codec->mutex); } if (status != SWITCH_STATUS_SUCCESS) {

1 0

[commit] r10494 - freeswitch/trunk/src
by FreeSWITCH SVN 21 Nov '08

21 Nov '08

Author: anthm Date: Fri Nov 21 10:55:17 2008 New Revision: 10494 Log: fix issue where pid file is accidentally truncated (part2) Modified: freeswitch/trunk/src/switch.c Modified: freeswitch/trunk/src/switch.c ============================================================================== --- freeswitch/trunk/src/switch.c (original) +++ freeswitch/trunk/src/switch.c Fri Nov 21 10:55:17 2008 @@ -610,15 +610,13 @@ pid_path, SWITCH_FOPEN_READ, SWITCH_FPROT_UREAD | SWITCH_FPROT_UWRITE, - pool) != SWITCH_STATUS_SUCCESS) { - fprintf(stderr, "Cannot open pid file %s.\n", pid_path); - return 255; + pool) == SWITCH_STATUS_SUCCESS) { + + old_pid_len = sizeof(old_pid_buffer); + switch_file_read(fd, old_pid_buffer, &old_pid_len); + switch_file_close(fd); } - old_pid_len = sizeof(old_pid_buffer); - switch_file_read(fd, old_pid_buffer, &old_pid_len); - switch_file_close(fd); - if (switch_file_open(&fd, pid_path, SWITCH_FOPEN_WRITE | SWITCH_FOPEN_CREATE | SWITCH_FOPEN_TRUNCATE, @@ -631,7 +629,9 @@ if (switch_file_lock(fd, SWITCH_FLOCK_EXCLUSIVE | SWITCH_FLOCK_NONBLOCK) != SWITCH_STATUS_SUCCESS) { fprintf(stderr, "Cannot lock pid file %s.\n", pid_path); old_pid_len = strlen(old_pid_buffer); - switch_file_write(fd, old_pid_buffer, &old_pid_len); + if (strlen(old_pid_buffer)) { + switch_file_write(fd, old_pid_buffer, &old_pid_len); + } return 255; }

1 0

[commit] r10493 - freeswitch/trunk/src
by FreeSWITCH SVN 21 Nov '08

21 Nov '08

Author: anthm Date: Fri Nov 21 10:52:22 2008 New Revision: 10493 Log: fix issue where pid file is accidentally truncated Modified: freeswitch/trunk/src/switch.c Modified: freeswitch/trunk/src/switch.c ============================================================================== --- freeswitch/trunk/src/switch.c (original) +++ freeswitch/trunk/src/switch.c Fri Nov 21 10:52:22 2008 @@ -253,7 +253,8 @@ { char pid_path[256] = ""; /* full path to the pid file */ char pid_buffer[32] = ""; /* pid string */ - switch_size_t pid_len; + char old_pid_buffer[32] = ""; /* pid string */ + switch_size_t pid_len, old_pid_len; const char *err = NULL; /* error value for return from freeswitch initialization */ #ifndef WIN32 int nf = 0; /* TRUE if we are running in nofork mode */ @@ -603,17 +604,34 @@ pid_len = strlen(pid_buffer); apr_pool_create(&pool, NULL); + + if (switch_file_open(&fd, - pid_path, - SWITCH_FOPEN_WRITE | SWITCH_FOPEN_CREATE | SWITCH_FOPEN_TRUNCATE, - SWITCH_FPROT_UREAD | SWITCH_FPROT_UWRITE, - pool) != SWITCH_STATUS_SUCCESS) { - fprintf(stderr, "Cannot open pid file %s.\n", pid_path); - return 255; + pid_path, + SWITCH_FOPEN_READ, + SWITCH_FPROT_UREAD | SWITCH_FPROT_UWRITE, + pool) != SWITCH_STATUS_SUCCESS) { + fprintf(stderr, "Cannot open pid file %s.\n", pid_path); + return 255; + } + + old_pid_len = sizeof(old_pid_buffer); + switch_file_read(fd, old_pid_buffer, &old_pid_len); + switch_file_close(fd); + + if (switch_file_open(&fd, + pid_path, + SWITCH_FOPEN_WRITE | SWITCH_FOPEN_CREATE | SWITCH_FOPEN_TRUNCATE, + SWITCH_FPROT_UREAD | SWITCH_FPROT_UWRITE, + pool) != SWITCH_STATUS_SUCCESS) { + fprintf(stderr, "Cannot open pid file %s.\n", pid_path); + return 255; } if (switch_file_lock(fd, SWITCH_FLOCK_EXCLUSIVE | SWITCH_FLOCK_NONBLOCK) != SWITCH_STATUS_SUCCESS) { fprintf(stderr, "Cannot lock pid file %s.\n", pid_path); + old_pid_len = strlen(old_pid_buffer); + switch_file_write(fd, old_pid_buffer, &old_pid_len); return 255; }

1 0

[commit] r10490 - freeswitch/trunk/src
by FreeSWITCH SVN 21 Nov '08

21 Nov '08

Author: anthm Date: Fri Nov 21 09:25:24 2008 New Revision: 10490 Log: good measure Modified: freeswitch/trunk/src/switch_rtp.c Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Fri Nov 21 09:25:24 2008 @@ -1007,8 +1007,11 @@ if (rtp_session->sock_input) { char o[4] = "DOH"; - switch_size_t len = sizeof(o); - + switch_size_t len; + + len = sizeof(o); + switch_socket_sendto(rtp_session->sock_input, rtp_session->local_addr, 0, (void *) o, &len); + len = sizeof(o); switch_socket_sendto(rtp_session->sock_input, rtp_session->local_addr, 0, (void *) o, &len); } switch_mutex_unlock(rtp_session->flag_mutex);

1 0

[commit] r10489 - freeswitch/trunk/src/mod/applications/mod_dptools
by FreeSWITCH SVN 21 Nov '08

21 Nov '08

Author: anthm Date: Fri Nov 21 08:56:32 2008 New Revision: 10489 Log: add playback_terminator support to phrase and say app Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c 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 Nov 21 08:56:32 2008 @@ -126,22 +126,6 @@ } } -#define SAY_SYNTAX "<module_name> <say_type> <say_method> <text>" -SWITCH_STANDARD_APP(say_function) -{ - char *argv[4] = { 0 }; - int argc; - char *lbuf = NULL; - - if (!switch_strlen_zero(data) && (lbuf = switch_core_session_strdup(session, data)) - && (argc = switch_separate_string(lbuf, ' ', argv, (sizeof(argv) / sizeof(argv[0])))) == 4) { - switch_ivr_say(session, argv[3], argv[0], argv[1], argv[2], NULL); - } else { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Usage: %s\n", SAY_SYNTAX); - } - -} - #define SOFT_HOLD_SYNTAX "<unhold key> [<moh_a>] [<moh_b>]" SWITCH_STANDARD_APP(soft_hold_function) { @@ -563,25 +547,6 @@ return; } -SWITCH_STANDARD_APP(phrase_function) -{ - char *mydata = NULL; - - if (!switch_strlen_zero(data) && (mydata = switch_core_session_strdup(session, data))) { - const char *lang; - char *macro = mydata; - char *mdata = NULL; - - if ((mdata = strchr(macro, ','))) { - *mdata++ = '\0'; - } - - lang = switch_channel_get_variable(switch_core_session_get_channel(session), "language"); - - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Execute %s(%s) lang %s\n", macro, switch_str_nil(mdata), switch_str_nil(lang)); - switch_ivr_phrase_macro(session, macro, mdata, lang, NULL); - } -} SWITCH_STANDARD_APP(hangup_function) { @@ -1142,7 +1107,6 @@ && switch_ivr_menu_stack_xml_build(xml_ctx, &menu_stack, xml_menus, xml_menu) == SWITCH_STATUS_SUCCESS) { switch_xml_free(cxml); cxml = NULL; - switch_channel_pre_answer(channel); switch_ivr_menu_execute(session, menu_stack, (char *) data, NULL); switch_ivr_menu_stack_free(menu_stack); } else { @@ -1407,8 +1371,6 @@ switch_channel_hangup(channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER); } - switch_channel_pre_answer(channel); - args.input_callback = on_dtmf; args.buf = buf; args.buflen = sizeof(buf); @@ -1625,12 +1587,64 @@ switch_ivr_read(session, min_digits, max_digits, prompt_audio_file, var_name, digit_buffer, sizeof(digit_buffer), timeout, valid_terminators); } -SWITCH_STANDARD_APP(playback_function) + + +#define SAY_SYNTAX "<module_name> <say_type> <say_method> <text>" +SWITCH_STANDARD_APP(say_function) { + char *argv[4] = { 0 }; + int argc; + char *lbuf = NULL; switch_input_args_t args = { 0 }; switch_channel_t *channel = switch_core_session_get_channel(session); - switch_channel_pre_answer(switch_core_session_get_channel(session)); + if (!switch_strlen_zero(data) && (lbuf = switch_core_session_strdup(session, data)) + && (argc = switch_separate_string(lbuf, ' ', argv, (sizeof(argv) / sizeof(argv[0])))) == 4) { + + args.input_callback = on_dtmf; + + switch_channel_set_variable(channel, SWITCH_PLAYBACK_TERMINATOR_USED, "" ); + + switch_ivr_say(session, argv[3], argv[0], argv[1], argv[2], &args); + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Usage: %s\n", SAY_SYNTAX); + } + +} + + +SWITCH_STANDARD_APP(phrase_function) +{ + char *mydata = NULL; + switch_input_args_t args = { 0 }; + switch_channel_t *channel = switch_core_session_get_channel(session); + + if (!switch_strlen_zero(data) && (mydata = switch_core_session_strdup(session, data))) { + const char *lang; + char *macro = mydata; + char *mdata = NULL; + + if ((mdata = strchr(macro, ','))) { + *mdata++ = '\0'; + } + + lang = switch_channel_get_variable(switch_core_session_get_channel(session), "language"); + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Execute %s(%s) lang %s\n", macro, switch_str_nil(mdata), switch_str_nil(lang)); + + args.input_callback = on_dtmf; + + switch_channel_set_variable(channel, SWITCH_PLAYBACK_TERMINATOR_USED, "" ); + + switch_ivr_phrase_macro(session, macro, mdata, lang, &args); + } +} + + +SWITCH_STANDARD_APP(playback_function) +{ + switch_input_args_t args = { 0 }; + switch_channel_t *channel = switch_core_session_get_channel(session); args.input_callback = on_dtmf; @@ -1652,8 +1666,6 @@ return; } - switch_channel_pre_answer(switch_core_session_get_channel(session)); - if ((l = strchr(tone_script, '|'))) { *l++ = '\0'; loops = atoi(l);

1 0

[commit] r10488 - freeswitch/trunk/src/mod/languages/mod_managed/managed
by FreeSWITCH SVN 21 Nov '08

21 Nov '08

Author: mikej Date: Thu Nov 20 19:15:02 2008 New Revision: 10488 Log: swigall Modified: freeswitch/trunk/src/mod/languages/mod_managed/managed/swig.cs Modified: freeswitch/trunk/src/mod/languages/mod_managed/managed/swig.cs ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_managed/managed/swig.cs (original) +++ freeswitch/trunk/src/mod/languages/mod_managed/managed/swig.cs Thu Nov 20 19:15:02 2008 @@ -16791,7 +16791,7 @@ CF_ORIGINATOR = (1 << 3), CF_TRANSFER = (1 << 4), CF_ACCEPT_CNG = (1 << 5), - CF_WAIT_FOR_ME = (1 << 6), + CF_REDIRECT = (1 << 6), CF_BRIDGED = (1 << 7), CF_HOLD = (1 << 8), CF_SERVICE = (1 << 9), @@ -16815,8 +16815,7 @@ CF_PROXY_MEDIA = (1 << 27), CF_INNER_BRIDGE = (1 << 28), CF_REQ_MEDIA = (1 << 29), - CF_VERBOSE_EVENTS = (1 << 30), - CF_MASTER = (1 << 31) + CF_VERBOSE_EVENTS = (1 << 30) } }

1 0

[commit] r10487 - in freeswitch/trunk/src: . include include/private
by FreeSWITCH SVN 21 Nov '08

21 Nov '08

Author: anthm Date: Thu Nov 20 19:09:11 2008 New Revision: 10487 Log: code reworking do make current Modified: freeswitch/trunk/src/include/private/switch_core_pvt.h freeswitch/trunk/src/include/switch_types.h freeswitch/trunk/src/switch_channel.c freeswitch/trunk/src/switch_core_codec.c freeswitch/trunk/src/switch_core_io.c freeswitch/trunk/src/switch_core_session.c freeswitch/trunk/src/switch_core_state_machine.c freeswitch/trunk/src/switch_ivr_bridge.c freeswitch/trunk/src/switch_ivr_originate.c Modified: freeswitch/trunk/src/include/private/switch_core_pvt.h ============================================================================== --- freeswitch/trunk/src/include/private/switch_core_pvt.h (original) +++ freeswitch/trunk/src/include/private/switch_core_pvt.h Thu Nov 20 19:09:11 2008 @@ -118,6 +118,8 @@ switch_mutex_t *mutex; switch_mutex_t *resample_mutex; + switch_mutex_t *codec_read_mutex; + switch_mutex_t *codec_write_mutex; switch_thread_cond_t *cond; switch_thread_rwlock_t *rwlock; Modified: freeswitch/trunk/src/include/switch_types.h ============================================================================== --- freeswitch/trunk/src/include/switch_types.h (original) +++ freeswitch/trunk/src/include/switch_types.h Thu Nov 20 19:09:11 2008 @@ -732,7 +732,7 @@ CF_ORIGINATOR = (1 << 3) - Channel is an originator CF_TRANSFER = (1 << 4) - Channel is being transfered CF_ACCEPT_CNG = (1 << 5) - Channel will accept CNG frames -CF_WAIT_FOR_ME = (1 << 6) - Channel wants you to wait +CF_REDIRECT = (1 << 6) - Channel is being redirected CF_BRIDGED = (1 << 7) - Channel in a bridge CF_HOLD = (1 << 8) - Channel is on hold CF_SERVICE = (1 << 9) - Channel has a service thread @@ -763,7 +763,7 @@ CF_ORIGINATOR = (1 << 3), CF_TRANSFER = (1 << 4), CF_ACCEPT_CNG = (1 << 5), - CF_WAIT_FOR_ME = (1 << 6), + CF_REDIRECT = (1 << 6), CF_BRIDGED = (1 << 7), CF_HOLD = (1 << 8), CF_SERVICE = (1 << 9), @@ -787,12 +787,13 @@ CF_PROXY_MEDIA = (1 << 27), CF_INNER_BRIDGE = (1 << 28), CF_REQ_MEDIA = (1 << 29), - CF_VERBOSE_EVENTS = (1 << 30), - CF_MASTER = (1 << 31) + CF_VERBOSE_EVENTS = (1 << 30) } switch_channel_flag_enum_t; + typedef uint32_t switch_channel_flag_t; + /*! \enum switch_frame_flag_t \brief Frame Flags Modified: freeswitch/trunk/src/switch_channel.c ============================================================================== --- freeswitch/trunk/src/switch_channel.c (original) +++ freeswitch/trunk/src/switch_channel.c Thu Nov 20 19:09:11 2008 @@ -841,7 +841,6 @@ switch_clear_flag(channel, CF_TAGGED); if (channel->state >= CS_ROUTING) { - switch_clear_flag(channel, CF_TRANSFER); switch_channel_presence(channel, "unknown", (char *) state_names[state], NULL); } Modified: freeswitch/trunk/src/switch_core_codec.c ============================================================================== --- freeswitch/trunk/src/switch_core_codec.c (original) +++ freeswitch/trunk/src/switch_core_codec.c Thu Nov 20 19:09:11 2008 @@ -46,6 +46,7 @@ { switch_mutex_t *mutex = NULL; + switch_mutex_lock(session->codec_read_mutex); if (session->read_codec) mutex = session->read_codec->mutex; if (mutex) switch_mutex_lock(mutex); session->real_read_codec = session->read_codec = NULL; @@ -54,16 +55,19 @@ session->enc_read_frame.codec = session->read_codec; session->enc_write_frame.codec = session->read_codec; if (mutex) switch_mutex_unlock(mutex); + switch_mutex_unlock(session->codec_read_mutex); } SWITCH_DECLARE(void) switch_core_session_unset_write_codec(switch_core_session_t *session) { switch_mutex_t *mutex = NULL; + switch_mutex_lock(session->codec_write_mutex); if (session->write_codec) mutex = session->write_codec->mutex; if (mutex) switch_mutex_lock(mutex); session->real_write_codec = session->write_codec = NULL; if (mutex) switch_mutex_unlock(mutex); + switch_mutex_unlock(session->codec_write_mutex); } @@ -74,6 +78,8 @@ char tmp[30]; switch_status_t status = SWITCH_STATUS_SUCCESS; + switch_mutex_lock(session->codec_read_mutex); + if (codec && !codec->implementation) { codec = NULL; } @@ -128,6 +134,7 @@ end: + switch_mutex_unlock(session->codec_read_mutex); return status; } @@ -192,6 +199,8 @@ char tmp[30]; switch_status_t status = SWITCH_STATUS_SUCCESS; + switch_mutex_lock(session->codec_write_mutex); + if (!codec || !codec->implementation) { if (session->real_write_codec) { session->write_codec = session->real_write_codec; @@ -241,6 +250,7 @@ } end: + switch_mutex_unlock(session->codec_write_mutex); return status; } Modified: freeswitch/trunk/src/switch_core_io.c ============================================================================== --- freeswitch/trunk/src/switch_core_io.c (original) +++ freeswitch/trunk/src/switch_core_io.c Thu Nov 20 19:09:11 2008 @@ -110,10 +110,15 @@ switch_assert(session != NULL); if (!(session->read_codec && session->read_codec->implementation)) { + if (switch_channel_test_flag(session->channel, CF_PROXY_MODE) || switch_channel_get_state(session->channel) == CS_HIBERNATE) { + *frame = &runtime.dummy_cng_frame; + return SWITCH_STATUS_SUCCESS; + } switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "%s has no read codec.\n", switch_channel_get_name(session->channel)); return SWITCH_STATUS_FALSE; } + switch_mutex_lock(session->codec_read_mutex); switch_mutex_lock(session->read_codec->mutex); top: @@ -521,7 +526,8 @@ } switch_mutex_unlock(session->read_codec->mutex); - + switch_mutex_unlock(session->codec_read_mutex); + return status; } @@ -588,7 +594,8 @@ } switch_mutex_lock(session->write_codec->mutex); switch_mutex_lock(frame->codec->mutex); - + switch_mutex_lock(session->codec_write_mutex); + if ((session->write_codec && frame->codec && session->write_codec->implementation != frame->codec->implementation)) { need_codec = TRUE; if (session->write_codec->implementation->codec_id == frame->codec->implementation->codec_id) { @@ -977,7 +984,8 @@ switch_mutex_unlock(session->write_codec->mutex); switch_mutex_unlock(frame->codec->mutex); - + switch_mutex_unlock(session->codec_write_mutex); + 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 Thu Nov 20 19:09:11 2008 @@ -747,6 +747,7 @@ switch_channel_t *channel = switch_core_session_get_channel(session); switch_size_t has; + switch_core_session_set_read_codec(session, NULL); /* clear resamplers */ @@ -1102,6 +1103,8 @@ switch_mutex_init(&session->mutex, SWITCH_MUTEX_NESTED, session->pool); switch_mutex_init(&session->resample_mutex, SWITCH_MUTEX_NESTED, session->pool); + switch_mutex_init(&session->codec_read_mutex, SWITCH_MUTEX_NESTED, session->pool); + switch_mutex_init(&session->codec_write_mutex, SWITCH_MUTEX_NESTED, session->pool); switch_thread_rwlock_create(&session->bug_rwlock, session->pool); switch_thread_cond_create(&session->cond, session->pool); switch_thread_rwlock_create(&session->rwlock, session->pool); 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 Thu Nov 20 19:09:11 2008 @@ -165,7 +165,7 @@ } if (switch_channel_get_state(session->channel) == CS_EXECUTE) { - switch_channel_hangup(session->channel, SWITCH_CAUSE_NORMAL_CLEARING); + switch_channel_hangup(session->channel, SWITCH_CAUSE_NORMAL_CLEARING); } } @@ -185,7 +185,6 @@ { switch_assert(session != NULL); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s Standard PARK\n", switch_channel_get_name(session->channel)); - switch_channel_clear_flag(session->channel, CF_TRANSFER); switch_core_session_reset(session, SWITCH_TRUE); switch_ivr_park(session, NULL); } @@ -373,6 +372,7 @@ int do_extra_handlers = 1; switch_channel_set_running_state(session->channel, state); + switch_channel_clear_flag(session->channel, CF_TRANSFER); switch (state) { case CS_NEW: /* Just created, Waiting for first instructions */ Modified: freeswitch/trunk/src/switch_ivr_bridge.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_bridge.c (original) +++ freeswitch/trunk/src/switch_ivr_bridge.c Thu Nov 20 19:09:11 2008 @@ -140,7 +140,8 @@ switch_channel_wait_for_flag(chan_b, CF_BRIDGED, SWITCH_TRUE, 10000, chan_a); if (!switch_channel_test_flag(chan_b, CF_BRIDGED)) { - if (!(switch_channel_test_flag(chan_b, CF_TRANSFER) || switch_channel_get_state(chan_b) == CS_RESET)) { + if (!(switch_channel_test_flag(chan_b, CF_TRANSFER) || switch_channel_test_flag(chan_b, CF_REDIRECT) + || switch_channel_get_state(chan_b) == CS_RESET)) { switch_channel_hangup(chan_b, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER); } goto end_of_bridge_loop; @@ -208,11 +209,11 @@ goto end_of_bridge_loop; } - if (switch_channel_test_flag(chan_a, CF_TRANSFER)) { + if (switch_channel_test_flag(chan_a, CF_TRANSFER) || switch_channel_test_flag(chan_a, CF_REDIRECT)) { data->clean_exit = 1; } - if (data->clean_exit || switch_channel_test_flag(chan_b, CF_TRANSFER)) { + if (data->clean_exit || switch_channel_test_flag(chan_b, CF_TRANSFER) || switch_channel_test_flag(chan_b, CF_REDIRECT)) { switch_channel_clear_flag(chan_a, CF_HOLD); switch_channel_clear_flag(chan_a, CF_SUSPEND); goto end_of_bridge_loop; @@ -352,8 +353,6 @@ if (switch_core_session_write_frame(session_b, read_frame, SWITCH_IO_FLAG_NONE, stream_id) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s ending bridge by request from write function\n", switch_channel_get_name(chan_b)); - - goto end_of_bridge_loop; } } @@ -467,7 +466,7 @@ switch_ivr_park_session(session); } - if (!switch_channel_test_flag(channel, CF_TRANSFER) && bd && !bd->clean_exit && state != CS_PARK && + if (!switch_channel_test_flag(channel, CF_TRANSFER) && !switch_channel_test_flag(channel, CF_REDIRECT) && bd && !bd->clean_exit && state != CS_PARK && state != CS_ROUTING && !switch_channel_test_flag(channel, CF_INNER_BRIDGE)) { switch_channel_hangup(channel, SWITCH_CAUSE_NORMAL_CLEARING); } @@ -485,6 +484,9 @@ } } + if (switch_channel_get_state(channel) < CS_HANGUP) { + switch_channel_set_state(channel, CS_RESET); + } return SWITCH_STATUS_FALSE; } @@ -526,33 +528,38 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s CUSTOM RESET\n", switch_channel_get_name(channel)); - switch_channel_clear_flag(channel, CF_TRANSFER); + switch_channel_clear_flag(channel, CF_REDIRECT); + switch_channel_clear_flag(channel, CF_ORIGINATING); - if (switch_channel_test_flag(channel, (uint32_t)CF_MASTER)) { + if (switch_channel_test_flag(channel, CF_ORIGINATOR)) { switch_channel_set_state(channel, CS_SOFT_EXECUTE); } return SWITCH_STATUS_SUCCESS; } +static switch_status_t uuid_bridge_on_hibernate(switch_core_session_t *session) +{ + switch_channel_set_state(switch_core_session_get_channel(session), CS_RESET); + return SWITCH_STATUS_FALSE; +} + static switch_status_t uuid_bridge_on_soft_execute(switch_core_session_t *session) { switch_channel_t *channel = switch_core_session_get_channel(session); switch_core_session_t *other_session; const char *other_uuid = NULL; - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s CUSTOM TRANSMIT\n", switch_channel_get_name(channel)); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s CUSTOM SOFT_EXECUTE\n", switch_channel_get_name(channel)); switch_channel_clear_state_handler(channel, NULL); - switch_channel_clear_flag(channel, CF_TRANSFER); - - if (!switch_channel_test_flag(channel, (uint32_t)CF_MASTER)) { + if (!switch_channel_test_flag(channel, CF_ORIGINATOR)) { return SWITCH_STATUS_SUCCESS; } - switch_channel_clear_flag(channel, (uint32_t)CF_MASTER); - + switch_channel_clear_flag(channel, CF_ORIGINATOR); + if ((other_uuid = switch_channel_get_variable(channel, SWITCH_UUID_BRIDGE)) && (other_session = switch_core_session_locate(other_uuid))) { switch_channel_t *other_channel = switch_core_session_get_channel(other_session); switch_event_t *event; @@ -575,8 +582,6 @@ switch_channel_wait_for_state(channel, other_channel, CS_SOFT_EXECUTE); - switch_channel_clear_flag(channel, CF_TRANSFER); - switch_channel_clear_flag(other_channel, CF_TRANSFER); switch_core_session_reset(session, SWITCH_TRUE); @@ -618,7 +623,7 @@ switch_ivr_multi_threaded_bridge(session, other_session, NULL, NULL, NULL); state = switch_channel_get_state(channel); - if (!switch_channel_test_flag(channel, CF_TRANSFER) && state < CS_HANGUP && state != CS_ROUTING && state != CS_PARK) { + if (!switch_channel_test_flag(channel, CF_TRANSFER) && !switch_channel_test_flag(channel, CF_REDIRECT) && state < CS_HANGUP && state != CS_ROUTING && state != CS_PARK) { switch_channel_set_state(channel, CS_EXECUTE); } switch_core_session_rwunlock(other_session); @@ -638,8 +643,8 @@ /*.on_hangup */ NULL, /*.on_exchange_media */ NULL, /*.on_soft_execute */ uuid_bridge_on_soft_execute, - /*.on_consume_media */ NULL, - /*.on_hibernate */ NULL, + /*.on_consume_media */ uuid_bridge_on_hibernate, + /*.on_hibernate */ uuid_bridge_on_hibernate, /*.on_reset */ uuid_bridge_on_reset }; @@ -649,7 +654,6 @@ channel = switch_core_session_get_channel(session); switch_assert(channel != NULL); - switch_channel_clear_flag(channel, CF_TRANSFER); switch_channel_set_variable(channel, SWITCH_BRIDGE_VARIABLE, switch_channel_get_variable(channel, SWITCH_SIGNAL_BRIDGE_VARIABLE)); @@ -785,8 +789,6 @@ int inner_bridge = switch_channel_test_flag(caller_channel, CF_INNER_BRIDGE); switch_channel_set_flag(caller_channel, CF_ORIGINATOR); - switch_channel_clear_flag(caller_channel, CF_TRANSFER); - switch_channel_clear_flag(peer_channel, CF_TRANSFER); b_leg->session = peer_session; switch_copy_string(b_leg->b_uuid, switch_core_session_get_uuid(session), sizeof(b_leg->b_uuid)); @@ -830,7 +832,8 @@ if ((status = switch_ivr_wait_for_answer(session, peer_session)) != SWITCH_STATUS_SUCCESS) { switch_channel_state_t w_state = switch_channel_get_state(caller_channel); switch_channel_hangup(peer_channel, SWITCH_CAUSE_ALLOTTED_TIMEOUT); - if (w_state < CS_HANGUP && w_state != CS_ROUTING && w_state != CS_PARK && !switch_channel_test_flag(caller_channel, CF_TRANSFER) && + if (w_state < CS_HANGUP && w_state != CS_ROUTING && w_state != CS_PARK && + !switch_channel_test_flag(caller_channel, CF_REDIRECT) && !switch_channel_test_flag(caller_channel, CF_TRANSFER) && w_state != CS_EXECUTE) { const char *ext = switch_channel_get_variable(peer_channel, "original_destination_number"); if (!ext) { @@ -911,10 +914,6 @@ switch_channel_clear_flag(caller_channel, CF_ORIGINATOR); - if (!switch_channel_test_flag(peer_channel, CF_TRANSFER) && switch_channel_get_state(peer_channel) == CS_EXCHANGE_MEDIA) { - switch_channel_set_state(peer_channel, CS_RESET); - } - while (switch_channel_get_state(peer_channel) == CS_EXCHANGE_MEDIA) { switch_cond_next(); } @@ -943,8 +942,9 @@ } state = switch_channel_get_state(caller_channel); - - if (!switch_channel_test_flag(caller_channel, CF_TRANSFER) && !a_leg->clean_exit && !inner_bridge) { + + if (!switch_channel_test_flag(caller_channel, CF_TRANSFER) && !switch_channel_test_flag(caller_channel, CF_REDIRECT) + && !a_leg->clean_exit && !inner_bridge) { if ((state != CS_EXECUTE && state != CS_SOFT_EXECUTE && state != CS_PARK && state != CS_ROUTING) || (switch_channel_test_flag(peer_channel, CF_ANSWERED) && state < CS_HANGUP)) { if (switch_true(switch_channel_get_variable(caller_channel, SWITCH_HANGUP_AFTER_BRIDGE_VARIABLE))) { @@ -955,6 +955,11 @@ } } + if (switch_channel_test_flag(caller_channel, CF_REDIRECT)) { + switch_channel_set_state(caller_channel, CS_RESET); + } + + return status; } @@ -992,6 +997,7 @@ switch_status_t status = SWITCH_STATUS_FALSE; switch_caller_profile_t *cp, *originator_cp, *originatee_cp; char *p; + switch_channel_state_t state; if ((originator_session = switch_core_session_locate(originator_uuid))) { if ((originatee_session = switch_core_session_locate(originatee_uuid))) { @@ -1033,14 +1039,11 @@ * originatee_session will fall asleep and originator_session will bridge to it */ - switch_channel_clear_state_handler(originator_channel, NULL); - switch_channel_clear_state_handler(originatee_channel, NULL); - switch_channel_set_flag(originator_channel, (uint32_t)CF_MASTER); - switch_channel_clear_flag(originatee_channel, (uint32_t)CF_MASTER); - switch_channel_add_state_handler(originator_channel, &uuid_bridge_state_handlers); - switch_channel_add_state_handler(originatee_channel, &uuid_bridge_state_handlers); - switch_channel_set_variable(originator_channel, SWITCH_UUID_BRIDGE, switch_core_session_get_uuid(originatee_session)); + switch_channel_set_flag(originator_channel, CF_REDIRECT); + switch_channel_set_flag(originatee_channel, CF_REDIRECT); + + switch_channel_set_variable(originator_channel, SWITCH_UUID_BRIDGE, switch_core_session_get_uuid(originatee_session)); switch_channel_set_variable(originator_channel, SWITCH_BRIDGE_CHANNEL_VARIABLE, switch_channel_get_name(originatee_channel)); switch_channel_set_variable(originator_channel, SWITCH_BRIDGE_UUID_VARIABLE, switch_core_session_get_uuid(originatee_session)); switch_channel_set_variable(originator_channel, SWITCH_SIGNAL_BOND_VARIABLE, switch_core_session_get_uuid(originatee_session)); @@ -1089,13 +1092,23 @@ switch_channel_set_flag(originator_channel, CF_TRANSFER); switch_channel_set_flag(originatee_channel, CF_TRANSFER); + switch_channel_clear_flag(originator_channel, CF_ORIGINATING); switch_channel_clear_flag(originatee_channel, CF_ORIGINATING); /* change the states and let the chips fall where they may */ - switch_channel_set_state(originator_channel, CS_RESET); - switch_channel_set_state(originatee_channel, CS_RESET); + switch_channel_clear_state_handler(originator_channel, NULL); + switch_channel_clear_state_handler(originatee_channel, NULL); + switch_channel_set_state_flag(originator_channel, CF_ORIGINATOR); + switch_channel_clear_flag(originatee_channel, CF_ORIGINATOR); + switch_channel_add_state_handler(originator_channel, &uuid_bridge_state_handlers); + switch_channel_add_state_handler(originatee_channel, &uuid_bridge_state_handlers); + state = switch_channel_get_state(originator_channel); + switch_channel_set_state(originator_channel, state == CS_HIBERNATE ? CS_CONSUME_MEDIA : CS_HIBERNATE); + state = switch_channel_get_state(originatee_channel); + switch_channel_set_state(originatee_channel, state == CS_HIBERNATE ? CS_CONSUME_MEDIA : CS_HIBERNATE); + status = SWITCH_STATUS_SUCCESS; /* release the read locks we have on the channels */ Modified: freeswitch/trunk/src/switch_ivr_originate.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_originate.c (original) +++ freeswitch/trunk/src/switch_ivr_originate.c Thu Nov 20 19:09:11 2008 @@ -231,7 +231,9 @@ state = switch_channel_get_state(peer_channels[i]); if (state >= CS_HANGUP || state == CS_RESET || switch_channel_test_flag(peer_channels[i], CF_TRANSFER) || - switch_channel_test_flag(peer_channels[i], CF_BRIDGED) || !switch_channel_test_flag(peer_channels[i], CF_ORIGINATING) + switch_channel_test_flag(peer_channels[i], CF_REDIRECT) || + switch_channel_test_flag(peer_channels[i], CF_BRIDGED) || + !switch_channel_test_flag(peer_channels[i], CF_ORIGINATING) ) { (*hups)++; } else if ((switch_channel_test_flag(peer_channels[i], CF_ANSWERED) || @@ -1453,8 +1455,11 @@ continue; } - if (switch_channel_test_flag(peer_channels[i], CF_TRANSFER) || switch_channel_test_flag(peer_channels[i], CF_BRIDGED) || - switch_channel_get_state(peer_channels[i]) == CS_RESET || !switch_channel_test_flag(peer_channels[i], CF_ORIGINATING) + if (switch_channel_test_flag(peer_channels[i], CF_TRANSFER) + || switch_channel_test_flag(peer_channels[i], CF_REDIRECT) + || switch_channel_test_flag(peer_channels[i], CF_BRIDGED) || + switch_channel_get_state(peer_channels[i]) == CS_RESET || + !switch_channel_test_flag(peer_channels[i], CF_ORIGINATING) ) { continue; } @@ -1652,6 +1657,7 @@ } } else if ((state=switch_channel_get_state(peer_channels[i])) < CS_HANGUP && switch_channel_test_flag(peer_channels[i], CF_ORIGINATING)) { if (!(state == CS_RESET || switch_channel_test_flag(peer_channels[i], CF_TRANSFER) || + switch_channel_test_flag(peer_channels[i], CF_REDIRECT) || switch_channel_test_flag(peer_channels[i], CF_BRIDGED))) { switch_channel_hangup(peer_channels[i], *cause); }

1 0

[commit] r10486 - freeswitch/trunk/src/include
by FreeSWITCH SVN 20 Nov '08

20 Nov '08

Author: mikej Date: Thu Nov 20 18:42:39 2008 New Revision: 10486 Log: FSCORE-213 add support for "F" for flash in dtmf Modified: freeswitch/trunk/src/include/switch_utils.h Modified: freeswitch/trunk/src/include/switch_utils.h ============================================================================== --- freeswitch/trunk/src/include/switch_utils.h (original) +++ freeswitch/trunk/src/include/switch_utils.h Thu Nov 20 18:42:39 2008 @@ -211,7 +211,7 @@ \param key the key to test \return TRUE or FALSE */ -#define is_dtmf(key) ((key > 47 && key < 58) || (key > 64 && key < 69) || (key > 96 && key < 101) || key == 35 || key == 42 || key == 87 || key == 119) +#define is_dtmf(key) ((key > 47 && key < 58) || (key > 64 && key < 69) || (key > 96 && key < 101) || key == 35 || key == 42 || key == 87 || key == 119 || key == 70) #define end_of(_s) *(*_s == '\0' ? _s : _s + strlen(_s) - 1) #define end_of_p(_s) (*_s == '\0' ? _s : _s + strlen(_s) - 1)

1 0