zrtp tweaks, more coming

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@15987 d0543943-73ff-0310-b7d9-9358b9ac24b2

diff --git a/patches/zrtp_changes.diff b/patches/zrtp_changes.diff
deleted file mode 100644 (file)
index 6b7ad12..0000000
--- a/patches/zrtp_changes.diff
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: src/switch_rtp.c
-===================================================================
---- src/switch_rtp.c   (revision 14727)
-+++ src/switch_rtp.c   (working copy)
-@@ -549,7 +549,7 @@
-       }
- }
- 
--static void zrtp_logger(int level, const char *data, int len)
-+static void zrtp_logger(int level, const char *data, int len, int offset)
- {
-       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s", data);
- }
-@@ -598,7 +598,7 @@
-               zrtp_config.cb.misc_cb.on_send_packet = zrtp_send_rtp_callback;
-               zrtp_config.cb.event_cb.on_zrtp_security_event = zrtp_event_callback;
-               
--              zrtp_log_set_log_engine(zrtp_logger);
-+              zrtp_log_set_log_engine((zrtp_log_engine*)zrtp_logger);
-               zrtp_log_set_level(4);
-               if (zrtp_status_ok != zrtp_init(&zrtp_config, &zrtp_global)) {
-                       abort();

diff --git a/src/switch_rtp.c b/src/switch_rtp.c
index f5525d83a9c7f3584c20ff4e3ac6392e501f13ea..fac5a0970440e72ea8cf72d03c96ca4053668d82 100644 (file)
--- a/src/switch_rtp.c
+++ b/src/switch_rtp.c
@@ -551,7 +551,7 @@ static void zrtp_event_callback(zrtp_stream_t *stream, unsigned event)
        }
 }
 
-static void zrtp_logger(int level, const char *data, int len)
+static void zrtp_logger(int level, const char *data, int len, int offset)
 {
        switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s", data);
 }
@@ -600,7 +600,7 @@ SWITCH_DECLARE(void) switch_rtp_init(switch_memory_pool_t *pool)
                zrtp_config.cb.misc_cb.on_send_packet = zrtp_send_rtp_callback;
                zrtp_config.cb.event_cb.on_zrtp_security_event = zrtp_event_callback;
                
-               zrtp_log_set_log_engine(zrtp_logger);
+               zrtp_log_set_log_engine((zrtp_log_engine*)zrtp_logger);
                zrtp_log_set_level(4);
                if (zrtp_status_ok == zrtp_init(&zrtp_config, &zrtp_global)) {