- Freeswitch-trunk - FreeSWITCH Mailing Lists

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

08 Mar '07

Author: mikej Date: Thu Mar 8 15:05:09 2007 New Revision: 4484 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Log: add some very basic stun support to ext-sip-ip. please consider this support as testing only, may change syntax or be removed in the future. 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 Mar 8 15:05:09 2007 @@ -927,12 +927,46 @@ } + +static switch_status_t sofia_ext_address_lookup(char **ip, + switch_port_t *port, + char *sourceip, + switch_memory_pool_t *pool) +{ + char *error; + + if (!sourceip) { + return SWITCH_STATUS_FALSE; + } + + if (!strncasecmp(sourceip, "stun:", 5)) { + char *stun_ip = sourceip + 5; + if (!stun_ip) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Stun Failed! NO STUN SERVER\n"); + return SWITCH_STATUS_FALSE; + } + if (switch_stun_lookup(ip, + port, + stun_ip, + SWITCH_STUN_DEFAULT_PORT, + &error, + pool) != SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Stun Failed! %s:%d [%s]\n", stun_ip, SWITCH_STUN_DEFAULT_PORT, error); + return SWITCH_STATUS_FALSE; + } + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Stun Success [%s]:[%d]\n", *ip, *port); + } else { + *ip = sourceip; + } + return SWITCH_STATUS_SUCCESS; +} + + static switch_status_t tech_choose_port(private_object_t *tech_pvt) { char *ip = tech_pvt->profile->rtpip; switch_channel_t *channel; switch_port_t sdp_port; - char *err; char tmp[50]; channel = switch_core_session_get_channel(tech_pvt->session); @@ -945,28 +979,13 @@ tech_pvt->local_sdp_audio_port = switch_rtp_request_port(); sdp_port = tech_pvt->local_sdp_audio_port; - if (tech_pvt->profile->extrtpip) { - if (!strncasecmp(tech_pvt->profile->extrtpip, "stun:", 5)) { - char *stun_ip = tech_pvt->profile->extrtpip + 5; - if (!stun_ip) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Stun Failed! NO STUN SERVER\n"); - terminate_session(&tech_pvt->session, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER, __LINE__); - return SWITCH_STATUS_FALSE; - } - if (switch_stun_lookup(&ip, - &sdp_port, - stun_ip, - SWITCH_STUN_DEFAULT_PORT, - &err, - switch_core_session_get_pool(tech_pvt->session)) != SWITCH_STATUS_SUCCESS) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Stun Failed! %s:%d [%s]\n", stun_ip, SWITCH_STUN_DEFAULT_PORT, err); + if (sofia_ext_address_lookup(&ip, + &sdp_port, + tech_pvt->profile->extrtpip, + switch_core_session_get_pool(tech_pvt->session)) != SWITCH_STATUS_SUCCESS) { terminate_session(&tech_pvt->session, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER, __LINE__); return SWITCH_STATUS_FALSE; - } - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Stun Success [%s]:[%d]\n", ip, sdp_port); - } else { - ip = tech_pvt->profile->extrtpip; } } @@ -5242,6 +5261,23 @@ profile->rtpip = switch_core_strdup(profile->pool, strcasecmp(val, "auto") ? val : globals.guess_ip); } else if (!strcasecmp(var, "sip-ip")) { profile->sipip = switch_core_strdup(profile->pool, strcasecmp(val, "auto") ? val : globals.guess_ip); + } else if (!strcasecmp(var, "ext-sip-ip")) { + if (!strcasecmp(val, "auto")) { + profile->extsipip = switch_core_strdup(profile->pool, globals.guess_ip); + } else { + char *ip = NULL; + switch_port_t port = 0; + if (sofia_ext_address_lookup(&ip, + &port, + val, + profile->pool) == SWITCH_STATUS_SUCCESS) { + + if (ip) { + profile->extsipip = switch_core_strdup(profile->pool, ip); + } + } + } + } else if (!strcasecmp(var, "sip-domain")) { profile->sipdomain = switch_core_strdup(profile->pool, val); } else if (!strcasecmp(var, "rtp-timer-name")) { @@ -5276,8 +5312,6 @@ if (switch_true(val)) { profile->pflags |= PFLAG_FULL_ID; } - } else if (!strcasecmp(var, "ext-sip-ip")) { - profile->extsipip = switch_core_strdup(profile->pool, strcasecmp(val, "auto") ? val : globals.guess_ip); } else if (!strcasecmp(var, "bitpacking")) { if (!strcasecmp(val, "aal2")) { profile->codec_flags = SWITCH_CODEC_FLAG_AAL2;

1 0

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

08 Mar '07

Author: mikej Date: Thu Mar 8 11:43:16 2007 New Revision: 4483 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Log: msvc build tweaks 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 Mar 8 11:43:16 2007 @@ -913,9 +913,8 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Term called from line: %d\n", line); if (*session) { switch_channel_t *channel = switch_core_session_get_channel(*session); - switch_channel_state_t state = switch_channel_get_state(channel); struct private_object *tech_pvt = NULL; - uint8_t running = switch_core_session_running(*session); + uint8_t running = (uint8_t)switch_core_session_running(*session); tech_pvt = switch_core_session_get_private(*session); if (running) {

1 0

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

08 Mar '07

Author: anthm Date: Thu Mar 8 11:09:57 2007 New Revision: 4482 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Log: test patch 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 Mar 8 11:09:57 2007 @@ -915,21 +915,13 @@ switch_channel_t *channel = switch_core_session_get_channel(*session); switch_channel_state_t state = switch_channel_get_state(channel); struct private_object *tech_pvt = NULL; - + uint8_t running = switch_core_session_running(*session); tech_pvt = switch_core_session_get_private(*session); - - if (tech_pvt) { - if (state < CS_HANGUP) { - switch_channel_hangup(channel, cause); - } - - if (!switch_test_flag(tech_pvt, TFLAG_READY)) { - if (state > CS_INIT && state < CS_HANGUP) { - sofia_on_hangup(*session); - } - switch_core_session_destroy(session); - } + + if (running) { + switch_channel_hangup(channel, cause); } else { + sofia_on_hangup(*session); switch_core_session_destroy(session); } }

1 0

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

08 Mar '07

Author: anthm Date: Thu Mar 8 10:12:01 2007 New Revision: 4481 Modified: freeswitch/trunk/src/switch_rtp.c Log: wip Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Thu Mar 8 10:12:01 2007 @@ -1434,11 +1434,11 @@ if (switch_test_flag(frame, SFF_CNG)) { payload = rtp_session->cng_pt; } else { - payload = frame->payload; - } - - if (payload) { - payload = rtp_session->payload; + payload = frame->payload; + if (payload != rtp_session->payload) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "payload mismatch %d->%d", payload, rtp_session->payload); + payload = rtp_session->payload; + } } if (fwd && !packetize) {

1 0

[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