A small fix in the ZrtpCWrapper to initialize and use the ZRTP master…

… instance in case of multi-stream usage

A fix of the previous commit :-) .

Does not affect the main ZRTP usage, only projects that use the wrapper such as PJSIP or Gstreamer projects.

CMakeLists.txt

@@ -14,9 +14,9 @@ PROJECT(libzrtpcpp)
 
 SET(CPACK_PACKAGE_VERSION_MAJOR 4)
 SET(CPACK_PACKAGE_VERSION_MINOR 6)
-SET(CPACK_PACKAGE_VERSION_PATCH 1)
+SET(CPACK_PACKAGE_VERSION_PATCH 2)
 
-set (VERSION 4.6.1)
+set (VERSION 4.6.2)
 set (SOVERSION 4)
 
 # Define supported command line parameters.

NEWS.md

@@ -1,3 +1,9 @@
+## GNU ZRTP 4.6.2 ##
+
+A small fix in the ZrtpCWrapper to fix an issue within 4.6.1
+;-)
+
+
 ## GNU ZRTP 4.6.1 ##
 
 A small fix in the ZrtpCWrapper to initialize and use the ZRTP 

zrtp/ZrtpCWrapper.cpp

@@ -212,8 +212,8 @@ char* zrtp_getMultiStrParams(ZrtpContext* zrtpContext, int32_t *length) {
     return retval;
 }
 
-void zrtp_setMultiStrParams(ZrtpContext* zrtpContext, char* parameters, int32_t length) {
-    if (!zrtpContext || !zrtpContext->zrtpEngine || !zrtpContext->zrtpMaster)
+void zrtp_setMultiStrParams(ZrtpContext* zrtpContext, char* parameters, int32_t length, ZrtpContext* master) {
+    if (!zrtpContext || !zrtpContext->zrtpEngine || !master)
         return;
 
     if (parameters == NULL)
@@ -222,7 +222,7 @@ void zrtp_setMultiStrParams(ZrtpContext* zrtpContext, char* parameters, int32_t
     std::string str("");
     str.assign(parameters, length); // set chars (bytes) to the string
 
-    zrtpContext->zrtpEngine->setMultiStrParams(str, zrtpContext->zrtpMaster);
+    zrtpContext->zrtpEngine->setMultiStrParams(str, master->zrtpMaster);
 }
 
 int32_t zrtp_isMultiStream(ZrtpContext* zrtpContext) {

zrtp/libzrtpcpp/ZrtpCWrapper.h

@@ -843,7 +843,7 @@ extern "C"
      * and restriction how and when to use multi-stream mode.
      *
      * @param zrtpContext
-     *    Pointer to the opaque ZrtpContext structure.
+     *    Pointer to the opaque ZrtpContext structure of the master ZRTP session.
      * @param length
      *    Pointer to an integer that receives the length of the char array
      * @return