r3486 - in trunk/libmcrypto: m4 source/openssl

[mikma at minisip.org]

Author: mikma
Date: 2007-11-18 17:46:54 +0100 (Sun, 18 Nov 2007)
New Revision: 3486

Modified:
   trunk/libmcrypto/m4/libmcrypto.m4
   trunk/libmcrypto/source/openssl/TlsServerSocket.cxx
Log:
Fix missing support for IPv6 in TlsServerSocket.
Add AM_MINISIP_CHECK_LIBMCRYPTO_DTLS autoconf macro for auto-detecting
DTLS support by libraries/programs using libmcrypto.


Modified: trunk/libmcrypto/m4/libmcrypto.m4
===================================================================
--- trunk/libmcrypto/m4/libmcrypto.m4	2007-11-18 10:56:46 UTC (rev 3485)
+++ trunk/libmcrypto/m4/libmcrypto.m4	2007-11-18 16:46:54 UTC (rev 3486)
@@ -182,3 +182,33 @@
   ])
 # End of AM_MINISIP_CHECK_LIBMCRYPTO
 #
+
+# AM_MINISIP_CHECK_LIBMCRYPTO_DTLS([ACTION-IF-FOUND [,ACTION-IF-NOT-FOUND]]))
+# ------------------------------------
+AC_DEFUN([AM_MINISIP_CHECK_LIBMCRYPTO_DTLS],[ 
+	AC_REQUIRE([AM_MINISIP_CHECK_LIBMCRYPTO]) dnl
+	mcrypto_dtls_found=yes
+
+dnl Checks for DTLS support in libmcrypto
+	mcrypto_save_LIBS="$LIBS"
+	mcrypto_save_LDFLAGS="$LDFLAGS"
+	mcrypto_save_CPPFLAGS="$CPPFLAGS"
+	LDFLAGS="$LDFLAGS $MINISIP_LIBRARY_LDFLAGS"
+	LIBS="$MINISIP_LIBS $LIBS"
+	CPPFLAGS="$CPPFLAGS $MINISIP_CFLAGS"
+	AM_MINISIP_CHECK_WINFUNCS(["DTLSSocket::create(0,0,0)"],,[mcrypto_dtls_found=no],[dnl
+#include<libmcrypto/DtlsSocket.h>
+])
+	LIBS="$mcrypto_save_LIBS"
+	LDFLAGS="$mcrypto_save_LDFLAGS"
+	CPPFLAGS="$mcrypto_save_CPPFLAGS"
+
+	if test "${mcrypto_dtls_found}" = "yes"; then
+		AC_DEFINE([HAVE_DTLS], 1, [Define to 1 if you have libmcrypto with DTLS support])
+		ifelse([$1], , :, [$1])
+	else
+		ifelse([$2], , :, [$2])
+	fi
+  ])
+# End of AM_MINISIP_CHECK_LIBMCRYPTO_DTLS
+#

Modified: trunk/libmcrypto/source/openssl/TlsServerSocket.cxx
===================================================================
--- trunk/libmcrypto/source/openssl/TlsServerSocket.cxx	2007-11-18 10:56:46 UTC (rev 3485)
+++ trunk/libmcrypto/source/openssl/TlsServerSocket.cxx	2007-11-18 16:46:54 UTC (rev 3486)
@@ -72,7 +72,7 @@
 	if( cert_db )
 		ssl_db = (OsslCertificateSet*)*cert_db;
 
-	return new OsslServerSocket( listen_port, ssl_cert, ssl_db );
+	return new OsslServerSocket( use_ipv6, listen_port, ssl_cert, ssl_db );
 }
 
 ServerSocket *TLSServerSocket::create(int32_t listen_port, MRef<Certificate *> cert, MRef<CertificateSet *> cert_db ){