- Freeswitch-svn - FreeSWITCH Mailing Lists

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

08 Mar '07

Author: anthm Date: Thu Mar 8 09:59:10 2007 New Revision: 4480 Modified: freeswitch/trunk/src/switch_core.c Log: pass frame data better Modified: freeswitch/trunk/src/switch_core.c ============================================================================== --- freeswitch/trunk/src/switch_core.c (original) +++ freeswitch/trunk/src/switch_core.c Thu Mar 8 09:59:10 2007 @@ -2199,12 +2199,14 @@ session->enc_read_frame.codec = session->read_codec; session->enc_read_frame.samples = session->read_codec->implementation->bytes_per_frame / sizeof(int16_t); session->enc_read_frame.timestamp = read_frame->timestamp; + session->enc_read_frame.payload = session->read_codec->implementation->ianacode; *frame = &session->enc_read_frame; break; case SWITCH_STATUS_NOOP: session->raw_read_frame.codec = session->read_codec; - session->raw_read_frame.samples = session->read_codec->implementation->bytes_per_frame / sizeof(int16_t); + session->raw_read_frame.samples = enc_frame->codec->implementation->samples_per_frame; session->raw_read_frame.timestamp = read_frame->timestamp; + session->raw_read_frame.payload = enc_frame->codec->implementation->ianacode; *frame = &session->raw_read_frame; status = SWITCH_STATUS_SUCCESS; break; @@ -2465,13 +2467,14 @@ session->enc_write_frame.codec = session->write_codec; session->enc_write_frame.samples = enc_frame->datalen / sizeof(int16_t); session->enc_write_frame.timestamp = frame->timestamp; + session->enc_write_frame.payload = session->write_codec->implementation->ianacode; write_frame = &session->enc_write_frame; break; case SWITCH_STATUS_NOOP: enc_frame->codec = session->write_codec; enc_frame->samples = enc_frame->datalen / sizeof(int16_t); enc_frame->timestamp = frame->timestamp; - + enc_frame->payload = enc_frame->codec->implementation->ianacode; write_frame = enc_frame; status = SWITCH_STATUS_SUCCESS; break; @@ -2519,7 +2522,7 @@ session->enc_write_frame.codec = session->write_codec; session->enc_write_frame.samples = enc_frame->datalen / sizeof(int16_t); session->enc_write_frame.timestamp = frame->timestamp; - + session->enc_write_frame.payload = session->write_codec->implementation->ianacode; write_frame = &session->enc_write_frame; if (!session->read_resampler) { status = switch_resample_create(&session->read_resampler, @@ -2534,12 +2537,14 @@ session->enc_write_frame.codec = session->write_codec; session->enc_write_frame.samples = enc_frame->datalen / sizeof(int16_t); session->enc_write_frame.timestamp = frame->timestamp; + session->enc_write_frame.payload = session->write_codec->implementation->ianacode; write_frame = &session->enc_write_frame; break; case SWITCH_STATUS_NOOP: enc_frame->codec = session->write_codec; enc_frame->samples = enc_frame->datalen / sizeof(int16_t); enc_frame->timestamp = frame->timestamp; + enc_frame->payload = enc_frame->codec->implementation->ianacode; write_frame = enc_frame; status = SWITCH_STATUS_SUCCESS; break;

1 0

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

08 Mar '07

Author: anthm Date: Wed Mar 7 21:52:31 2007 New Revision: 4479 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Log: update Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Wed Mar 7 21:52:31 2007 @@ -789,7 +789,9 @@ } if (tech_pvt->cng_pt) { snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "a=rtpmap:%d CN/%d\n", tech_pvt->cng_pt, rate); - tech_pvt->cng_pt = 0; + if (!tech_pvt->rm_encoding) { + tech_pvt->cng_pt = 0; + } } if (ptime) { snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "a=ptime:%d\n", ptime);

1 0

