kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-04-14 08:05:37 +00:00
Code Issues Projects Releases Wiki Activity

clean up

Browse Source 
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@13431 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Brian West 2009-05-24 19:11:36 +00:00
parent a6b7c47dfe
commit 5b5700bebc
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/switch_rtp.c
View File

@ -446,7 +446,6 @@ static void zrtp_event_callback(zrtp_stream_t *stream, unsigned event)
switch_set_flag(rtp_session, SWITCH_ZRTP_FLAG_SECURE_SEND);
switch_set_flag(rtp_session, SWITCH_ZRTP_FLAG_SECURE_RECV);
switch_set_flag(rtp_session, SWITCH_ZRTP_FLAG_SECURE_MITM);
rtp_session->zrtp_mitm_tries = 0;
if (zrtp_status_ok == zrtp_session_get(rtp_session->zrtp_session, &zrtp_session_info)) {
if (zrtp_session_info.sas_is_ready) {
@ -512,6 +511,7 @@ static void zrtp_event_callback(zrtp_stream_t *stream, unsigned event)
switch_clear_flag(rtp_session, SWITCH_ZRTP_FLAG_SECURE_SEND);
switch_clear_flag(rtp_session, SWITCH_ZRTP_FLAG_SECURE_RECV);
switch_clear_flag(rtp_session, SWITCH_ZRTP_FLAG_SECURE_MITM);
rtp_session->zrtp_mitm_tries = 0;
break;
case ZRTP_EVENT_NO_ZRTP:
break;
@ -2260,7 +2260,7 @@ SWITCH_DECLARE(switch_status_t) switch_rtp_zerocopy_read_frame(switch_rtp_t *rtp
if (zrtp_on && switch_test_flag(rtp_session, SWITCH_ZRTP_FLAG_SECURE_MITM) && switch_test_flag(rtp_session, SWITCH_ZRTP_FLAG_SECURE_RECV)) {
frame->extra_data = rtp_session->zrtp_ctx;
switch_set_flag(frame, SFF_ZRTP);
if (rtp_session->zrtp_mitm_tries > 1) {
if (rtp_session->zrtp_mitm_tries > 10) {
switch_clear_flag(rtp_session, SWITCH_ZRTP_FLAG_SECURE_MITM);
rtp_session->zrtp_mitm_tries = 0;
}
@ -2692,8 +2692,11 @@ SWITCH_DECLARE(int) switch_rtp_write_frame(switch_rtp_t *rtp_session, switch_fra
#ifdef ENABLE_ZRTP
if (zrtp_on && switch_test_flag(frame, SFF_ZRTP) && switch_test_flag(rtp_session, SWITCH_ZRTP_FLAG_SECURE_SEND)) {
zrtp_resolve_mitm_call(frame->extra_data, rtp_session->zrtp_ctx);
switch_clear_flag(rtp_session, SWITCH_ZRTP_FLAG_SECURE_MITM);
rtp_session->zrtp_mitm_tries = 0;
if (rtp_session->zrtp_mitm_tries > 10) {
switch_clear_flag(rtp_session, SWITCH_ZRTP_FLAG_SECURE_MITM);
rtp_session->zrtp_mitm_tries = 0;
}
rtp_session->zrtp_mitm_tries++;
}
#endif