- Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r4111 - in freeswitch/trunk/src: . include
by Freeswitch SVN 03 Feb '07

03 Feb '07

Author: mikej Date: Fri Feb 2 23:09:43 2007 New Revision: 4111 Modified: freeswitch/trunk/src/include/switch_ivr.h freeswitch/trunk/src/switch_ivr.c Log: Initial structure for generic inband dtmf detection. NOTE: This code does not currently remove the inband dtmf tones from the stream (as that is not supported using read media bugs) and it is also COMPLETELY untested and unused anywhere. This code is there for somone who wants to implement this feature in mod_sofia to test. Modified: freeswitch/trunk/src/include/switch_ivr.h ============================================================================== --- freeswitch/trunk/src/include/switch_ivr.h (original) +++ freeswitch/trunk/src/include/switch_ivr.h Fri Feb 2 23:09:43 2007 @@ -174,6 +174,9 @@ */ SWITCH_DECLARE(switch_status_t) switch_ivr_stop_record_session(switch_core_session_t *session, char *file); +SWITCH_DECLARE(switch_status_t) switch_ivr_inband_dtmf_session(switch_core_session_t *session); +SWITCH_DECLARE(switch_status_t) switch_ivr_stop_inband_dtmf_session(switch_core_session_t *session); + /*! \brief play a file from the disk to the session \param session the session to play the file too Modified: freeswitch/trunk/src/switch_ivr.c ============================================================================== --- freeswitch/trunk/src/switch_ivr.c (original) +++ freeswitch/trunk/src/switch_ivr.c Fri Feb 2 23:09:43 2007 @@ -27,6 +27,7 @@ * Paul D. Tinsley <pdt at jackhammer.org> * Neal Horman <neal at wanlink dot com> * Matt Klein <mklein(a)nmedia.net> + * Michael Jerris <mike(a)jerris.com> * * switch_ivr.c -- IVR Library * @@ -675,6 +676,96 @@ return SWITCH_STATUS_SUCCESS; } +typedef struct { + switch_core_session_t *session; + teletone_dtmf_detect_state_t dtmf_detect; +} switch_inband_dtmf_t; + +static void inband_dtmf_callback(switch_media_bug_t *bug, void *user_data, switch_abc_type_t type) +{ + switch_inband_dtmf_t *pvt = (switch_inband_dtmf_t *) user_data; + uint8_t data[SWITCH_RECCOMMENDED_BUFFER_SIZE]; + switch_frame_t frame = {0}; + char digit_str[80]; + switch_channel_t *channel = switch_core_session_get_channel(pvt->session); + + assert(channel != NULL); + frame.data = data; + frame.buflen = SWITCH_RECCOMMENDED_BUFFER_SIZE; + + switch(type) { + case SWITCH_ABC_TYPE_INIT: + break; + case SWITCH_ABC_TYPE_CLOSE: + break; + case SWITCH_ABC_TYPE_READ: + if (switch_core_media_bug_read(bug, &frame) == SWITCH_STATUS_SUCCESS) { + teletone_dtmf_detect(&pvt->dtmf_detect, frame.data, frame.samples); + teletone_dtmf_get(&pvt->dtmf_detect, digit_str, sizeof(digit_str)); + if(digit_str[0]) { + switch_channel_queue_dtmf(channel, digit_str); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "DTMF DETECTED: [%s]\n", digit_str); + } + } + break; + case SWITCH_ABC_TYPE_WRITE: + default: + break; + } +} + +SWITCH_DECLARE(switch_status_t) switch_ivr_stop_inband_dtmf_session(switch_core_session_t *session) +{ + switch_media_bug_t *bug; + switch_channel_t *channel = switch_core_session_get_channel(session); + + assert(channel != NULL); + if ((bug = switch_channel_get_private(channel, "dtmf"))) { + switch_channel_set_private(channel, "dtmf", NULL); + switch_core_media_bug_remove(session, &bug); + return SWITCH_STATUS_SUCCESS; + } + + return SWITCH_STATUS_FALSE; + +} + +SWITCH_DECLARE(switch_status_t) switch_ivr_inband_dtmf_session(switch_core_session_t *session) +{ + switch_channel_t *channel; + switch_codec_t *read_codec; + switch_media_bug_t *bug; + switch_status_t status; + switch_inband_dtmf_t *pvt; + + channel = switch_core_session_get_channel(session); + assert(channel != NULL); + + read_codec = switch_core_session_get_read_codec(session); + assert(read_codec != NULL); + + if (!(pvt = switch_core_session_alloc(session, sizeof(*pvt)))) { + return SWITCH_STATUS_MEMERR; + } + + teletone_dtmf_detect_init(&pvt->dtmf_detect, read_codec->implementation->samples_per_second); + + pvt->session = session; + + switch_channel_answer(channel); + + if ((status = switch_core_media_bug_add(session, + inband_dtmf_callback, + pvt, + SMBF_READ_STREAM, + &bug)) != SWITCH_STATUS_SUCCESS) { + return status; + } + + switch_channel_set_private(channel, "dtmf", bug); + + return SWITCH_STATUS_SUCCESS; +} struct speech_thread_handle { switch_core_session_t *session;

1 0

[commit] r4110 - freeswitch/trunk/src/include
by Freeswitch SVN 03 Feb '07

03 Feb '07

Author: mikej Date: Fri Feb 2 23:08:05 2007 New Revision: 4110 Modified: freeswitch/trunk/src/include/switch_utils.h Log: tweak macro for clean build on msvc. Modified: freeswitch/trunk/src/include/switch_utils.h ============================================================================== --- freeswitch/trunk/src/include/switch_utils.h (original) +++ freeswitch/trunk/src/include/switch_utils.h Fri Feb 2 23:08:05 2007 @@ -50,7 +50,7 @@ #define vsnprintf apr_vsnprintf #endif -#define switch_bytes_per_frame(rate, interval) (uint32_t)((float)rate / (1000.0f / (float)interval)); +#define switch_bytes_per_frame(rate, interval) ((uint32_t)((float)rate / (1000.0f / (float)interval))) #define SWITCH_SMAX 32767 #define SWITCH_SMIN -32768

1 0

[commit] r4109 - freeswitch/trunk/src
by Freeswitch SVN 02 Feb '07

02 Feb '07

Author: anthm Date: Fri Feb 2 16:01:13 2007 New Revision: 4109 Modified: freeswitch/trunk/src/switch_core.c freeswitch/trunk/src/switch_ivr.c Log: bug in the bugs Modified: freeswitch/trunk/src/switch_core.c ============================================================================== --- freeswitch/trunk/src/switch_core.c (original) +++ freeswitch/trunk/src/switch_core.c Fri Feb 2 16:01:13 2007 @@ -67,6 +67,7 @@ switch_core_session_t *session; void *user_data; uint32_t flags; + uint8_t ready; struct switch_media_bug *next; }; @@ -313,6 +314,7 @@ bug->user_data = user_data; bug->session = session; bug->flags = flags; + bug->ready = 1; switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Attaching BUG to %s\n", switch_channel_get_name(session->channel)); bytes = session->read_codec->implementation->bytes_per_frame; @@ -374,6 +376,9 @@ if (session->bugs) { switch_thread_rwlock_wrlock(session->bug_rwlock); for (bp = session->bugs; bp; bp = bp->next) { + if (!bp->ready) { + continue; + } if (bp == *bug) { if (last) { last->next = bp->next; @@ -389,6 +394,7 @@ if (bp) { if (bp->callback) { bp->callback(bp, bp->user_data, SWITCH_ABC_TYPE_CLOSE); + bp->ready = 0; } switch_core_media_bug_destroy(bp); *bug = NULL; @@ -2012,7 +2018,7 @@ switch_media_bug_t *bp; switch_thread_rwlock_rdlock(session->bug_rwlock); for (bp = session->bugs; bp; bp = bp->next) { - if (switch_test_flag(bp, SMBF_READ_STREAM)) { + if (bp->ready && switch_test_flag(bp, SMBF_READ_STREAM)) { switch_mutex_lock(bp->read_mutex); switch_buffer_write(bp->raw_read_buffer, read_frame->data, read_frame->datalen); if (bp->callback) { @@ -2249,6 +2255,9 @@ switch_media_bug_t *bp; switch_thread_rwlock_rdlock(session->bug_rwlock); for (bp = session->bugs; bp; bp = bp->next) { + if (!bp->ready) { + continue; + } if (switch_test_flag(bp, SMBF_WRITE_STREAM)) { switch_mutex_lock(bp->write_mutex); switch_buffer_write(bp->raw_write_buffer, write_frame->data, write_frame->datalen); Modified: freeswitch/trunk/src/switch_ivr.c ============================================================================== --- freeswitch/trunk/src/switch_ivr.c (original) +++ freeswitch/trunk/src/switch_ivr.c Fri Feb 2 16:01:13 2007 @@ -551,7 +551,10 @@ case SWITCH_ABC_TYPE_INIT: break; case SWITCH_ABC_TYPE_CLOSE: - switch_core_file_close(fh); + if (fh) { + switch_core_file_close(fh); + } + break; case SWITCH_ABC_TYPE_READ: if (fh) { switch_size_t len; @@ -767,11 +770,13 @@ } break; - case SWITCH_ABC_TYPE_CLOSE: + case SWITCH_ABC_TYPE_CLOSE: { switch_core_asr_close(sth->ah, &flags); switch_mutex_lock(sth->mutex); switch_thread_cond_signal(sth->cond); switch_mutex_unlock(sth->mutex); + } + break; case SWITCH_ABC_TYPE_READ: if (sth->ah) { if (switch_core_media_bug_read(bug, &frame) == SWITCH_STATUS_SUCCESS) {

1 0

[commit] r4108 - in freeswitch/trunk/src: include mod/applications/mod_conference
by Freeswitch SVN 02 Feb '07

02 Feb '07

Author: anthm Date: Fri Feb 2 15:28:34 2007 New Revision: 4108 Modified: freeswitch/trunk/src/include/switch_utils.h freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Log: fix sample calc Modified: freeswitch/trunk/src/include/switch_utils.h ============================================================================== --- freeswitch/trunk/src/include/switch_utils.h (original) +++ freeswitch/trunk/src/include/switch_utils.h Fri Feb 2 15:28:34 2007 @@ -50,6 +50,7 @@ #define vsnprintf apr_vsnprintf #endif +#define switch_bytes_per_frame(rate, interval) (uint32_t)((float)rate / (1000.0f / (float)interval)); #define SWITCH_SMAX 32767 #define SWITCH_SMIN -32768 Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c (original) +++ freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Fri Feb 2 15:28:34 2007 @@ -634,8 +634,7 @@ { conference_obj_t *conference = (conference_obj_t *) obj; conference_member_t *imember, *omember; - uint32_t divider = 1000 / conference->interval; - uint32_t samples = (conference->rate / divider); + uint32_t samples = switch_bytes_per_frame(conference->rate, conference->interval); uint32_t bytes = samples * 2; uint8_t ready = 0; switch_timer_t timer = {0}; @@ -1419,8 +1418,7 @@ switch_frame_t write_frame = {0}; uint8_t data[SWITCH_RECCOMMENDED_BUFFER_SIZE]; switch_timer_t timer = {0}; - uint32_t divider = 1000 / member->conference->interval; - uint32_t samples = (member->conference->rate / divider); + uint32_t samples = switch_bytes_per_frame(member->conference->rate, member->conference->interval); uint32_t bytes = samples * 2; channel = switch_core_session_get_channel(member->session); @@ -1666,8 +1664,7 @@ switch_file_handle_t fh = {0}; conference_member_t smember = {0}, *member; conference_record_t *rec = (conference_record_t *) obj; - uint32_t divider = 1000 / rec->conference->interval; - uint32_t samples = (rec->conference->rate / divider); + uint32_t samples = switch_bytes_per_frame(rec->conference->rate, rec->conference->interval); uint32_t bytes = samples * 2; uint32_t mux_used; char *vval;

1 0

[commit] r4107 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 02 Feb '07

02 Feb '07

Author: anthm Date: Thu Feb 1 19:42:20 2007 New Revision: 4107 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Log: 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 Thu Feb 1 19:42:20 2007 @@ -4143,7 +4143,12 @@ char *from_port; char uri[1024]; - + + if (!(sip && sip->sip_contact && sip->sip_contact->m_url)) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "NO CONTACT!\n"); + return; + } + if ((profile->pflags & PFLAG_AUTH_CALLS)) { if (handle_register(nua, profile, nh, sip, REG_INVITE, key, sizeof(key))) { return;

1 0

[commit] r4106 - in freeswitch/trunk/src: . mod/endpoints/mod_dingaling
by Freeswitch SVN 01 Feb '07

01 Feb '07

Author: anthm Date: Thu Feb 1 00:23:29 2007 New Revision: 4106 Modified: freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c freeswitch/trunk/src/switch_rtp.c Log: minor adj Modified: freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c Thu Feb 1 00:23:29 2007 @@ -757,7 +757,7 @@ tech_pvt->remote_ip, tech_pvt->remote_port, tech_pvt->codec_num, - 0, + tech_pvt->read_codec.implementation->encoded_bytes_per_frame, tech_pvt->read_codec.implementation->microseconds_per_frame, flags, NULL, @@ -1527,6 +1527,7 @@ switch_copy_string(workspace, outbound_profile->destination_number, sizeof(workspace)); profile_name = workspace; + if ((callto = strchr(profile_name, '/'))) { *callto++ = '\0'; } else { @@ -1539,6 +1540,9 @@ *dnis++ = '\0'; } + for (p = callto; p && *p; p++) { + *p = (char) tolower(*p); + } if ((p = strchr(profile_name, '@'))) { *p++ = '\0'; @@ -1623,9 +1627,9 @@ ldl_session_create(&dlsession, mdl_profile->handle, sess_id, full_id, user, LDL_FLAG_OUTBOUND); tech_pvt->profile = mdl_profile; ldl_session_set_private(dlsession, *new_session); - //ldl_session_set_value(dlsession, "dnis", dnis); - //ldl_session_set_value(dlsession, "caller_id_name", outbound_profile->caller_id_name); - //ldl_session_set_value(dlsession, "caller_id_number", outbound_profile->caller_id_number); + ldl_session_set_value(dlsession, "dnis", dnis); + ldl_session_set_value(dlsession, "caller_id_name", outbound_profile->caller_id_name); + ldl_session_set_value(dlsession, "caller_id_number", outbound_profile->caller_id_number); tech_pvt->dlsession = dlsession; if (!get_codecs(tech_pvt)) { terminate_session(new_session, __LINE__, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER); Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Thu Feb 1 00:23:29 2007 @@ -758,9 +758,10 @@ bytes = sbytes; } - if (bytes > 0) { + if (bytes > 0 && rtp_session->recv_msg.header.version == 2) { uint32_t effective_size = (uint32_t)(bytes - rtp_header_len); - if (rtp_session->recv_msg.header.pt == rtp_session->payload && effective_size != rtp_session->packet_size) { + if (effective_size && rtp_session->packet_size && rtp_session->recv_msg.header.pt == rtp_session->payload && + effective_size != rtp_session->packet_size) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Configured packet size %u != inbound packet size %u: auto-correcting..\n", rtp_session->packet_size, effective_size

1 0

[commit] r4105 - in freeswitch/trunk/src: . include mod/applications/mod_ivrtest
by Freeswitch SVN 31 Jan '07

31 Jan '07

Author: anthm Date: Wed Jan 31 18:09:33 2007 New Revision: 4105 Modified: freeswitch/trunk/src/include/switch_core.h freeswitch/trunk/src/include/switch_types.h freeswitch/trunk/src/mod/applications/mod_ivrtest/mod_ivrtest.c freeswitch/trunk/src/switch_core.c freeswitch/trunk/src/switch_ivr.c Log: core framework for reverse media bugs Modified: freeswitch/trunk/src/include/switch_core.h ============================================================================== --- freeswitch/trunk/src/include/switch_core.h (original) +++ freeswitch/trunk/src/include/switch_core.h Wed Jan 31 18:09:33 2007 @@ -137,6 +137,19 @@ SWITCH_DECLARE(void *) switch_core_media_bug_get_user_data(switch_media_bug_t *bug); /*! + \brief Obtain a replace frame from a media bug + \param bug the bug to get the data from +*/ +SWITCH_DECLARE(switch_frame_t *) switch_core_media_bug_get_replace_frame(switch_media_bug_t *bug); + +/*! + \brief Set a return replace frame + \param bug the bug to set the frame on + \param frame the frame to set +*/ +SWITCH_DECLARE(void) switch_core_media_bug_set_replace_frame(switch_media_bug_t *bug, switch_frame_t *frame); + +/*! \brief Remove a media bug from the session \param session the session to remove the bug from \param bug bug to remove 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 31 18:09:33 2007 @@ -140,6 +140,7 @@ SWITCH_ABC_TYPE_INIT, SWITCH_ABC_TYPE_READ, SWITCH_ABC_TYPE_WRITE, + SWITCH_ABC_TYPE_WRITE_REPLACE, SWITCH_ABC_TYPE_CLOSE, } switch_abc_type_t; @@ -654,12 +655,14 @@ <pre> SMBF_READ_STREAM - Include the Read Stream SMBF_WRITE_STREAM - Include the Write Stream +SMBF_WRITE_STREAM - Replace the Write Stream </pre> */ typedef enum { SMBF_BOTH = 0, SMBF_READ_STREAM = (1 << 0), - SMBF_WRITE_STREAM = (1 << 1) + SMBF_WRITE_STREAM = (1 << 1), + SMBF_WRITE_REPLACE = (1 << 2) } switch_media_bug_flag_t; /*! Modified: freeswitch/trunk/src/mod/applications/mod_ivrtest/mod_ivrtest.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_ivrtest/mod_ivrtest.c (original) +++ freeswitch/trunk/src/mod/applications/mod_ivrtest/mod_ivrtest.c Wed Jan 31 18:09:33 2007 @@ -231,6 +231,39 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Done\n"); } +static void bug_callback(switch_media_bug_t *bug, void *user_data, switch_abc_type_t type) +{ + switch_frame_t *frame; + + switch(type) { + case SWITCH_ABC_TYPE_WRITE_REPLACE: + frame = switch_core_media_bug_get_replace_frame(bug); + switch_core_media_bug_set_replace_frame(bug, frame); + printf("W00t\n"); + break; + default: + break; + } + +} + +static void bugtest_function(switch_core_session_t *session, char *data) +{ + switch_media_bug_t *bug; + switch_channel_t *channel = switch_core_session_get_channel(session); + switch_status_t status; + + if ((status = switch_core_media_bug_add(session, + bug_callback, + NULL, + SMBF_WRITE_REPLACE, + &bug)) != SWITCH_STATUS_SUCCESS) { + switch_channel_hangup(channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER); + return; + } + switch_ivr_play_file(session, NULL, data, NULL); +} + #if 1 static void asrtest_function(switch_core_session_t *session, char *data) { @@ -423,11 +456,18 @@ +static const switch_application_interface_t bug_application_interface = { + /*.interface_name */ "bugtest", + /*.application_function */ bugtest_function, + NULL, NULL, NULL, + /*.next*/ NULL +}; + static const switch_application_interface_t ivr_application_interface = { /*.interface_name */ "ivrmenu", /*.application_function */ ivr_application_function, NULL, NULL, NULL, - /*.next*/ NULL + /*.next*/ &bug_application_interface }; static const switch_application_interface_t xml_application_interface = { Modified: freeswitch/trunk/src/switch_core.c ============================================================================== --- freeswitch/trunk/src/switch_core.c (original) +++ freeswitch/trunk/src/switch_core.c Wed Jan 31 18:09:33 2007 @@ -59,6 +59,8 @@ struct switch_media_bug { switch_buffer_t *raw_write_buffer; switch_buffer_t *raw_read_buffer; + switch_frame_t *replace_frame_in; + switch_frame_t *replace_frame_out; switch_media_bug_callback_t callback; switch_mutex_t *read_mutex; switch_mutex_t *write_mutex; @@ -176,6 +178,17 @@ switch_buffer_destroy(&bug->raw_write_buffer); } + +SWITCH_DECLARE(switch_frame_t *) switch_core_media_bug_get_replace_frame(switch_media_bug_t *bug) +{ + return bug->replace_frame_in; +} + +SWITCH_DECLARE(void) switch_core_media_bug_set_replace_frame(switch_media_bug_t *bug, switch_frame_t *frame) +{ + bug->replace_frame_out = frame; +} + SWITCH_DECLARE(void *) switch_core_media_bug_get_user_data(switch_media_bug_t *bug) { return bug->user_data; @@ -277,9 +290,21 @@ switch_media_bug_t **new_bug) { - switch_media_bug_t *bug; + switch_media_bug_t *bug, *bp; switch_size_t bytes; + if (flags & SMBF_WRITE_REPLACE) { + switch_thread_rwlock_wrlock(session->bug_rwlock); + for (bp = session->bugs; bp; bp = bp->next) { + if (switch_test_flag(bp, SMBF_WRITE_REPLACE)) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Only one bug of this type allowed!\n"); + switch_thread_rwlock_unlock(session->bug_rwlock); + return SWITCH_STATUS_GENERR; + } + } + switch_thread_rwlock_unlock(session->bug_rwlock); + } + if (!(bug = switch_core_session_alloc(session, sizeof(*bug)))) { return SWITCH_STATUS_MEMERR; } @@ -2087,6 +2112,7 @@ switch_status_t status = SWITCH_STATUS_FALSE; if (session->endpoint_interface->io_routines->write_frame) { + if ((status = session->endpoint_interface->io_routines->write_frame(session, frame, timeout, flags, stream_id)) == SWITCH_STATUS_SUCCESS) { @@ -2230,15 +2256,25 @@ if (bp->callback) { bp->callback(bp, bp->user_data, SWITCH_ABC_TYPE_WRITE); } + } else if (switch_test_flag(bp, SMBF_WRITE_REPLACE)) { + do_bugs = 0; + if (bp->callback) { + bp->replace_frame_in = frame; + bp->replace_frame_out = NULL; + bp->callback(bp, bp->user_data, SWITCH_ABC_TYPE_WRITE_REPLACE); + write_frame = bp->replace_frame_out; + } } } switch_thread_rwlock_unlock(session->bug_rwlock); } + if (do_bugs) { - do_write = 1; - write_frame = frame; - goto done; + do_write = 1; + write_frame = frame; + goto done; } + if (session->write_codec) { if (write_frame->datalen == session->write_codec->implementation->bytes_per_frame) { perfect = TRUE; Modified: freeswitch/trunk/src/switch_ivr.c ============================================================================== --- freeswitch/trunk/src/switch_ivr.c (original) +++ freeswitch/trunk/src/switch_ivr.c Wed Jan 31 18:09:33 2007 @@ -563,6 +563,7 @@ } break; case SWITCH_ABC_TYPE_WRITE: + default: break; } } @@ -787,6 +788,7 @@ } break; case SWITCH_ABC_TYPE_WRITE: + default: break; } }

1 0

[commit] r4104 - freeswitch/trunk/conf
by Freeswitch SVN 31 Jan '07

31 Jan '07

Author: anthm Date: Wed Jan 31 16:56:57 2007 New Revision: 4104 Modified: freeswitch/trunk/conf/directory.xml Log: update default conf Modified: freeswitch/trunk/conf/directory.xml ============================================================================== --- freeswitch/trunk/conf/directory.xml (original) +++ freeswitch/trunk/conf/directory.xml Wed Jan 31 16:56:57 2007 @@ -1,12 +1,15 @@  -<domain name="jabber.org"> +<domain name="$${domain}">  <user id="stpeter"> <params>  <param name="password" value="mypass"/> +  +  </params> - + +  <vcard xmlns='vcard-temp'> <FN>Peter Saint-Andre</FN> <N>

1 0

[commit] r4102 - freeswitch/trunk/src/mod/xml_int/mod_xml_curl
by Freeswitch SVN 31 Jan '07

31 Jan '07

Author: anthm Date: Wed Jan 31 14:22:44 2007 New Revision: 4102 Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c Log: doh Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c ============================================================================== --- freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c (original) +++ freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c Wed Jan 31 14:22:44 2007 @@ -184,7 +184,7 @@ url = val; } } else if (!strcasecmp(var, "gateway-credentials")) { - bind_cred = var; + bind_cred = val; } }

1 0

[commit] r4101 - freeswitch/trunk/src/mod/endpoints/mod_portaudio
by Freeswitch SVN 31 Jan '07

31 Jan '07

Author: anthm Date: Wed Jan 31 12:12:42 2007 New Revision: 4101 Modified: freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c Log: only 1 call can control the ring device Modified: freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c Wed Jan 31 12:12:42 2007 @@ -53,7 +53,8 @@ typedef enum { GFLAG_NONE = 0, GFLAG_EAR = (1 << 0), - GFLAG_MOUTH = (1 << 1) + GFLAG_MOUTH = (1 << 1), + GFLAG_RING = (1 << 2) } GFLAGS; typedef enum { @@ -105,6 +106,7 @@ switch_hash_t *call_hash; switch_mutex_t *device_lock; switch_mutex_t *pvt_lock; + switch_mutex_t *flag_mutex; int sample_rate; int codec_ms; PABLIO_Stream *audio_stream; @@ -215,6 +217,10 @@ ring_file = val; } + if (switch_test_flag((&globals), GFLAG_RING)) { + ring_file = NULL; + } + switch_set_flag_locked((&globals), GFLAG_RING); if (ring_file) { if (switch_core_file_open(&fh, ring_file, @@ -267,6 +273,7 @@ switch_yield(globals.read_codec.implementation->microseconds_per_frame); } + switch_clear_flag_locked((&globals), GFLAG_RING); } if (ring_file) { @@ -896,6 +903,7 @@ switch_core_hash_init(&globals.call_hash, module_pool); switch_mutex_init(&globals.device_lock, SWITCH_MUTEX_NESTED, module_pool); switch_mutex_init(&globals.pvt_lock, SWITCH_MUTEX_NESTED, module_pool); + switch_mutex_init(&globals.flag_mutex, SWITCH_MUTEX_NESTED, module_pool);

1 0