[commit] r4478 - in freeswitch/trunk/src/mod: endpoints/mod_sofia languages/mod_spidermonkey xml_int/mod_xml_rpc
by Freeswitch SVN 08 Mar '07

08 Mar '07

Author: mikej Date: Wed Mar 7 21:31:34 2007 New Revision: 4478 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.h freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c Log: fix msvc build. Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Wed Mar 7 21:31:34 2007 @@ -695,7 +695,7 @@ char buf[2048]; switch_time_t now = switch_time_now(); int ptime = 0; - int rate; + int rate = 0; if (!force && !ip && !sr && switch_test_flag(tech_pvt, TFLAG_NOMEDIA)) { return; Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.h ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.h (original) +++ freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.h Wed Mar 7 21:31:34 2007 @@ -81,7 +81,7 @@ JSScript *script = NULL; char *cptr; char *path = NULL; - char *script_name; + char *script_name = NULL; int result = 0; JS_ClearPendingException(cx); Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c ============================================================================== --- freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c (original) +++ freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c Wed Mar 7 21:31:34 2007 @@ -228,7 +228,6 @@ char *oid, *relative_oid, *s_action, *data; char buf[SWITCH_MAX_MANAGEMENT_BUFFER_LEN] = ""; switch_management_action_t action = SMA_NONE; - switch_stream_handle_t stream = {0}; xmlrpc_value *val; /* Parse our argument array. */

1 0

[commit] r4477 - in freeswitch/trunk/src: . mod/endpoints/mod_portaudio
by Freeswitch SVN 08 Mar '07

08 Mar '07

Author: anthm Date: Wed Mar 7 20:30:52 2007 New Revision: 4477 Modified: freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c freeswitch/trunk/src/switch_rtp.c Log: update 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 Mar 7 20:30:52 2007 @@ -120,6 +120,7 @@ private_t *call_list; int ring_interval; GFLAGS flags; + switch_timer_t timer; } globals; @@ -186,6 +187,7 @@ last = switch_time_now() - waitsec; + if ((val = switch_channel_get_variable(channel, "pa_hold_file"))) { hold_file = val; } else { @@ -594,17 +596,6 @@ goto cng; } - if (switch_core_timer_init(&tech_pvt->timer, - globals.timer_name, - codec_ms, - globals.read_codec.implementation->samples_per_frame, - switch_core_session_get_pool(tech_pvt->session)) != SWITCH_STATUS_SUCCESS) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "setup timer failed!\n"); - switch_core_file_close(&tech_pvt->fh); - switch_core_codec_destroy(&tech_pvt->write_codec); - goto cng; - } - tech_pvt->hfh = &tech_pvt->fh; tech_pvt->hold_frame.data = tech_pvt->holdbuf; tech_pvt->hold_frame.buflen = sizeof(tech_pvt->holdbuf); @@ -639,6 +630,7 @@ tech_pvt->hold_frame.datalen = (uint32_t)(olen * sizeof(int16_t)); tech_pvt->hold_frame.samples = (uint32_t)olen; + tech_pvt->hold_frame.timestamp = tech_pvt->timer.samplecount; *frame = &tech_pvt->hold_frame; } @@ -651,6 +643,9 @@ if ((samples = ReadAudioStream(globals.audio_stream, globals.read_frame.data, globals.read_codec.implementation->samples_per_frame)) != 0) { globals.read_frame.datalen = samples * 2; globals.read_frame.samples = samples; + + switch_core_timer_check(&globals.timer); + globals.read_frame.timestamp = globals.timer.samplecount; *frame = &globals.read_frame; if (!switch_test_flag((&globals), GFLAG_MOUTH)) { @@ -1312,6 +1307,21 @@ return SWITCH_STATUS_FALSE; } } + + if (switch_core_timer_init(&globals.timer, + globals.timer_name, + codec_ms, + globals.read_codec.implementation->samples_per_frame, + module_pool) != SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "setup timer failed!\n"); + switch_core_codec_destroy(&globals.read_codec); + switch_core_codec_destroy(&globals.write_codec); + return SWITCH_STATUS_FALSE; + } + + + + globals.read_frame.rate = sample_rate; globals.read_frame.codec = &globals.read_codec; Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Wed Mar 7 20:30:52 2007 @@ -1293,6 +1293,7 @@ } } + rtp_session->last_write_ts = ntohl(send_msg->header.ts); rtp_session->last_write_ssrc = ntohl(send_msg->header.ssrc); rtp_session->last_write_seq = ntohs((u_short)send_msg->header.seq); @@ -1384,15 +1385,16 @@ } if (!ts && rtp_session->timer.timer_interface) { - rtp_session->ts = rtp_session->timer.samplecount; + uint32_t sc = rtp_session->timer.samplecount; + if (rtp_session->last_write_ts == sc) { + rtp_session->ts = sc + rtp_session->packet_size; + } else { + rtp_session->ts = sc; + } } else { rtp_session->ts = ts; } - if (rtp_session->ts <= rtp_session->last_write_ts) { - rtp_session->ts += rtp_session->packet_size; - } - if (rtp_session->ts > rtp_session->last_write_ts + rtp_session->packet_size || rtp_session->ts == rtp_session->packet_size) { mark++; } @@ -1449,19 +1451,20 @@ if (frame->timestamp) { rtp_session->ts = (uint32_t) frame->timestamp; } else if (!ts && rtp_session->timer.timer_interface) { - rtp_session->ts = rtp_session->timer.samplecount; + uint32_t sc = rtp_session->timer.samplecount; + if (rtp_session->last_write_ts == sc) { + rtp_session->ts = sc + rtp_session->packet_size; + } else { + rtp_session->ts = sc; + } } else { rtp_session->ts = ts; } - + if (rtp_session->ts > rtp_session->last_write_ts + rtp_session->packet_size || rtp_session->ts == rtp_session->packet_size) { mark++; } - if (rtp_session->ts <= rtp_session->last_write_ts) { - rtp_session->ts += rtp_session->packet_size; - } - rtp_session->seq = ntohs(rtp_session->seq) + 1; rtp_session->seq = htons(rtp_session->seq); rtp_session->send_msg.header.seq = rtp_session->seq;

