]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
fix zrtp build
authorAnthony Minessale <anthm@freeswitch.org>
Mon, 1 Apr 2013 14:13:39 +0000 (09:13 -0500)
committerAnthony Minessale <anthm@freeswitch.org>
Mon, 1 Apr 2013 14:13:39 +0000 (09:13 -0500)
src/switch_rtp.c

index e4dea53806d4faf81bbe160a746bd96772e5e9ee..605053b4df5b93a840586132e107b0cb9d05f632 100644 (file)
@@ -1078,7 +1078,7 @@ static void zrtp_event_callback(zrtp_stream_t *stream, unsigned event)
        switch_event_t *fsevent = NULL;
        const char *type;
 
-       type = rtp_type(rtp_session)
+       type = rtp_type(rtp_session);
 
        switch (event) {
        case ZRTP_EVENT_IS_SECURE:
@@ -5005,15 +5005,15 @@ SWITCH_DECLARE(switch_status_t) switch_rtp_zerocopy_read_frame(switch_rtp_t *rtp
                                                                switch_mutex_lock(other_rtp_session->read_mutex);
                                                                if (zrtp_status_ok == zrtp_session_get(other_rtp_session->zrtp_session, &zrtp_session_info)) {
                                                                        if (rtp_session->zrtp_mitm_tries > ZRTP_MITM_TRIES) {
-                                                                               switch_clear_flag(other_rtp_session, SWITCH_ZRTP_FLAG_SECURE_MITM_RECV);
-                                                                               switch_clear_flag(other_rtp_session, SWITCH_ZRTP_FLAG_SECURE_MITM_SEND);
+                                                                               switch_rtp_clear_flag(other_rtp_session, SWITCH_ZRTP_FLAG_SECURE_MITM_RECV);
+                                                                               switch_rtp_clear_flag(other_rtp_session, SWITCH_ZRTP_FLAG_SECURE_MITM_SEND);
                                                                                rtp_session->flags[SWITCH_ZRTP_FLAG_SECURE_MITM_RECV] = 0;
                                                                                rtp_session->flags[SWITCH_ZRTP_FLAG_SECURE_MITM_SEND] = 0;
                                                                        } else if (zrtp_status_ok == zrtp_resolve_mitm_call(other_rtp_session->zrtp_stream, rtp_session->zrtp_stream)) {
                                                                                rtp_session->flags[SWITCH_ZRTP_FLAG_SECURE_MITM_RECV] = 0;
                                                                                rtp_session->flags[SWITCH_ZRTP_FLAG_SECURE_MITM_SEND] = 0;
-                                                                               switch_clear_flag(other_rtp_session, SWITCH_ZRTP_FLAG_SECURE_MITM_RECV);
-                                                                               switch_clear_flag(other_rtp_session, SWITCH_ZRTP_FLAG_SECURE_MITM_SEND);
+                                                                               switch_rtp_clear_flag(other_rtp_session, SWITCH_ZRTP_FLAG_SECURE_MITM_RECV);
+                                                                               switch_rtp_clear_flag(other_rtp_session, SWITCH_ZRTP_FLAG_SECURE_MITM_SEND);
                                                                                rtp_session->zrtp_mitm_tries++;
                                                                        }
                                                                }
@@ -5589,13 +5589,13 @@ SWITCH_DECLARE(int) switch_rtp_write_frame(switch_rtp_t *rtp_session, switch_fra
                                                                if (rtp_session->zrtp_mitm_tries > ZRTP_MITM_TRIES) {
                                                                        rtp_session->flags[SWITCH_ZRTP_FLAG_SECURE_MITM_RECV] = 0;
                                                                        rtp_session->flags[SWITCH_ZRTP_FLAG_SECURE_MITM_SEND] = 0;
-                                                                       switch_clear_flag(other_rtp_session, SWITCH_ZRTP_FLAG_SECURE_MITM_RECV);
-                                                                       switch_clear_flag(other_rtp_session, SWITCH_ZRTP_FLAG_SECURE_MITM_SEND);
+                                                                       switch_rtp_clear_flag(other_rtp_session, SWITCH_ZRTP_FLAG_SECURE_MITM_RECV);
+                                                                       switch_rtp_clear_flag(other_rtp_session, SWITCH_ZRTP_FLAG_SECURE_MITM_SEND);
                                                                } else if (zrtp_status_ok == zrtp_resolve_mitm_call(other_rtp_session->zrtp_stream, rtp_session->zrtp_stream)) {
                                                                        rtp_session->flags[SWITCH_ZRTP_FLAG_SECURE_MITM_RECV] = 0;
                                                                        rtp_session->flags[SWITCH_ZRTP_FLAG_SECURE_MITM_SEND] = 0;
-                                                                       switch_clear_flag(other_rtp_session, SWITCH_ZRTP_FLAG_SECURE_MITM_RECV);
-                                                                       switch_clear_flag(other_rtp_session, SWITCH_ZRTP_FLAG_SECURE_MITM_SEND);
+                                                                       switch_rtp_clear_flag(other_rtp_session, SWITCH_ZRTP_FLAG_SECURE_MITM_RECV);
+                                                                       switch_rtp_clear_flag(other_rtp_session, SWITCH_ZRTP_FLAG_SECURE_MITM_SEND);
                                                                        rtp_session->zrtp_mitm_tries++;
                                                                }
                                                                rtp_session->zrtp_mitm_tries++;