r3311 - in trunk: libmcrypto/include/libmcrypto libmcrypto/source libmnetutil/include/libmnetutil

[erik at minisip.org]

Author: erik
Date: 2007-06-13 19:47:42 +0200 (Wed, 13 Jun 2007)
New Revision: 3311

Modified:
   trunk/libmcrypto/include/libmcrypto/TlsSrpSocket.h
   trunk/libmcrypto/source/TlsSrpSocket.cxx
   trunk/libmnetutil/include/libmnetutil/Socket.h
Log:

 * TlsSrpSocket left "fd" uninitialized (t had it's own "fd").

 * TlsSrpSocket did not set the "type" attribute to any value.



Modified: trunk/libmcrypto/include/libmcrypto/TlsSrpSocket.h
===================================================================
--- trunk/libmcrypto/include/libmcrypto/TlsSrpSocket.h	2007-06-13 17:42:32 UTC (rev 3310)
+++ trunk/libmcrypto/include/libmcrypto/TlsSrpSocket.h	2007-06-13 17:47:42 UTC (rev 3311)
@@ -41,7 +41,6 @@
  private:
    void TlsSrpSocketSrp_init(std::string addrs, int32_t port, std::string user, std::string pass);
    gnutls_session_t session;
-   int fd;
    gnutls_srp_client_credentials_t srp_cred;
    
 };

Modified: trunk/libmcrypto/source/TlsSrpSocket.cxx
===================================================================
--- trunk/libmcrypto/source/TlsSrpSocket.cxx	2007-06-13 17:42:32 UTC (rev 3310)
+++ trunk/libmcrypto/source/TlsSrpSocket.cxx	2007-06-13 17:47:42 UTC (rev 3311)
@@ -63,6 +63,7 @@
 /* constructor*/
 TlsSrpSocket::TlsSrpSocket(string addrs, int32_t port, string user, string pass)
 {
+	type = SOCKET_TYPE_TLSSRP;
 	TlsSrpSocket::TlsSrpSocketSrp_init(addrs, port, user, pass);
 }
 

Modified: trunk/libmnetutil/include/libmnetutil/Socket.h
===================================================================
--- trunk/libmnetutil/include/libmnetutil/Socket.h	2007-06-13 17:42:32 UTC (rev 3310)
+++ trunk/libmnetutil/include/libmnetutil/Socket.h	2007-06-13 17:47:42 UTC (rev 3311)
@@ -29,6 +29,7 @@
 #define SOCKET_TYPE_STREAM      0x10
 #define SOCKET_TYPE_TCP         0x11
 #define SOCKET_TYPE_TLS         0x12
+#define SOCKET_TYPE_TLSSRP      0x13
 
 #define SOCKET_TYPE_UDP         0x20