1 0

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

08 Mar '07

Author: anthm Date: Wed Mar 7 19:27:22 2007 New Revision: 4476 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 Wed Mar 7 19:27:22 2007 @@ -1389,6 +1389,10 @@ rtp_session->ts = ts; } + if (rtp_session->ts <= rtp_session->last_write_ts) { + rtp_session->ts += rtp_session->packet_size; + } + if (rtp_session->ts > rtp_session->last_write_ts + rtp_session->packet_size || rtp_session->ts == rtp_session->packet_size) { mark++; } @@ -1454,6 +1458,10 @@ mark++; } + if (rtp_session->ts <= rtp_session->last_write_ts) { + rtp_session->ts += rtp_session->packet_size; + } + rtp_session->seq = ntohs(rtp_session->seq) + 1; rtp_session->seq = htons(rtp_session->seq); rtp_session->send_msg.header.seq = rtp_session->seq;

1 0

[commit] r4475 - freeswitch/trunk/src/mod/asr_tts/mod_cepstral
by Freeswitch SVN 08 Mar '07

08 Mar '07

Author: anthm Date: Wed Mar 7 19:04:04 2007 New Revision: 4475 Modified: freeswitch/trunk/src/mod/asr_tts/mod_cepstral/mod_cepstral.c Log: earier patch to hide warning in cepstral does more bad than good so I guess the error is better Modified: freeswitch/trunk/src/mod/asr_tts/mod_cepstral/mod_cepstral.c ============================================================================== --- freeswitch/trunk/src/mod/asr_tts/mod_cepstral/mod_cepstral.c (original) +++ freeswitch/trunk/src/mod/asr_tts/mod_cepstral/mod_cepstral.c Wed Mar 7 19:04:04 2007 @@ -223,7 +223,7 @@ return SWITCH_STATUS_FALSE; } - if ((to_say = switch_mprintf(".<break time=\"500ms\"/> %s <break time=\"500ms\"/>", text))) { + if ((to_say = switch_mprintf("<break time=\"500ms\"/> %s <break time=\"500ms\"/>", text))) { swift_port_speak_text(cepstral->port, to_say, 0, NULL, &cepstral->tts_stream, NULL); switch_safe_free(to_say); }

1 0

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

07 Mar '07

Author: anthm Date: Wed Mar 7 18:48:02 2007 New Revision: 4474 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c freeswitch/trunk/src/switch_rtp.c Log: update contd Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Wed Mar 7 18:48:02 2007 @@ -2460,6 +2460,10 @@ if (!cng_pt && !strcasecmp(map->rm_encoding, "CN")) { cng_pt = tech_pvt->cng_pt = (switch_payload_t)map->rm_pt; switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Set comfort noise payload to %u\n", cng_pt); + if (tech_pvt->rtp_session) { + switch_rtp_set_cng_pt(tech_pvt->rtp_session, tech_pvt->cng_pt); + switch_rtp_set_flag(tech_pvt->rtp_session, SWITCH_RTP_FLAG_AUTO_CNG); + } } if (match) { Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Wed Mar 7 18:48:02 2007 @@ -820,11 +820,10 @@ check = (uint8_t)(switch_core_timer_check(&rtp_session->timer) == SWITCH_STATUS_SUCCESS); if (switch_test_flag(rtp_session, SWITCH_RTP_FLAG_AUTO_CNG) && - rtp_session->timer.samplecount >= (rtp_session->last_write_ts + (rtp_session->packet_size * 5))) { + rtp_session->timer.samplecount >= (rtp_session->last_write_ts + (rtp_session->packet_size * 50))) { uint8_t data[2] = {0}; switch_frame_flag_t flags = SFF_NONE; data[0] = 127; - printf("WTF %u %u\n", rtp_session->timer.samplecount, (rtp_session->last_write_ts + (rtp_session->packet_size * 5))); rtp_session->last_write_ts = rtp_session->timer.samplecount; rtp_session->seq = ntohs(rtp_session->seq) + 1; rtp_session->seq = htons(rtp_session->seq);

1 0

[commit] r4473 - in freeswitch/trunk/src: . mod/endpoints/mod_sofia mod/timers/mod_softtimer
by Freeswitch SVN 07 Mar '07

07 Mar '07

Author: anthm Date: Wed Mar 7 18:24:09 2007 New Revision: 4473 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c freeswitch/trunk/src/mod/timers/mod_softtimer/mod_softtimer.c freeswitch/trunk/src/switch_rtp.c Log: wip Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Wed Mar 7 18:24:09 2007 @@ -787,9 +787,10 @@ if (tech_pvt->te > 95) { 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); } - - snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "a=rtpmap:%d CN/%d\n", tech_pvt->cng_pt, rate); - + if (tech_pvt->cng_pt) { + snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "a=rtpmap:%d CN/%d\n", tech_pvt->cng_pt, rate); + tech_pvt->cng_pt = 0; + } if (ptime) { snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "a=ptime:%d\n", ptime); } Modified: freeswitch/trunk/src/mod/timers/mod_softtimer/mod_softtimer.c ============================================================================== --- freeswitch/trunk/src/mod/timers/mod_softtimer/mod_softtimer.c (original) +++ freeswitch/trunk/src/mod/timers/mod_softtimer/mod_softtimer.c Wed Mar 7 18:24:09 2007 @@ -53,6 +53,7 @@ switch_size_t reference; switch_size_t start; uint32_t roll; + uint32_t ready; }; typedef struct timer_private timer_private_t; @@ -83,6 +84,7 @@ timer->private_info = private_info; private_info->start = private_info->reference = TIMER_MATRIX[timer->interval].tick; private_info->roll = TIMER_MATRIX[timer->interval].roll; + private_info->ready = 1; return SWITCH_STATUS_SUCCESS; } @@ -102,7 +104,7 @@ timer_private_t *private_info = timer->private_info; uint64_t samples; - if (globals.RUNNING != 1) { + if (globals.RUNNING != 1 || private_info->ready == 0) { return SWITCH_STATUS_FALSE; } @@ -127,7 +129,7 @@ timer_step(timer); - while (globals.RUNNING == 1 && TIMER_MATRIX[timer->interval].tick < private_info->reference) { + while (globals.RUNNING == 1 && private_info->ready && TIMER_MATRIX[timer->interval].tick < private_info->reference) { check_roll(); switch_yield(1000); } @@ -146,7 +148,7 @@ switch_status_t status = SWITCH_STATUS_SUCCESS; switch_size_t diff; - if (globals.RUNNING != 1) { + if (globals.RUNNING != 1 || !private_info->ready) { return SWITCH_STATUS_SUCCESS; } @@ -170,13 +172,14 @@ static inline switch_status_t timer_destroy(switch_timer_t *timer) { + timer_private_t *private_info = timer->private_info; switch_mutex_lock(globals.mutex); TIMER_MATRIX[timer->interval].count--; if (TIMER_MATRIX[timer->interval].count == 0) { TIMER_MATRIX[timer->interval].tick = 0; } switch_mutex_unlock(globals.mutex); - timer->private_info = NULL; + private_info->ready = 0; return SWITCH_STATUS_SUCCESS; } Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Wed Mar 7 18:24:09 2007 @@ -779,8 +779,12 @@ switch_core_timer_step(&rtp_session->timer); } - if (rtp_session->recv_msg.header.pt == rtp_session->cng_pt) { - *flags |= SFF_CNG; + if (!switch_test_flag(rtp_session, SWITCH_RTP_FLAG_IO)) { + return -1; + } + + if (rtp_session->cng_pt && rtp_session->recv_msg.header.pt == rtp_session->cng_pt) { + continue; } if (!bytes && switch_test_flag(rtp_session, SWITCH_RTP_FLAG_BREAK)) { @@ -795,10 +799,6 @@ return 2 + rtp_header_len; } - if (!switch_test_flag(rtp_session, SWITCH_RTP_FLAG_IO)) { - return -1; - } - if (bytes < 0) { return (int)bytes; } else if (bytes > 0 && switch_test_flag(rtp_session, SWITCH_RTP_FLAG_SECURE)) { @@ -824,7 +824,7 @@ uint8_t data[2] = {0}; switch_frame_flag_t flags = SFF_NONE; data[0] = 127; - + printf("WTF %u %u\n", rtp_session->timer.samplecount, (rtp_session->last_write_ts + (rtp_session->packet_size * 5))); rtp_session->last_write_ts = rtp_session->timer.samplecount; rtp_session->seq = ntohs(rtp_session->seq) + 1; rtp_session->seq = htons(rtp_session->seq); @@ -958,12 +958,13 @@ SWITCH_DECLARE(switch_size_t) switch_rtp_has_dtmf(switch_rtp_t *rtp_session) { - switch_size_t has; + switch_size_t has = 0; - assert(rtp_session != NULL); - switch_mutex_lock(rtp_session->dtmf_data.dtmf_mutex); - has = switch_buffer_inuse(rtp_session->dtmf_data.dtmf_buffer); - switch_mutex_unlock(rtp_session->dtmf_data.dtmf_mutex); + if (switch_rtp_ready(rtp_session)) { + switch_mutex_lock(rtp_session->dtmf_data.dtmf_mutex); + has = switch_buffer_inuse(rtp_session->dtmf_data.dtmf_buffer); + switch_mutex_unlock(rtp_session->dtmf_data.dtmf_mutex); + } return has; } @@ -975,7 +976,9 @@ switch_size_t wr = 0; char *p; - assert(rtp_session != NULL); + if (!switch_rtp_ready(rtp_session)) { + return SWITCH_STATUS_FALSE; + } switch_mutex_lock(rtp_session->dtmf_data.dtmf_mutex); @@ -1005,9 +1008,11 @@ SWITCH_DECLARE(switch_size_t) switch_rtp_dequeue_dtmf(switch_rtp_t *rtp_session, char *dtmf, switch_size_t len) { - switch_size_t bytes; + switch_size_t bytes = 0; - assert(rtp_session != NULL); + if (!switch_rtp_ready(rtp_session)) { + return bytes; + } switch_mutex_lock(rtp_session->dtmf_data.dtmf_mutex); if ((bytes = switch_buffer_read(rtp_session->dtmf_data.dtmf_buffer, dtmf, len)) > 0) { @@ -1024,6 +1029,10 @@ { char *c; + if (!switch_rtp_ready(rtp_session)) { + return SWITCH_STATUS_FALSE; + } + if (!rtp_session->dtmf_data.dtmf_queue) { switch_queue_create(&rtp_session->dtmf_data.dtmf_queue, 100, rtp_session->pool); } @@ -1046,8 +1055,13 @@ SWITCH_DECLARE(switch_status_t) switch_rtp_read(switch_rtp_t *rtp_session, void *data, uint32_t *datalen, switch_payload_t *payload_type, switch_frame_flag_t *flags) { + int bytes = 0; - int bytes = rtp_common_read(rtp_session, payload_type, flags); + if (!switch_rtp_ready(rtp_session)) { + return SWITCH_STATUS_FALSE; + } + + bytes = rtp_common_read(rtp_session, payload_type, flags); if (bytes < 0) { *datalen = 0; @@ -1068,7 +1082,13 @@ SWITCH_DECLARE(switch_status_t) switch_rtp_zerocopy_read_frame(switch_rtp_t *rtp_session, switch_frame_t *frame) { - int bytes = rtp_common_read(rtp_session, &frame->payload, &frame->flags); + int bytes = 0; + + if (!switch_rtp_ready(rtp_session)) { + return SWITCH_STATUS_FALSE; + } + + bytes = rtp_common_read(rtp_session, &frame->payload, &frame->flags); frame->data = rtp_session->recv_msg.body; frame->packet = &rtp_session->recv_msg; @@ -1099,7 +1119,13 @@ switch_frame_flag_t *flags) { - int bytes = rtp_common_read(rtp_session, payload_type, flags); + int bytes = 0; + + if (!switch_rtp_ready(rtp_session)) { + return SWITCH_STATUS_FALSE; + } + + bytes = rtp_common_read(rtp_session, payload_type, flags); *data = rtp_session->recv_msg.body; if (bytes < 0) { @@ -1116,10 +1142,16 @@ 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 fwd = (uint8_t)(!flags || (switch_test_flag(rtp_session, SWITCH_RTP_FLAG_RAW_WRITE) && (*flags & SFF_RAW_RTP))); + uint8_t fwd = 0; rtp_msg_t *send_msg; uint8_t send = 1; + if (!switch_rtp_ready(rtp_session)) { + return SWITCH_STATUS_FALSE; + } + + fwd = (uint8_t)(!flags || (switch_test_flag(rtp_session, SWITCH_RTP_FLAG_RAW_WRITE) && (*flags & SFF_RAW_RTP))); + if (fwd) { bytes = datalen; send_msg = (rtp_msg_t *) data; @@ -1283,6 +1315,11 @@ SWITCH_DECLARE(switch_status_t) switch_rtp_disable_vad(switch_rtp_t *rtp_session) { + + if (!switch_rtp_ready(rtp_session)) { + return SWITCH_STATUS_FALSE; + } + if (!switch_test_flag(rtp_session, SWITCH_RTP_FLAG_VAD)) { return SWITCH_STATUS_GENERR; } @@ -1293,6 +1330,11 @@ SWITCH_DECLARE(switch_status_t) switch_rtp_enable_vad(switch_rtp_t *rtp_session, switch_core_session_t *session, switch_codec_t *codec, switch_vad_flag_t flags) { + + if (!switch_rtp_ready(rtp_session)) { + return SWITCH_STATUS_FALSE; + } + if (switch_test_flag(rtp_session, SWITCH_RTP_FLAG_VAD)) { return SWITCH_STATUS_GENERR; } @@ -1334,6 +1376,10 @@ { uint8_t mark = 0; + if (!switch_rtp_ready(rtp_session)) { + return -1; + } + if (!switch_test_flag(rtp_session, SWITCH_RTP_FLAG_IO) || !rtp_session->remote_addr) { return -1; } @@ -1359,13 +1405,21 @@ SWITCH_DECLARE(int) switch_rtp_write_frame(switch_rtp_t *rtp_session, switch_frame_t *frame, uint32_t ts) { - uint8_t fwd = (switch_test_flag(rtp_session, SWITCH_RTP_FLAG_RAW_WRITE) && switch_test_flag(frame, SFF_RAW_RTP)) ? 1 : 0; - uint8_t packetize = (rtp_session->packet_size > frame->datalen && (frame->payload == rtp_session->payload)) ? 1 : 0; + uint8_t fwd = 0; + uint8_t packetize = 0; void *data; uint32_t len; uint8_t mark = 0; switch_payload_t payload; + + if (!switch_rtp_ready(rtp_session)) { + return -1; + } + + fwd = (switch_test_flag(rtp_session, SWITCH_RTP_FLAG_RAW_WRITE) && switch_test_flag(frame, SFF_RAW_RTP)) ? 1 : 0; + packetize = (rtp_session->packet_size > frame->datalen && (frame->payload == rtp_session->payload)) ? 1 : 0; + if (!switch_test_flag(rtp_session, SWITCH_RTP_FLAG_IO) || !rtp_session->remote_addr) { return -1; } @@ -1423,6 +1477,10 @@ { rtp_msg_t send_msg = {{0}}; + if (!switch_rtp_ready(rtp_session)) { + return -1; + } + if (!switch_test_flag(rtp_session, SWITCH_RTP_FLAG_IO) || !rtp_session->remote_addr) { return -1; }

1 0

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

07 Mar '07

Author: anthm Date: Wed Mar 7 17:30:29 2007 New Revision: 4472 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Log: you can't handle the truth Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Wed Mar 7 17:30:29 2007 @@ -874,7 +874,7 @@ switch_core_session_add_stream(session, NULL); channel = switch_core_session_get_channel(session); - switch_channel_set_flag(channel, CF_ACCEPT_CNG); + //switch_channel_set_flag(channel, CF_ACCEPT_CNG); switch_mutex_init(&tech_pvt->flag_mutex, SWITCH_MUTEX_NESTED, switch_core_session_get_pool(session)); switch_mutex_lock(tech_pvt->flag_mutex);

1 0

[commit] r4471 - in freeswitch/trunk/src: . include mod/languages/mod_spidermonkey
by Freeswitch SVN 07 Mar '07

07 Mar '07

Author: anthm Date: Wed Mar 7 17:17:02 2007 New Revision: 4471 Modified: freeswitch/trunk/src/include/switch_utils.h freeswitch/trunk/src/mod/languages/mod_spidermonkey/Makefile freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.h freeswitch/trunk/src/switch_utils.c Log: fix fatal include Modified: freeswitch/trunk/src/include/switch_utils.h ============================================================================== --- freeswitch/trunk/src/include/switch_utils.h (original) +++ freeswitch/trunk/src/include/switch_utils.h Wed Mar 7 17:17:02 2007 @@ -289,6 +289,7 @@ #define SWITCH_READ_ACCEPTABLE(status) (status == SWITCH_STATUS_SUCCESS || status == SWITCH_STATUS_BREAK) SWITCH_DECLARE(size_t) switch_url_encode(char *url, char *buf, size_t len); SWITCH_DECLARE(char *) switch_url_decode(char *s); +SWITCH_DECLARE(switch_status_t) switch_file_exists(const char *filename); SWITCH_END_EXTERN_C #endif Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/Makefile ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_spidermonkey/Makefile (original) +++ freeswitch/trunk/src/mod/languages/mod_spidermonkey/Makefile Wed Mar 7 17:17:02 2007 @@ -7,7 +7,7 @@ MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) install js --prefix=$(PREFIX) --with-pic --with-nspr=yes MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) install curl --prefix=$(PREFIX) --without-libidn -$(MODNAME).$(DYNAMIC_LIB_EXTEN): $(MODNAME).c +$(MODNAME).$(DYNAMIC_LIB_EXTEN): $(MODNAME).c $(MODNAME).h $(CC) $(CFLAGS) -c $(MODNAME).c -o $(MODNAME).o $(CC) $(SOLINK) -o $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(MODNAME).o $(OBJS) $(LDFLAGS) Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c (original) +++ freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c Wed Mar 7 17:17:02 2007 @@ -2248,7 +2248,9 @@ { char *code; if ( argc > 0 && (code = JS_GetStringBytes(JS_ValueToString(cx, argv[0])))) { - eval_some_js(code, cx, obj, rval); + if (eval_some_js(code, cx, obj, rval) < 0) { + return JS_FALSE; + } return JS_TRUE; } switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid Arguements\n"); Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.h ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.h (original) +++ freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.h Wed Mar 7 17:17:02 2007 @@ -81,7 +81,8 @@ JSScript *script = NULL; char *cptr; char *path = NULL; - int res = 0; + char *script_name; + int result = 0; JS_ClearPendingException(cx); @@ -90,19 +91,28 @@ script = JS_CompileScript(cx, obj, cptr, strlen(cptr), "inline", 1); } else { if (*code == '/') { - script = JS_CompileFile(cx, obj, code); + script_name = code; } else if ((path = switch_mprintf("%s%s%s", SWITCH_GLOBAL_dirs.script_dir, SWITCH_PATH_SEPARATOR, code))) { - script = JS_CompileFile(cx, obj, path); - switch_safe_free(path); + script_name = path; } + if (script_name) { + if (switch_file_exists(script_name) == SWITCH_STATUS_SUCCESS) { + script = JS_CompileFile(cx, obj, script_name); + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot Open File: %s\n", script_name); + } + } } - + if (script) { - res = JS_ExecuteScript(cx, obj, script, rval) == JS_TRUE ? 1 : 0; + result = JS_ExecuteScript(cx, obj, script, rval) == JS_TRUE ? 1 : 0; JS_DestroyScript(cx, script); + } else { + result = -1; } - - return res; + + switch_safe_free(path); + return result; } Modified: freeswitch/trunk/src/switch_utils.c ============================================================================== --- freeswitch/trunk/src/switch_utils.c (original) +++ freeswitch/trunk/src/switch_utils.c Wed Mar 7 17:17:02 2007 @@ -331,6 +331,20 @@ } +SWITCH_DECLARE(switch_status_t) switch_file_exists(const char *filename) +{ + int32_t wanted = APR_FINFO_TYPE; + apr_finfo_t info = {0}; + if (filename) { + apr_stat(&info, filename, wanted, NULL); + if (info.filetype != APR_NOFILE) { + return SWITCH_STATUS_SUCCESS; + } + } + return SWITCH_STATUS_FALSE; +} + + SWITCH_DECLARE(char *) switch_priority_name(switch_priority_t priority) { switch(priority) { /*lol*/

1 0