March 2007 - Freeswitch-trunk - FreeSWITCH Mailing Lists

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

09 Mar '07

Author: anthm Date: Fri Mar 9 12:38:58 2007 New Revision: 4491 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Log: send 503 reply on failed alloc Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Fri Mar 9 12:38:58 2007 @@ -4476,6 +4476,7 @@ if (!(tech_pvt = (private_object_t *) switch_core_session_alloc(session, sizeof(private_object_t)))) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Hey where is my memory pool?\n"); + nua_respond(nh, SIP_503_SERVICE_UNAVAILABLE, TAG_END()); terminate_session(&session, SWITCH_CAUSE_SWITCH_CONGESTION, __LINE__); return; }

1 0

[commit] r4490 - in freeswitch/trunk/src: . include
by Freeswitch SVN 09 Mar '07

09 Mar '07

Author: anthm Date: Fri Mar 9 11:30:34 2007 New Revision: 4490 Modified: freeswitch/trunk/src/include/switch_rtp.h freeswitch/trunk/src/switch_rtp.c Log: change names to protect the innocent (make sure to avoid problems) Modified: freeswitch/trunk/src/include/switch_rtp.h ============================================================================== --- freeswitch/trunk/src/include/switch_rtp.h (original) +++ freeswitch/trunk/src/include/switch_rtp.h Fri Mar 9 11:30:34 2007 @@ -68,7 +68,7 @@ \brief create a new RTP session handle \param new_rtp_session a poiter to aim at the new session \param payload the IANA payload number - \param packet_size the default packet_size + \param samples_per_interval the default samples_per_interval \param ms_per_packet time in microseconds per packet \param flags flags to control behaviour \param crypto_key optional crypto key @@ -79,7 +79,7 @@ */ SWITCH_DECLARE(switch_status_t)switch_rtp_create(switch_rtp_t **new_rtp_session, switch_payload_t payload, - uint32_t packet_size, + uint32_t samples_per_interval, uint32_t ms_per_packet, switch_rtp_flag_t flags, char *crypto_key, @@ -95,7 +95,7 @@ \param tx_host the remote address \param tx_port the remote port \param payload the IANA payload number - \param packet_size the default packet_size + \param samples_per_interval the default samples_per_interval \param ms_per_packet time in microseconds per packet \param flags flags to control behaviour \param crypto_key optional crypto key @@ -109,7 +109,7 @@ char *tx_host, switch_port_t tx_port, switch_payload_t payload, - uint32_t packet_size, + uint32_t samples_per_interval, uint32_t ms_per_packet, switch_rtp_flag_t flags, char *crypto_key, @@ -192,18 +192,18 @@ SWITCH_DECLARE(switch_socket_t *)switch_rtp_get_rtp_socket(switch_rtp_t *rtp_session); /*! - \brief Set the default packet size for a given RTP session - \param rtp_session the RTP session to set the packet size on - \param packet_size the new default packet size + \brief Set the default samples per interval for a given RTP session + \param rtp_session the RTP session to set the samples per interval on + \param samples_per_interval the new default samples per interval */ -SWITCH_DECLARE(void) switch_rtp_set_default_packet_size(switch_rtp_t *rtp_session, uint16_t packet_size); +SWITCH_DECLARE(void) switch_rtp_set_default_samples_per_interval(switch_rtp_t *rtp_session, uint16_t samples_per_interval); /*! - \brief Get the default packet size for a given RTP session - \param rtp_session the RTP session to get the packet size from - \return the default packet_size of the RTP session + \brief Get the default samples per interval for a given RTP session + \param rtp_session the RTP session to get the samples per interval from + \return the default samples per interval of the RTP session */ -SWITCH_DECLARE(uint32_t) switch_rtp_get_default_packet_size(switch_rtp_t *rtp_session); +SWITCH_DECLARE(uint32_t) switch_rtp_get_default_samples_per_interval(switch_rtp_t *rtp_session); /*! \brief Set the default payload number for a given RTP session Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Fri Mar 9 11:30:34 2007 @@ -144,9 +144,9 @@ char *user_ice; char *timer_name; switch_time_t last_stun; - uint32_t packet_size; - uint32_t conf_packet_size; - uint32_t rpacket_size; + uint32_t samples_per_interval; + uint32_t conf_samples_per_interval; + uint32_t rsamples_per_interval; uint32_t ms_per_packet; uint32_t remote_port; uint8_t stuncount; @@ -351,7 +351,7 @@ SWITCH_DECLARE(switch_status_t) switch_rtp_create(switch_rtp_t **new_rtp_session, switch_payload_t payload, - uint32_t packet_size, + uint32_t samples_per_interval, uint32_t ms_per_packet, switch_rtp_flag_t flags, char *crypto_key, @@ -366,7 +366,7 @@ *new_rtp_session = NULL; - if (packet_size > SWITCH_RTP_MAX_BUF_LEN) { + if (samples_per_interval > SWITCH_RTP_MAX_BUF_LEN) { *err = "Packet Size Too Large!"; return SWITCH_STATUS_FALSE; } @@ -454,7 +454,7 @@ rtp_session->seq = (uint16_t)rtp_session->send_msg.header.seq; 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->samples_per_interval = rtp_session->conf_samples_per_interval = samples_per_interval; rtp_session->timer_name = switch_core_strdup(rtp_session->pool, timer_name); if (switch_test_flag(rtp_session, SWITCH_RTP_FLAG_SECURE)) { @@ -481,8 +481,8 @@ } if (!switch_strlen_zero(timer_name)) { - if (switch_core_timer_init(&rtp_session->timer, timer_name, ms_per_packet / 1000, 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", timer_name, packet_size, ms_per_packet); + if (switch_core_timer_init(&rtp_session->timer, timer_name, ms_per_packet / 1000, samples_per_interval, rtp_session->pool) == SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Starting timer [%s] %d bytes per %dms\n", timer_name, samples_per_interval, ms_per_packet); } else { memset(&rtp_session->timer, 0, sizeof(rtp_session->timer)); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error starting timer [%s], async RTP disabled\n", timer_name); @@ -500,7 +500,7 @@ char *tx_host, switch_port_t tx_port, switch_payload_t payload, - uint32_t packet_size, + uint32_t samples_per_interval, uint32_t ms_per_packet, switch_rtp_flag_t flags, char *crypto_key, @@ -510,7 +510,7 @@ { switch_rtp_t *rtp_session; - if (switch_rtp_create(&rtp_session, payload, packet_size, ms_per_packet, flags, crypto_key, timer_name, err, pool) != SWITCH_STATUS_SUCCESS) { + if (switch_rtp_create(&rtp_session, payload, samples_per_interval, ms_per_packet, flags, crypto_key, timer_name, err, pool) != SWITCH_STATUS_SUCCESS) { return NULL; } @@ -619,14 +619,14 @@ return rtp_session->sock; } -SWITCH_DECLARE(void) switch_rtp_set_default_packet_size(switch_rtp_t *rtp_session, uint16_t packet_size) +SWITCH_DECLARE(void) switch_rtp_set_default_samples_per_interval(switch_rtp_t *rtp_session, uint16_t samples_per_interval) { - rtp_session->packet_size = packet_size; + rtp_session->samples_per_interval = samples_per_interval; } -SWITCH_DECLARE(uint32_t) switch_rtp_get_default_packet_size(switch_rtp_t *rtp_session) +SWITCH_DECLARE(uint32_t) switch_rtp_get_default_samples_per_interval(switch_rtp_t *rtp_session) { - return rtp_session->packet_size; + return rtp_session->samples_per_interval; } SWITCH_DECLARE(void) switch_rtp_set_default_payload(switch_rtp_t *rtp_session, switch_payload_t payload) @@ -669,7 +669,7 @@ static void do_2833(switch_rtp_t *rtp_session) { switch_frame_flag_t flags = 0; - uint32_t samples = rtp_session->packet_size; + uint32_t samples = rtp_session->samples_per_interval; if (rtp_session->dtmf_data.out_digit_dur > 0) { int x, loops = 1, duration; @@ -825,7 +825,7 @@ 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 * 50))) { + rtp_session->timer.samplecount >= (rtp_session->last_write_ts + (rtp_session->samples_per_interval * 50))) { uint8_t data[2] = {0}; switch_frame_flag_t flags = SFF_NONE; data[0] = 127; @@ -1396,15 +1396,15 @@ } else if (!ts && rtp_session->timer.timer_interface) { uint32_t sc = rtp_session->timer.samplecount; if (rtp_session->last_write_ts == sc) { - rtp_session->ts = sc + rtp_session->packet_size; + rtp_session->ts = sc + rtp_session->samples_per_interval; } else { rtp_session->ts = sc; } } else { - rtp_session->ts += rtp_session->packet_size; + rtp_session->ts += rtp_session->samples_per_interval; } - if (rtp_session->ts > rtp_session->last_write_ts + rtp_session->packet_size || rtp_session->ts == rtp_session->packet_size) { + if (rtp_session->ts > rtp_session->last_write_ts + rtp_session->samples_per_interval || rtp_session->ts == rtp_session->samples_per_interval) { mark++; } @@ -1432,7 +1432,7 @@ } 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; + packetize = (rtp_session->samples_per_interval > 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; @@ -1464,15 +1464,15 @@ } else if (rtp_session->timer.timer_interface) { uint32_t sc = rtp_session->timer.samplecount; if (rtp_session->last_write_ts == sc) { - rtp_session->ts = sc + rtp_session->packet_size; + rtp_session->ts = sc + rtp_session->samples_per_interval; } else { rtp_session->ts = sc; } } else { - rtp_session->ts += rtp_session->packet_size; + rtp_session->ts += rtp_session->samples_per_interval; } - if (rtp_session->ts > rtp_session->last_write_ts + rtp_session->packet_size || rtp_session->ts == rtp_session->packet_size) { + if (rtp_session->ts > rtp_session->last_write_ts + rtp_session->samples_per_interval || rtp_session->ts == rtp_session->samples_per_interval) { mark++; }

1 0

[commit] r4489 - freeswitch/trunk/src
by Freeswitch SVN 09 Mar '07

09 Mar '07

Author: mikej Date: Fri Mar 9 10:22:46 2007 New Revision: 4489 Modified: freeswitch/trunk/src/switch_ivr.c Log: windows build tweak. Modified: freeswitch/trunk/src/switch_ivr.c ============================================================================== --- freeswitch/trunk/src/switch_ivr.c (original) +++ freeswitch/trunk/src/switch_ivr.c Fri Mar 9 10:22:46 2007 @@ -1090,7 +1090,7 @@ uint32_t ilen = 0; switch_size_t olen = 0, llen = 0; switch_frame_t write_frame = {0}; - switch_timer_t timer; + switch_timer_t timer = {0}; switch_core_thread_session_t thread_session; switch_codec_t codec; switch_memory_pool_t *pool = switch_core_session_get_pool(session);

1 0

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

09 Mar '07

Author: anthm Date: Thu Mar 8 20:15:54 2007 New Revision: 4488 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Log: tweak 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 20:15:54 2007 @@ -1647,7 +1647,9 @@ vad_in ? "in" : "", vad_out ? "out" : ""); } - switch_rtp_set_telephony_event(tech_pvt->rtp_session, tech_pvt->te); + if (tech_pvt->te) { + switch_rtp_set_telephony_event(tech_pvt->rtp_session, tech_pvt->te); + } if (tech_pvt->cng_pt) { switch_rtp_set_cng_pt(tech_pvt->rtp_session, tech_pvt->cng_pt); } @@ -2471,6 +2473,9 @@ if (!te && !strcasecmp(map->rm_encoding, "telephone-event")) { te = tech_pvt->te = (switch_payload_t)map->rm_pt; switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Set 2833 dtmf payload to %u\n", te); + if (tech_pvt->rtp_session) { + switch_rtp_set_telephony_event(tech_pvt->rtp_session, tech_pvt->te); + } } if (!cng_pt && !strcasecmp(map->rm_encoding, "CN")) {

1 0

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

08 Mar '07

Author: anthm Date: Thu Mar 8 18:19:50 2007 New Revision: 4487 Modified: freeswitch/trunk/src/switch_rtp.c Log: fix a few stupid issues, you want this version Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Thu Mar 8 18:19:50 2007 @@ -147,7 +147,6 @@ uint32_t packet_size; uint32_t conf_packet_size; uint32_t rpacket_size; - switch_time_t last_read; uint32_t ms_per_packet; uint32_t remote_port; uint8_t stuncount; @@ -788,9 +787,6 @@ 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)) { switch_clear_flag_locked(rtp_session, SWITCH_RTP_FLAG_BREAK); @@ -821,6 +817,10 @@ bytes = sbytes; } + if (bytes && rtp_session->cng_pt && rtp_session->recv_msg.header.pt == rtp_session->cng_pt) { + continue; + } + if (rtp_session->timer.interval) { check = (uint8_t)(switch_core_timer_check(&rtp_session->timer) == SWITCH_STATUS_SUCCESS); @@ -943,7 +943,6 @@ break; } - rtp_session->last_read = switch_time_now(); *payload_type = (switch_payload_t)rtp_session->recv_msg.header.pt; @@ -1392,7 +1391,9 @@ return -1; } - if (!ts && rtp_session->timer.timer_interface) { + if (ts) { + rtp_session->ts = ts; + } else if (!ts && rtp_session->timer.timer_interface) { uint32_t sc = rtp_session->timer.samplecount; if (rtp_session->last_write_ts == sc) { rtp_session->ts = sc + rtp_session->packet_size; @@ -1400,7 +1401,7 @@ rtp_session->ts = sc; } } else { - rtp_session->ts = 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) { @@ -1456,9 +1457,11 @@ data = frame->data; len = frame->datalen; - if (frame->timestamp) { + if (ts) { + rtp_session->ts = ts; + } else if (frame->timestamp) { rtp_session->ts = (uint32_t) frame->timestamp; - } else if (!ts && rtp_session->timer.timer_interface) { + } else if (rtp_session->timer.timer_interface) { uint32_t sc = rtp_session->timer.samplecount; if (rtp_session->last_write_ts == sc) { rtp_session->ts = sc + rtp_session->packet_size; @@ -1466,7 +1469,7 @@ rtp_session->ts = sc; } } else { - rtp_session->ts = 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) { @@ -1530,7 +1533,7 @@ if (switch_socket_sendto(rtp_session->sock, rtp_session->remote_addr, 0, (void*)&send_msg, &bytes) != SWITCH_STATUS_SUCCESS) { - bytes = -1; + return -1; } return (int) bytes;

1 0

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

08 Mar '07

Author: mikej Date: Thu Mar 8 17:58:16 2007 New Revision: 4486 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Log: windows build 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 Mar 8 17:58: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); + unsigned running = switch_core_session_running(*session); tech_pvt = switch_core_session_get_private(*session); if (running) {

1 0

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

08 Mar '07

Author: anthm Date: Thu Mar 8 17:18:33 2007 New Revision: 4485 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c freeswitch/trunk/src/switch_rtp.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 Thu Mar 8 17:18:33 2007 @@ -910,20 +910,25 @@ static void terminate_session(switch_core_session_t **session, switch_call_cause_t cause, int line) { - 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); - struct private_object *tech_pvt = NULL; - uint8_t running = (uint8_t)switch_core_session_running(*session); - tech_pvt = switch_core_session_get_private(*session); - - if (running) { - switch_channel_hangup(channel, cause); - } else { - sofia_on_hangup(*session); - switch_core_session_destroy(session); - } - } + 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); + tech_pvt = switch_core_session_get_private(*session); + + if (running) { + switch_channel_hangup(channel, cause); + } else { + if (tech_pvt) { + sofia_on_hangup(*session); + } + if (session && *session) { + switch_core_session_destroy(session); + } + } + } } @@ -1618,7 +1623,7 @@ tech_pvt->remote_sdp_audio_ip, tech_pvt->remote_sdp_audio_port, tech_pvt->agreed_pt, - tech_pvt->read_codec.implementation->encoded_bytes_per_frame, + tech_pvt->read_codec.implementation->samples_per_frame, tech_pvt->codec_ms * 1000, (switch_rtp_flag_t) flags, NULL, Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Thu Mar 8 17:18:33 2007 @@ -685,7 +685,7 @@ duration = rtp_session->dtmf_data.out_digit_sofar; } - /* ts = rtp_session->dtmf_data.timestamp_dtmf += samples; */ + rtp_session->dtmf_data.out_digit_packet[2] = (unsigned char) (duration >> 8); rtp_session->dtmf_data.out_digit_packet[3] = (unsigned char) duration; @@ -710,6 +710,10 @@ rtp_session->dtmf_data.out_digit_seq); } + + if (loops == 1) { + rtp_session->last_write_seq = 0; + } } if (!rtp_session->dtmf_data.out_digit_dur && rtp_session->dtmf_data.dtmf_queue && switch_queue_size(rtp_session->dtmf_data.dtmf_queue)) { @@ -726,17 +730,18 @@ rtp_session->dtmf_data.out_digit_packet[0] = (unsigned char)switch_char_to_rfc2833(rdigit->digit); rtp_session->dtmf_data.out_digit_packet[1] = 7; - /* ts = rtp_session->dtmf_data.timestamp_dtmf += samples; - * rtp_session->dtmf_data.timestamp_dtmf++; - */ + if (rtp_session->timer.timer_interface) { + rtp_session->dtmf_data.timestamp_dtmf = rtp_session->timer.samplecount; + } else { + rtp_session->dtmf_data.timestamp_dtmf = rtp_session->last_write_ts; + } - rtp_session->dtmf_data.timestamp_dtmf = rtp_session->last_write_ts; rtp_session->dtmf_data.out_digit_seq = rtp_session->last_write_seq; rtp_session->dtmf_data.out_digit_ssrc = rtp_session->last_write_ssrc; for (x = 0; x < 3; x++) { - rtp_session->dtmf_data.out_digit_seq++; + //rtp_session->dtmf_data.out_digit_seq++; switch_rtp_write_manual(rtp_session, rtp_session->dtmf_data.out_digit_packet, 4, @@ -1168,7 +1173,7 @@ stat = srtp_protect(rtp_session->send_ctx, &send_msg->header, &sbytes); if (stat) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "error: srtp unprotection failed with code %d\n", stat); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "error: srtp protection failed with code %d\n", stat); } bytes = sbytes; @@ -1297,6 +1302,9 @@ 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); + if (rtp_session->last_write_seq <= rtp_session->dtmf_data.out_digit_seq) { + send = 0; + } if (send) { switch_socket_sendto(rtp_session->sock, rtp_session->remote_addr, 0, (void*)send_msg, &bytes); @@ -1486,6 +1494,7 @@ switch_frame_flag_t *flags) { rtp_msg_t send_msg = {{0}}; + switch_size_t bytes; if (!switch_rtp_ready(rtp_session)) { return -1; @@ -1504,7 +1513,28 @@ send_msg.header.m = m ? 1 : 0; memcpy(send_msg.body, data, datalen); - return rtp_common_write(rtp_session, (void *) &send_msg, rtp_header_len + datalen, m, payload, NULL); + bytes = rtp_header_len + datalen; + + + if (switch_test_flag(rtp_session, SWITCH_RTP_FLAG_SECURE)) { + int sbytes = (int)bytes; + err_status_t stat; + + stat = srtp_protect(rtp_session->send_ctx, &send_msg.header, &sbytes); + if (stat) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "error: srtp protection failed with code %d\n", stat); + } + + bytes = sbytes; + } + + + if (switch_socket_sendto(rtp_session->sock, rtp_session->remote_addr, 0, (void*)&send_msg, &bytes) != SWITCH_STATUS_SUCCESS) { + bytes = -1; + } + return (int) bytes; + + //return rtp_common_write(rtp_session, (void *) &send_msg, rtp_header_len + datalen, m, payload, NULL); } SWITCH_DECLARE(uint32_t) switch_rtp_get_ssrc(switch_rtp_t *rtp_session)

1 0

[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