r2751 - in trunk/libminisip: include/libminisip/mediahandler include/libminisip/zrtp source/mediahandler source/zrtp

[erik at minisip.org]

Author: erik
Date: 2006-09-08 12:35:52 +0200 (Fri, 08 Sep 2006)
New Revision: 2751

Modified:
   trunk/libminisip/include/libminisip/mediahandler/MediaStream.h
   trunk/libminisip/include/libminisip/zrtp/Base32.h
   trunk/libminisip/include/libminisip/zrtp/ZrtpHostBridgeMinisip.h
   trunk/libminisip/source/mediahandler/MediaStream.cxx
   trunk/libminisip/source/zrtp/ZrtpHostBridgeMinisip.cxx
Log:

 * Compile error fixes: Fixes compile problems in the zrtp code (a sub
   class of MObject failed in the MObject::decrease. This kind of problems 
   seems to often depend on what compiler/compiler version is used),
   and was solved by moving the implementation of the methods from the
   .h file to the corresponding .cxx.
   This occured when libminisip was configured with "--enable-zrtp" and
   without "--enable-debug".

 * Compile error fix: stdint.h was not included when using uint8_t

Note: enabling or disabling zrtp changes the API to libminisip...




Modified: trunk/libminisip/include/libminisip/mediahandler/MediaStream.h
===================================================================
--- trunk/libminisip/include/libminisip/mediahandler/MediaStream.h	2006-09-07 12:58:03 UTC (rev 2750)
+++ trunk/libminisip/include/libminisip/mediahandler/MediaStream.h	2006-09-08 10:35:52 UTC (rev 2751)
@@ -135,7 +135,7 @@
 		 * TODO: make it a list because the receiver may have several hostbridges
 		 * in case of e.g. conferences.
 		 */
-		virtual void setZrtpHostBridge(MRef<ZrtpHostBridgeMinisip *> zsb) {zrtpBridge = zsb; };
+		virtual void setZrtpHostBridge(MRef<ZrtpHostBridgeMinisip *> zsb);
 
 		/**
 		 * Get the ZRTP implementation host brigde for this media stream.
@@ -143,7 +143,7 @@
 		 * @return zsb
 		 *    The pointer to the host bridge object for this RTP session.
 		 */
-		virtual MRef<ZrtpHostBridgeMinisip *> getZrtpHostBridge() {return zrtpBridge; };
+		virtual MRef<ZrtpHostBridgeMinisip *> getZrtpHostBridge();
 
 		/**
 		 * Used by ZRTP host bridge to set the crypto context for this RTP session.

Modified: trunk/libminisip/include/libminisip/zrtp/Base32.h
===================================================================
--- trunk/libminisip/include/libminisip/zrtp/Base32.h	2006-09-07 12:58:03 UTC (rev 2750)
+++ trunk/libminisip/include/libminisip/zrtp/Base32.h	2006-09-08 10:35:52 UTC (rev 2751)
@@ -26,6 +26,10 @@
  *	@author Werner Dittmann <Werner.Dittmann at t-online.de>
  */
 
+#include<libminisip/libminisip_config.h>
+
+#include<stdint.h>
+
 #include <iostream>
 #include <cstdlib>
 
@@ -33,6 +37,7 @@
 #include <assert.h>
 #include <stddef.h>
 
+
 using namespace std;
 
 extern int divceil(int a, int b);

Modified: trunk/libminisip/include/libminisip/zrtp/ZrtpHostBridgeMinisip.h
===================================================================
--- trunk/libminisip/include/libminisip/zrtp/ZrtpHostBridgeMinisip.h	2006-09-07 12:58:03 UTC (rev 2750)
+++ trunk/libminisip/include/libminisip/zrtp/ZrtpHostBridgeMinisip.h	2006-09-08 10:35:52 UTC (rev 2751)
@@ -110,11 +110,11 @@
     void start();
     void stop();
 
-    void setReceiver(MRef<MediaStreamReceiver *> r) { rStream = r; };
+    void setReceiver(MRef<MediaStreamReceiver *> r);
     void setSsrcReceiver(uint32_t ssrc)             { receiverSsrc = ssrc; };
     uint32_t getSsrcReceiver()                      { return receiverSsrc; };
 
-    void setSender(MRef<MediaStreamSender *> s)     { sStream = s; };
+    void setSender(MRef<MediaStreamSender *> s);
     void setSsrcSender(uint32_t ssrc)               { senderSsrc = ssrc; };
     uint32_t getSsrcSender()                        { return senderSsrc; };
 

Modified: trunk/libminisip/source/mediahandler/MediaStream.cxx
===================================================================
--- trunk/libminisip/source/mediahandler/MediaStream.cxx	2006-09-07 12:58:03 UTC (rev 2750)
+++ trunk/libminisip/source/mediahandler/MediaStream.cxx	2006-09-08 10:35:52 UTC (rev 2751)
@@ -261,6 +261,15 @@
 
     kaLock.unlock();
 }
+
+void MediaStream::setZrtpHostBridge(MRef<ZrtpHostBridgeMinisip *> zsb) {
+	zrtpBridge = zsb; 
+}
+
+MRef<ZrtpHostBridgeMinisip *> MediaStream::getZrtpHostBridge() {
+	return zrtpBridge; 
+}
+
 #endif
 
 MediaStreamReceiver::MediaStreamReceiver( MRef<Media *> media,

Modified: trunk/libminisip/source/zrtp/ZrtpHostBridgeMinisip.cxx
===================================================================
--- trunk/libminisip/source/zrtp/ZrtpHostBridgeMinisip.cxx	2006-09-07 12:58:03 UTC (rev 2750)
+++ trunk/libminisip/source/zrtp/ZrtpHostBridgeMinisip.cxx	2006-09-08 10:35:52 UTC (rev 2751)
@@ -80,6 +80,14 @@
     delete zrtpEngine;
 }
 
+void ZrtpHostBridgeMinisip::setReceiver(MRef<MediaStreamReceiver *> r) { 
+	rStream = r; 
+}
+
+void ZrtpHostBridgeMinisip::setSender(MRef<MediaStreamSender *> s) { 
+	sStream = s; 
+}
+
 void ZrtpHostBridgeMinisip::start() {
     ZIDFile *zid = ZIDFile::getInstance();
     const uint8_t* ownZid = zid->getZid();