kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-06-01 11:10:24 +00:00
Code Issues Projects Releases Wiki Activity

allow switching from secure to clear and back now

Browse Source 
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@13422 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Michael Jerris 2009-05-21 22:37:15 +00:00
parent ffa7c709e1
commit e9e179cdac
1 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/switch_rtp.c
View File

@ -418,14 +418,11 @@ static void zrtp_security_event_callback(zrtp_stream_t *stream, unsigned event)
{ {
switch_rtp_t *rtp_session = zrtp_stream_get_userdata(stream); switch_rtp_t *rtp_session = zrtp_stream_get_userdata(stream);
zrtp_session_info_t zrtp_session_info; zrtp_session_info_t zrtp_session_info;
zrtp_session_get(rtp_session->zrtp_session, &zrtp_session_info);
switch (event) { switch (event) {
case ZRTP_EVENT_IS_SECURE:
zrtp_session_get(rtp_session->zrtp_session, &zrtp_session_info);
zrtp_log_print_sessioninfo(&zrtp_session_info);
break;
default: default:
zrtp_log_print_sessioninfo(&zrtp_session_info);
break; break;
} }
} }
@ -452,11 +449,19 @@ static void zrtp_protocol_event_callback(zrtp_stream_t *stream, unsigned event)
switch_set_flag(rtp_session, SWITCH_ZRTP_FLAG_SECURE_RECV); switch_set_flag(rtp_session, SWITCH_ZRTP_FLAG_SECURE_RECV);
break; break;
case ZRTP_EVENT_IS_CLIENT_ENROLLMENT: case ZRTP_EVENT_IS_CLIENT_ENROLLMENT:
break;
case ZRTP_EVENT_IS_CLEAR: case ZRTP_EVENT_IS_CLEAR:
break;
case ZRTP_EVENT_IS_INITIATINGSECURE: case ZRTP_EVENT_IS_INITIATINGSECURE:
break;
case ZRTP_EVENT_IS_PENDINGSECURE: case ZRTP_EVENT_IS_PENDINGSECURE:
break;
case ZRTP_EVENT_IS_PENDINGCLEAR: case ZRTP_EVENT_IS_PENDINGCLEAR:
switch_clear_flag(rtp_session, SWITCH_ZRTP_FLAG_SECURE_SEND);
switch_clear_flag(rtp_session, SWITCH_ZRTP_FLAG_SECURE_RECV);
break;
case ZRTP_EVENT_NO_ZRTP: case ZRTP_EVENT_NO_ZRTP:
break;
case ZRTP_EVENT_LOCAL_SAS_UPDATED: case ZRTP_EVENT_LOCAL_SAS_UPDATED:
break; break;
default: default:
@ -1038,12 +1043,12 @@ SWITCH_DECLARE(switch_status_t) switch_rtp_create(switch_rtp_t **new_rtp_session
switch_clear_flag_locked(rtp_session, SWITCH_RTP_FLAG_NOBLOCK); switch_clear_flag_locked(rtp_session, SWITCH_RTP_FLAG_NOBLOCK);
} }
rtp_session->ready = 1;
*new_rtp_session = rtp_session;
#ifdef ENABLE_ZRTP #ifdef ENABLE_ZRTP
if (zrtp_on) { if (zrtp_on) {
rtp_session->zrtp_profile = switch_core_alloc(rtp_session->pool, sizeof(*rtp_session->zrtp_profile)); rtp_session->zrtp_profile = switch_core_alloc(rtp_session->pool, sizeof(*rtp_session->zrtp_profile));
zrtp_profile_defaults(rtp_session->zrtp_profile, zrtp_global); zrtp_profile_defaults(rtp_session->zrtp_profile, zrtp_global);
rtp_session->zrtp_profile->allowclear = 1;
if (zrtp_status_ok != zrtp_session_init(zrtp_global, rtp_session->zrtp_profile, zid, 1, &rtp_session->zrtp_session)) { if (zrtp_status_ok != zrtp_session_init(zrtp_global, rtp_session->zrtp_profile, zid, 1, &rtp_session->zrtp_session)) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error! zRTP INIT Failed\n"); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error! zRTP INIT Failed\n");
@ -1062,6 +1067,9 @@ SWITCH_DECLARE(switch_status_t) switch_rtp_create(switch_rtp_t **new_rtp_session
} }
#endif #endif
rtp_session->ready = 1;
*new_rtp_session = rtp_session;
return SWITCH_STATUS_SUCCESS; return SWITCH_STATUS_SUCCESS;
} }
@ -1851,6 +1859,7 @@ static int rtp_common_read(switch_rtp_t *rtp_session, switch_payload_t *payload_
break; break;
case zrtp_status_drop: case zrtp_status_drop:
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error: zRTP protection drop with code %d\n", stat); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error: zRTP protection drop with code %d\n", stat);
break;
case zrtp_status_fail: case zrtp_status_fail:
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error: zRTP protection fail with code %d\n", stat); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error: zRTP protection fail with code %d\n", stat);
ret = -1; ret = -1;
@ -2440,8 +2449,10 @@ static int rtp_common_write(switch_rtp_t *rtp_session,
break; break;
case zrtp_status_drop: case zrtp_status_drop:
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error: zRTP protection drop with code %d\n", stat); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error: zRTP protection drop with code %d\n", stat);
break;
case zrtp_status_fail: case zrtp_status_fail:
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error: zRTP protection fail with code %d\n", stat); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error: zRTP protection fail with code %d\n", stat);
break;
default: default:
break; break;
} }
@ -2704,8 +2715,10 @@ SWITCH_DECLARE(int) switch_rtp_write_manual(switch_rtp_t *rtp_session,
break; break;
case zrtp_status_drop: case zrtp_status_drop:
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error: zRTP protection drop with code %d\n", stat); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error: zRTP protection drop with code %d\n", stat);
break;
case zrtp_status_fail: case zrtp_status_fail:
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error: zRTP protection fail with code %d\n", stat); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error: zRTP protection fail with code %d\n", stat);
break;
default: default:
break; break;
} }