February 2007 - Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r4116 - freeswitch/trunk/src
by Freeswitch SVN 04 Feb '07

04 Feb '07

Author: mikej Date: Sun Feb 4 14:12:14 2007 New Revision: 4116 Modified: freeswitch/trunk/src/switch_event.c Log: don't use uninitialized value of data, return error if null fmt string passed. Modified: freeswitch/trunk/src/switch_event.c ============================================================================== --- freeswitch/trunk/src/switch_event.c (original) +++ freeswitch/trunk/src/switch_event.c Sun Feb 4 14:12:14 2007 @@ -531,13 +531,15 @@ ret = vsnprintf(data, 2048, fmt, ap); #endif va_end(ap); - } - if (ret == -1) { - return SWITCH_STATUS_GENERR; + if (ret == -1) { + return SWITCH_STATUS_GENERR; + } else { + event->body = data; + return SWITCH_STATUS_SUCCESS; + } } else { - event->body = data; - return SWITCH_STATUS_SUCCESS; + return SWITCH_STATUS_GENERR; } }

1 0

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

03 Feb '07

Author: anthm Date: Sat Feb 3 17:17:36 2007 New Revision: 4115 Modified: freeswitch/trunk/src/switch_rtp.c Log: update Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Sat Feb 3 17:17:36 2007 @@ -150,7 +150,6 @@ uint32_t ms_per_packet; uint32_t remote_port; uint8_t stuncount; - switch_buffer_t *packet_buffer; struct switch_rtp_vad_data vad_data; struct switch_rtp_rfc2833_data dtmf_data; switch_payload_t te; @@ -551,9 +550,6 @@ switch_mutex_lock((*rtp_session)->flag_mutex); - if ((*rtp_session)->packet_buffer) { - switch_buffer_destroy(&(*rtp_session)->packet_buffer); - } if ((*rtp_session)->dtmf_data.dtmf_buffer) { switch_buffer_destroy(&(*rtp_session)->dtmf_data.dtmf_buffer); } @@ -1073,7 +1069,6 @@ static int rtp_common_write(switch_rtp_t *rtp_session, void *data, uint32_t datalen, uint8_t m, switch_payload_t payload, switch_frame_flag_t *flags) { switch_size_t bytes; - uint8_t packetize = (rtp_session->packet_size > datalen && (payload == rtp_session->payload)) ? 1 : 0; uint8_t fwd = (switch_test_flag(rtp_session, SWITCH_RTP_FLAG_RAW_WRITE) && (*flags & SFF_RAW_RTP)) ? 1 : 0; rtp_msg_t *send_msg; uint8_t send = 1; @@ -1085,24 +1080,8 @@ send_msg = &rtp_session->send_msg; send_msg->header.pt = payload; send_msg->header.m = m ? 1 : 0; - if (packetize) { - if (!rtp_session->packet_buffer) { - if (switch_buffer_create_dynamic(&rtp_session->packet_buffer, rtp_session->packet_size, rtp_session->packet_size * 2, 0) - != SWITCH_STATUS_SUCCESS) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Buffer memory error\n"); - return -1; - } - } - switch_buffer_write(rtp_session->packet_buffer, data, datalen); - if (switch_buffer_inuse(rtp_session->packet_buffer) >= rtp_session->packet_size) { - switch_buffer_read(rtp_session->packet_buffer, send_msg->body, rtp_session->packet_size); - datalen = rtp_session->packet_size; - } else { - return datalen; - } - } else { - memcpy(send_msg->body, data, datalen); - } + memcpy(send_msg->body, data, datalen); + bytes = datalen + rtp_header_len; }

1 0

[commit] r4114 - in freeswitch/trunk/src: . mod/endpoints/mod_sofia
by Freeswitch SVN 03 Feb '07

03 Feb '07

Author: anthm Date: Sat Feb 3 14:47:21 2007 New Revision: 4114 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c freeswitch/trunk/src/switch_rtp.c Log: I...HATES...PTIME 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 Sat Feb 3 14:47:21 2007 @@ -684,6 +684,7 @@ { char buf[1024]; switch_time_t now = switch_time_now(); + uint32_t ptime = 0; if (!force && !ip && !sr && switch_test_flag(tech_pvt, TFLAG_NOMEDIA)) { return; @@ -727,7 +728,11 @@ int i; for (i = 0; i < tech_pvt->num_codecs; i++) { const switch_codec_implementation_t *imp = tech_pvt->codecs[i]; + snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), " %d", imp->ianacode); + if (!ptime) { + ptime = imp->microseconds_per_frame / 1000; + } } } @@ -742,19 +747,21 @@ if (tech_pvt->fmtp_out) { snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "a=fmtp:%d %s\n", tech_pvt->pt, tech_pvt->fmtp_out); } - if (tech_pvt->read_codec.implementation) { - snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "a=ptime:%d\n", tech_pvt->read_codec.implementation->microseconds_per_frame / 1000); + if (tech_pvt->read_codec.implementation && ! ptime) { + ptime = tech_pvt->read_codec.implementation->microseconds_per_frame / 1000; } } else if (tech_pvt->num_codecs) { int i; for (i = 0; i < tech_pvt->num_codecs; i++) { const switch_codec_implementation_t *imp = tech_pvt->codecs[i]; + if (ptime && ptime != imp->microseconds_per_frame / 1000) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "ptime %u != advertised ptime %u\n", imp->microseconds_per_frame / 1000, ptime); + } snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "a=rtpmap:%d %s/%d\n", imp->ianacode, imp->iananame, imp->samples_per_second); if (imp->fmtp) { snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "a=fmtp:%d %s\n", imp->ianacode, imp->fmtp); } - snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "a=ptime:%d\n", imp->microseconds_per_frame / 1000); } } @@ -762,6 +769,10 @@ snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "a=rtpmap:%d telephone-event/8000\na=fmtp:%d 0-16\n", tech_pvt->te, tech_pvt->te); } + if (ptime) { + snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "a=ptime:%d\n", ptime); + } + tech_pvt->local_sdp_str = switch_core_session_strdup(tech_pvt->session, buf); } Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Sat Feb 3 14:47:21 2007 @@ -141,6 +141,7 @@ char *ice_user; char *user_ice; + char *timer_name; switch_time_t last_stun; uint32_t packet_size; uint32_t conf_packet_size; @@ -428,6 +429,7 @@ rtp_session->payload = payload; rtp_session->ms_per_packet = ms_per_packet; rtp_session->packet_size = rtp_session->conf_packet_size = packet_size; + rtp_session->timer_name = switch_core_strdup(rtp_session->pool, timer_name); if (switch_test_flag(rtp_session, SWITCH_RTP_FLAG_SECURE)) { err_status_t stat; @@ -760,15 +762,36 @@ if (bytes > 0 && rtp_session->recv_msg.header.version == 2) { uint32_t effective_size = (uint32_t)(bytes - rtp_header_len); + uint32_t new_ms = 0, old_size = 0; + 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 ); + + old_size = rtp_session->packet_size; + new_ms = (((rtp_session->ms_per_packet / 1000) * effective_size) / old_size); + + rtp_session->ms_per_packet = new_ms * 1000; rtp_session->packet_size = effective_size; + + if (rtp_session->timer.timer_interface) { + switch_core_timer_destroy(&rtp_session->timer); + if (!switch_strlen_zero(rtp_session->timer_name)) { + if (switch_core_timer_init(&rtp_session->timer, + rtp_session->timer_name, + rtp_session->ms_per_packet / 1000, + rtp_session->packet_size, + rtp_session->pool) == SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Starting timer [%s] %d bytes per %dms\n", + rtp_session->timer_name, rtp_session->packet_size, rtp_session->ms_per_packet / 1000); + } + } + } } - } + } if (rtp_session->timer.interval) { check = (uint8_t)(switch_core_timer_check(&rtp_session->timer) == SWITCH_STATUS_SUCCESS);

1 0

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

03 Feb '07

Author: anthm Date: Sat Feb 3 12:06:57 2007 New Revision: 4113 Modified: freeswitch/trunk/src/switch_event.c Log: fix events with large bodies Modified: freeswitch/trunk/src/switch_event.c ============================================================================== --- freeswitch/trunk/src/switch_event.c (original) +++ freeswitch/trunk/src/switch_event.c Sat Feb 3 12:06:57 2007 @@ -519,19 +519,24 @@ SWITCH_DECLARE(switch_status_t) switch_event_add_body(switch_event_t *event, char *fmt, ...) { int ret = 0; - char data[2048]; + char *data; va_list ap; if (fmt) { va_start(ap, fmt); - ret = vsnprintf(data, sizeof(data), fmt, ap); +#ifdef HAVE_VASPRINTF + ret = vasprintf(&data, fmt, ap); +#else + data = (char *) malloc(2048); + ret = vsnprintf(data, 2048, fmt, ap); +#endif va_end(ap); } if (ret == -1) { return SWITCH_STATUS_GENERR; } else { - event->body = DUP(data); + event->body = data; return SWITCH_STATUS_SUCCESS; } }

1 0

[commit] r4112 - freeswitch/trunk/src/mod/applications/mod_conference
by Freeswitch SVN 03 Feb '07

03 Feb '07

Author: anthm Date: Sat Feb 3 11:44:00 2007 New Revision: 4112 Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Log: minor conference tweak (needs testing) 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 Sat Feb 3 11:44:00 2007 @@ -25,6 +25,7 @@ * * Anthony Minessale II <anthmct(a)yahoo.com> * Neal Horman <neal at wanlink dot com> + * Bret McDanel <trixter at 0xdecafbad dot com> * * * mod_conference.c -- Software Conference Bridge @@ -177,6 +178,9 @@ char *caller_id_name; char *caller_id_number; char *sound_prefix; + uint32_t max_members; + char *maxmember_sound; + uint32_t anounce_count; switch_ivr_digit_stream_parser_t *dtmf_parser; char *pin; char *pin_sound; @@ -470,6 +474,7 @@ { switch_status_t status = SWITCH_STATUS_FALSE; switch_event_t *event; + char msg[512]; // for conference count anouncement assert(conference != NULL); assert(member != NULL); @@ -498,19 +503,27 @@ switch_event_fire(&event); } - - if (conference->enter_sound) { + if (conference->count > 1 && conference->enter_sound) { conference_play_file(conference, conference->enter_sound, CONF_DEFAULT_LEADIN, switch_core_session_get_channel(member->session)); } - if (conference->count == 1 && conference->alone_sound) { - conference_play_file(conference, conference->alone_sound, 0, switch_core_session_get_channel(member->session)); + // anounce the total number of members in the conference + if (conference->count >= conference->anounce_count && conference->anounce_count > 1) { + snprintf(msg, sizeof(msg), "There are %d callers", conference->count); + conference_member_say(member, msg, 0); + } else if (conference->count == 1) { + if (conference->alone_sound) { + conference_play_file(conference, conference->alone_sound, 0, switch_core_session_get_channel(member->session)); + } else { + snprintf(msg, sizeof(msg), "You are currently the only person in this conference.", conference->count); + conference_member_say(member, msg, 0); + } } if (conference->min && conference->count >= conference->min) { switch_set_flag(conference, CFLAG_ENFORCE_MIN); } - + if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { switch_channel_t *channel = switch_core_session_get_channel(member->session); switch_channel_event_set_data(channel, event); @@ -3779,6 +3792,21 @@ } goto done; } + + /* dont allow more callers than the max_members allows for -- I explicitly didnt allow outbound calls + * someone else can add that (see above) if they feel that outbound calls should be able to violate the + * max_members limit -- TRX + */ + if((conference->max_members > 0) && (conference->count >= conference->max_members)) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Conference %s is full.\n",conf_name); + if(conference->maxmember_sound) { + /* Answer the channel */ + switch_channel_answer(channel); + conference_local_play_file(conference, session, conference->maxmember_sound, 20, NULL, 0); + } + goto done; + } + } /* Release the config registry handle */ @@ -4363,6 +4391,9 @@ char *caller_id_name = NULL; char *caller_id_number = NULL; char *caller_controls = NULL; + uint32_t max_members = 0; + uint32_t anounce_count = 0; + char *maxmember_sound = NULL; uint32_t rate = 8000, interval = 20; switch_status_t status; @@ -4439,6 +4470,24 @@ caller_controls = val; } else if (!strcasecmp(var, "sound-prefix")) { sound_prefix = val; + } else if (!strcasecmp(var, "max-members")) { + errno = 0; // sanity first + max_members = strtol(val,NULL,0); // base 0 lets 0x... for hex 0... for octal and base 10 otherwise through + if(errno == ERANGE || errno == EINVAL || max_members < 0 || max_members == 1) { + // a negative wont work well, and its foolish to have a conference limited to 1 person unless the outbound + // stuff is added, see comments above + max_members = 0; // set to 0 to disable max counts + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "max-members %s is invalid, not setting a limit\n",val); + } + } else if(!strcasecmp(var, "max-members-sound")) { + maxmember_sound = val; + } else if(!strcasecmp(var, "anounce-count")) { + errno = 0; // safety first + anounce_count = strtol(val,NULL,0); + if(errno == ERANGE || errno == EINVAL) { + anounce_count = 0; + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "anounce-count is invalid, not anouncing member counts\n"); + } } } @@ -4565,6 +4614,14 @@ conference->energy_level = atoi(energy_level); } + if (!switch_strlen_zero(maxmember_sound)) { + conference->maxmember_sound = switch_core_strdup(conference->pool, maxmember_sound); + } + + // its going to be 0 by default, set to a value otherwise so this should be safe + conference->max_members = max_members; + conference->anounce_count = anounce_count; + conference->name = switch_core_strdup(conference->pool, name); if (domain) { conference->domain = switch_core_strdup(conference->pool, domain);

1 0

[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