kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

update 

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@4485 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Anthony Minessale 2007-03-08 22:18:33 +00:00
parent 0cbd3555b6
commit 5ccdfc78f0
2 changed files with 58 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/mod/endpoints/mod_sofia/mod_sofia.c
View File

@ -910,20 +910,25 @@ static void attach_private(switch_core_session_t *session,
static void terminate_session(switch_core_session_t **session, switch_call_cause_t cause, int line) 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); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Term called from line: %d\n", line);
if (*session) { if (*session) {
switch_channel_t *channel = switch_core_session_get_channel(*session); switch_channel_t *channel = switch_core_session_get_channel(*session);
struct private_object *tech_pvt = NULL; switch_channel_state_t state = switch_channel_get_state(channel);
uint8_t running = (uint8_t)switch_core_session_running(*session); struct private_object *tech_pvt = NULL;
tech_pvt = switch_core_session_get_private(*session); uint8_t running = switch_core_session_running(*session);
tech_pvt = switch_core_session_get_private(*session);
if (running) {
switch_channel_hangup(channel, cause); if (running) {
} else { switch_channel_hangup(channel, cause);
sofia_on_hangup(*session); } else {
switch_core_session_destroy(session); if (tech_pvt) {
} sofia_on_hangup(*session);
} }
if (session && *session) {
switch_core_session_destroy(session);
}
}
}
} }
@ -1618,7 +1623,7 @@ static switch_status_t activate_rtp(private_object_t *tech_pvt)
tech_pvt->remote_sdp_audio_ip, tech_pvt->remote_sdp_audio_ip,
tech_pvt->remote_sdp_audio_port, tech_pvt->remote_sdp_audio_port,
tech_pvt->agreed_pt, 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, tech_pvt->codec_ms * 1000,
(switch_rtp_flag_t) flags, (switch_rtp_flag_t) flags,
NULL, NULL,

46
src/switch_rtp.c
View File

@ -685,7 +685,7 @@ static void do_2833(switch_rtp_t *rtp_session)
duration = rtp_session->dtmf_data.out_digit_sofar; 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[2] = (unsigned char) (duration >> 8);
rtp_session->dtmf_data.out_digit_packet[3] = (unsigned char) duration; rtp_session->dtmf_data.out_digit_packet[3] = (unsigned char) duration;
@ -710,6 +710,10 @@ static void do_2833(switch_rtp_t *rtp_session)
rtp_session->dtmf_data.out_digit_seq); 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)) { 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 @@ static void do_2833(switch_rtp_t *rtp_session)
rtp_session->dtmf_data.out_digit_packet[0] = (unsigned char)switch_char_to_rfc2833(rdigit->digit); 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; rtp_session->dtmf_data.out_digit_packet[1] = 7;
/* ts = rtp_session->dtmf_data.timestamp_dtmf += samples; if (rtp_session->timer.timer_interface) {
* rtp_session->dtmf_data.timestamp_dtmf++; 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_seq = rtp_session->last_write_seq;
rtp_session->dtmf_data.out_digit_ssrc = rtp_session->last_write_ssrc; rtp_session->dtmf_data.out_digit_ssrc = rtp_session->last_write_ssrc;
for (x = 0; x < 3; x++) { 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, switch_rtp_write_manual(rtp_session,
rtp_session->dtmf_data.out_digit_packet, rtp_session->dtmf_data.out_digit_packet,
4, 4,
@ -1168,7 +1173,7 @@ static int rtp_common_write(switch_rtp_t *rtp_session, void *data, uint32_t data
stat = srtp_protect(rtp_session->send_ctx, &send_msg->header, &sbytes); stat = srtp_protect(rtp_session->send_ctx, &send_msg->header, &sbytes);
if (stat) { 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; bytes = sbytes;
@ -1297,6 +1302,9 @@ static int rtp_common_write(switch_rtp_t *rtp_session, void *data, uint32_t data
rtp_session->last_write_ts = ntohl(send_msg->header.ts); rtp_session->last_write_ts = ntohl(send_msg->header.ts);
rtp_session->last_write_ssrc = ntohl(send_msg->header.ssrc); rtp_session->last_write_ssrc = ntohl(send_msg->header.ssrc);
rtp_session->last_write_seq = ntohs((u_short)send_msg->header.seq); 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) { if (send) {
switch_socket_sendto(rtp_session->sock, rtp_session->remote_addr, 0, (void*)send_msg, &bytes); switch_socket_sendto(rtp_session->sock, rtp_session->remote_addr, 0, (void*)send_msg, &bytes);
@ -1486,6 +1494,7 @@ SWITCH_DECLARE(int) switch_rtp_write_manual(switch_rtp_t *rtp_session,
switch_frame_flag_t *flags) switch_frame_flag_t *flags)
{ {
rtp_msg_t send_msg = {{0}}; rtp_msg_t send_msg = {{0}};
switch_size_t bytes;
if (!switch_rtp_ready(rtp_session)) { if (!switch_rtp_ready(rtp_session)) {
return -1; return -1;
@ -1504,7 +1513,28 @@ SWITCH_DECLARE(int) switch_rtp_write_manual(switch_rtp_t *rtp_session,
send_msg.header.m = m ? 1 : 0; send_msg.header.m = m ? 1 : 0;
memcpy(send_msg.body, data, datalen); 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) SWITCH_DECLARE(uint32_t) switch_rtp_get_ssrc(switch_rtp_t *rtp_session)