Changes in / [494:6e9c1ea44262:495:6e53be78d658] in freeDiameter

Files:

• cmake/Modules/FindGnuTLS.cmake (modified) (1 diff)
• cmake/Modules/FindSCTP.cmake (modified) (1 diff)
• contrib/OpenWRT/HOWTO (modified) (1 diff)
• contrib/OpenWRT/packages/sctp/Makefile (modified) (2 diffs)
• extensions/CMakeLists.txt (modified) (1 diff)
• freeDiameter/CMakeLists.txt (modified) (1 diff)
• include/freeDiameter/CMakeLists.txt (modified) (2 diffs)

cmake/Modules/FindGnuTLS.cmake

@@ -3 +3 @@
 #
 #  GNUTLS_FOUND - True if gnutls found.
-#  GNUTLS_INCLUDE_DIRS - where to find gnutls.h, etc.
+#  GNUTLS_INCLUDE_DIR - where to find gnutls.h, etc.
 #  GNUTLS_LIBRARIES - List of libraries when using gnutls.
 
-if (GNUTLS_INCLUDE_DIRS AND GNUTLS_LIBRARIES)
+if (GNUTLS_INCLUDE_DIR AND GNUTLS_LIBRARIES)
   set(GNUTLS_FIND_QUIETLY TRUE)
-endif (GNUTLS_INCLUDE_DIRS AND GNUTLS_LIBRARIES)
+endif (GNUTLS_INCLUDE_DIR AND GNUTLS_LIBRARIES)
 
 # Include dir

cmake/Modules/FindSCTP.cmake

@@ -3 +3 @@
 #
 #  SCTP_FOUND - system has SCTP
-#  SCTP_INCLUDE_DIRS - the SCTP include directories
+#  SCTP_INCLUDE_DIR - the SCTP include directories
 #  SCTP_LIBRARIES - link these to use SCTP
 
-if (SCTP_INCLUDE_DIRS AND SCTP_LIBRARIES)
+if (SCTP_INCLUDE_DIR AND SCTP_LIBRARIES)
   set(SCTP_FIND_QUIETLY TRUE)
-endif (SCTP_INCLUDE_DIRS AND SCTP_LIBRARIES)
+endif (SCTP_INCLUDE_DIR AND SCTP_LIBRARIES)
 
 # Include dir

contrib/OpenWRT/HOWTO

@@ -90 +90 @@
 We will now describe how to install these dependencies. At the time this HOWTO is written, 
 the OpenWRT repositories contain ipv6, gnutls, pthreads and hostapd. Follow these instruction to
-build them:
+build them.
+
+Alternatively, you can find these packages pre-compiled in the OpenWRT packages repository.
 
 a) GNU TLS packages

contrib/OpenWRT/packages/sctp/Makefile

@@ -23 +23 @@
 
 include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/kernel.mk
 
-define KernelPackage/sctp
-  SUBMENU:=Network Support
-  TITLE:=SCTP support
-  KCONFIG:= CONFIG_IP_SCTP=m
-  FILES:=$(LINUX_DIR)/net/sctp/sctp.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,20,sctp)
-  DEPENDS:=@LINUX_2_6
-endef
-
-define KernelPackage/sctp/description
- Kernel modules for SCTP support
-endef
+#####
+## lksctp library: provides sctp_* functions in user space
+#####
 
 define Package/sctp
@@ -60 +50 @@
 
 $(eval $(call BuildPackage,sctp))
+
+
+#####
+## SCTP kernel support
+#####
+
+include $(INCLUDE_DIR)/kernel.mk
+
+define KernelPackage/sctp
+  SUBMENU:=Network Support
+  TITLE:=SCTP support
+  KCONFIG:=\
+     CONFIG_IP_SCTP=m \
+     CONFIG_LIBCRC32C=m
+  FILES:=\
+     $(LINUX_DIR)/net/sctp/sctp.$(LINUX_KMOD_SUFFIX) \
+     $(LINUX_DIR)/lib/libcrc32c.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=\
+     $(call AutoLoad,30,crc32c libcrc32c,1) \
+     $(call AutoLoad,35,sctp)
+  DEPENDS:=@LINUX_2_6 +kmod-crypto-core +kmod-crypto-misc
+endef
+
+define KernelPackage/sctp/description
+ Kernel modules for SCTP support
+endef
+
 $(eval $(call KernelPackage,sctp))
+

extensions/CMakeLists.txt

@@ -15 +15 @@
 # The extensions include the headers of freeDiameter that contains gnutls objects
 FIND_PACKAGE(GnuTLS REQUIRED)
-INCLUDE_DIRECTORIES(${GNUTLS_INCLUDE_DIRS})
+INCLUDE_DIRECTORIES(${GNUTLS_INCLUDE_DIR})
 find_path(GCRYPT_INCLUDE_DIR NAMES gcrypt.h)
 If ( NOT GCRYPT_INCLUDE_DIR )

freeDiameter/CMakeLists.txt

@@ -51 +51 @@
 # Require GNU TLS for building the daemon
 FIND_PACKAGE(GnuTLS REQUIRED)
-INCLUDE_DIRECTORIES(${GNUTLS_INCLUDE_DIRS})
+INCLUDE_DIRECTORIES(${GNUTLS_INCLUDE_DIR})
 SET(FD_LIBS ${FD_LIBS} ${GNUTLS_LIBRARIES})
 find_path(GCRYPT_INCLUDE_DIR NAMES gcrypt.h)

include/freeDiameter/CMakeLists.txt

@@ -80 +80 @@
         IF(NOT HAVE_NATIVE_SCTP)
                 FIND_PACKAGE(SCTP REQUIRED)
-                INCLUDE_DIRECTORIES(${SCTP_INCLUDE_DIRS})
+                INCLUDE_DIRECTORIES(${SCTP_INCLUDE_DIR})
         ENDIF(NOT HAVE_NATIVE_SCTP)
         # Now check the number of args of this function, since it changed between Ubuntu 9.04 and 9.10
@@ -90 +90 @@
                 }
                 ")
+        SET(CMAKE_REQUIRED_INCLUDES ${SCTP_INCLUDE_DIR})
         SET(CMAKE_REQUIRED_LIBRARIES ${SCTP_LIBRARIES})
         CHECK_C_SOURCE_COMPILES("${CHECK_SCTP_CONNECTX_4_ARGS_SOURCE_CODE}" SCTP_CONNECTX_4_ARGS)