Changes in / [1562:6219359a36a9:1558:932fca1cbbe4] in freeDiameter

Files:

• CMakeLists.txt (modified) (1 diff)
• INSTALL.Fedora (modified) (1 diff)
• INSTALL.FreeBSD (modified) (1 diff)
• INSTALL.OSX (modified) (1 diff)
• INSTALL.OpenSUSE (modified) (1 diff)
• INSTALL.Ubuntu (modified) (3 diffs)
• INSTALL.pkgsrc (modified) (1 diff)
• cmake/Modules/FindIDNA.cmake (added)
• contrib/RPM/freeDiameter.spec (modified) (1 diff)
• contrib/debian/control (modified) (1 diff)
• contrib/nightly_tests/prereqs.fedora (modified) (1 diff)
• include/freeDiameter/CMakeLists.txt (modified) (3 diffs)
• libfdcore/CMakeLists.txt (modified) (1 diff)
• libfdcore/p_ce.c (modified) (1 diff)
• libfdproto/CMakeLists.txt (modified) (2 diffs)
• libfdproto/messages.c (modified) (2 diffs)
• libfdproto/ostr.c (modified) (3 diffs)

CMakeLists.txt

@@ -21 +21 @@
 
 # CMake version
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8.12)
+CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
 
 # Location of additional CMake modules

INSTALL.Fedora

@@ -4 +4 @@
 
 Dependencies on Fedora 13 (from minimal system):
-# yum install cmake make gcc gcc-c++ flex bison lksctp-tools-devel gnutls-devel libgcrypt-devel libidn2-devel
+# yum install cmake make gcc gcc-c++ flex bison lksctp-tools-devel gnutls-devel libgcrypt-devel libidn-devel
 
 In addition, if you have not already retrieved the latest source:

INSTALL.FreeBSD

@@ -35 +35 @@
 4) Install 'flex' and 'bison', same way.
 
-5) Install 'gnutls' and 'libidn2', same way also.
+5) Install 'gnutls' and 'libidn', same way also.
 
 6) Retrieve freeDiameter source code:

INSTALL.OSX

@@ -40 +40 @@
 
 2) Install dependencies:
-    $ brew install mercurial cmake gnutls libgcrypt postgres mysql libidn2
+    $ brew install mercurial cmake gnutls libgcrypt postgres mysql libidn
 
    Notes:
-    * GNU IDN (libidn2) is optional, see below
+    * GNU IDN (libidn) is optional, see below
     * When libusrsctp package is available, you can use it as well.
         However, it requires some rework on the source code as libusrsctp is not fully

INSTALL.OpenSUSE

@@ -4 +4 @@
 
 Dependencies on OpenSUSE 11.3 (from minimal server system installation):
-# zypper install cmake make gcc gcc-c++ flex bison lksctp-tools-devel libgnutls-devel libgcrypt-devel libidn2-devel
+# zypper install cmake make gcc gcc-c++ flex bison lksctp-tools-devel libgnutls-devel libgcrypt-devel libidn-devel
 # zypper install mercurial
 

INSTALL.Ubuntu

@@ -18 +18 @@
 
 The following packages are required to compile freeDiameter from source:
- cmake make gcc g++ flex bison libsctp1 libsctp-dev libgnutls-dev libgcrypt-dev libidn2-dev
+ cmake make gcc g++ flex bison libsctp1 libsctp-dev libgnutls-dev libgcrypt-dev libidn11-dev
  
-(note that libidn2 and libsctp can be avoided by defining DISABLE_SCTP and DIAMID_IDNA_REJECT)
+(note that libidn and libsctp can be avoided by defining DISABLE_SCTP and DIAMID_IDNA_REJECT)
  
 Additionnaly, these ones may be useful:
@@ -45 +45 @@
 
 # Install the dependencies for building the source:
-sudo apt-get -y install mercurial cmake make gcc g++ bison flex libsctp-dev libgnutls-dev libgcrypt-dev libidn2-dev ssl-cert debhelper fakeroot \
+sudo apt-get -y install mercurial cmake make gcc g++ bison flex libsctp-dev libgnutls-dev libgcrypt-dev libidn11-dev ssl-cert debhelper fakeroot \
    libpq-dev libmysqlclient-dev libxml2-dev swig python-dev
    
@@ -85 +85 @@
 
 1) Install all packages dependencies
-# sudo apt-get install mercurial cmake make gcc g++ bison flex libsctp-dev libgnutls-dev libgcrypt-dev libidn2-dev
+# sudo apt-get install mercurial cmake make gcc g++ bison flex libsctp-dev libgnutls-dev libgcrypt-dev libidn11-dev
 
 2) (OPTION) If you will compile modules that require postgresql, also install:

INSTALL.pkgsrc

@@ -9 +9 @@
 If you want to build and install freeDiameter from the repository,
 you'll need to install:
-        pkg_add bison pkg-config libidn2 gnutls libgcrypt mercurial
+        pkg_add bison pkg-config libidn gnutls libgcrypt mercurial
 and follow the usual installation note.
 

contrib/RPM/freeDiameter.spec

@@ -11 +11 @@
 
 BuildRequires: cmake make gcc gcc-c++ flex bison lksctp-tools-devel 
-BuildRequires: gnutls-devel libgcrypt-devel libidn2-devel
+BuildRequires: gnutls-devel libgcrypt-devel libidn-devel
 BuildRequires: mercurial        
 Requires: lksctp-tools  

contrib/debian/control

@@ -5 +5 @@
 Build-Depends: debhelper ( >= 7.3.9),
  cmake, make, gcc, g++, bison, flex,
- libsctp-dev, libgnutls-dev | gnutls-dev, libidn2-dev,
+ libsctp-dev, libgnutls-dev | gnutls-dev, libidn11-dev,
  libpq-dev, libmysqlclient-dev, libxml2-dev, swig, python-dev,
  libgcrypt11-dev | libgcrypt20-dev

contrib/nightly_tests/prereqs.fedora

@@ -4 +4 @@
 postgresql-server postgresql-devel
 mysql-server mysql-devel
-libxml2 libxml2-devel libidn2-devel
+libxml2 libxml2-devel libidn-devel
 swig python-devel
 

include/freeDiameter/CMakeLists.txt

@@ -2 +2 @@
 
 Project("freeDiameter includes directory" C)
-
-INCLUDE(FindPkgConfig)
 
 ########################
@@ -138 +136 @@
 SET(SCTP_LIBRARIES ${SCTP_LIBRARIES} PARENT_SCOPE)
 
-# IDNA process: we use GNU libidn2
+# IDNA process: we use libidn from GNU (unless the function & header files are included in libc)
 IF(NOT DIAMID_IDNA_IGNORE AND NOT DIAMID_IDNA_REJECT)
-        PKG_CHECK_MODULES(IDNA libidn2)
-        IF(NOT IDNA_FOUND)
-                MESSAGE(SEND_ERROR "Unable to find libidn2, please install libidn2-dev or equivalent, or set DIAMID_IDNA_IGNORE or DIAMID_IDNA_REJECT")
-        ENDIF()
+        FIND_PACKAGE(IDNA)
+        SET(CHECK_IDNA_SOURCE_CODE "
+                #include <idna.h>
+                int main() {
+                   return idna_to_ascii_8z(NULL, NULL, 0);
+                }
+                ")
+        SET(CMAKE_REQUIRED_INCLUDES ${IDNA_INCLUDE_DIR})
+        SET(CMAKE_REQUIRED_LIBRARIES ${IDNA_LIBRARIES})
+        CHECK_C_SOURCE_COMPILES("${CHECK_IDNA_SOURCE_CODE}" HAS_IDNA_SUPPORT)
+        IF(NOT HAS_IDNA_SUPPORT)
+                MESSAGE(SEND_ERROR "Unable to find idna.h header or idna_to_ascii_8z function, please install libidn-dev or equivalent, or set DIAMID_IDNA_IGNORE or DIAMID_IDNA_REJECT")
+        ENDIF(NOT HAS_IDNA_SUPPORT)
 ELSE (NOT DIAMID_IDNA_IGNORE  AND NOT DIAMID_IDNA_REJECT)
         MESSAGE(STATUS "Non-default Internationalized Domain Names (IDN) behavior selected (no stringprep).")
 ENDIF(NOT DIAMID_IDNA_IGNORE  AND NOT DIAMID_IDNA_REJECT)
+SET(IDNA_INCLUDE_DIR ${IDNA_INCLUDE_DIR} PARENT_SCOPE)
+SET(IDNA_LIBRARIES ${IDNA_LIBRARIES} PARENT_SCOPE)
 
 
@@ -212 +221 @@
 
 # LFDPROTO_LIBS = libraries required by the libfdproto.
-SET(LFDPROTO_LIBS ${CLOCK_GETTIME_LIBS} ${CMAKE_THREAD_LIBS_INIT} ${IDNA_LINK_LIBRARIES} PARENT_SCOPE)
+SET(LFDPROTO_LIBS ${CLOCK_GETTIME_LIBS} ${CMAKE_THREAD_LIBS_INIT} ${IDNA_LIBRARIES} PARENT_SCOPE)
 # And includes paths
-SET(LFDPROTO_INCLUDES ${IDNA_INCLUDE_DIRS} PARENT_SCOPE)
+SET(LFDPROTO_INCLUDES ${IDNA_INCLUDE_DIR} PARENT_SCOPE)
 # Dependencies: the libraries required by any code linking to libfdproto.
 SET(LFDPROTO_LINK_INTERFACES ${CMAKE_THREAD_LIBS_INIT} PARENT_SCOPE)

libfdcore/CMakeLists.txt

@@ -3 +3 @@
 
 # Configuration for newer cmake
-cmake_policy(VERSION 2.8.12)
+cmake_policy(VERSION 2.6)
+if (POLICY CMP0022)
+        cmake_policy(SET CMP0022 OLD)
+endif (POLICY CMP0022)
 
 # Configuration parser

libfdcore/p_ce.c

@@ -337 +337 @@
                                 }
                                 
-                                /* Origin-Realm is empty */
-                                if (hdr->avp_value->os.len == 0) {
-                                        error->pei_errcode = "DIAMETER_INVALID_AVP_VALUE";
-                                        error->pei_message = "Your Origin-Realm is empty.";
-                                        error->pei_avp = avp;
-                                        return EINVAL;
-                                }
-
                                 /* Save the value */
                                 CHECK_MALLOC(  peer->p_hdr.info.runtime.pir_realm = os0dup( hdr->avp_value->os.data, hdr->avp_value->os.len )  );

libfdproto/CMakeLists.txt

@@ -3 +3 @@
 
 # Configuration for newer cmake
-cmake_policy(VERSION 2.8.12)
+cmake_policy(VERSION 2.6)
+if (POLICY CMP0022)
+        cmake_policy(SET CMP0022 OLD)
+endif (POLICY CMP0022)
 
 # List of source files for the library
@@ -28 +31 @@
 SET(LFDPROTO_SRC ${LFDPROTO_SRC} PARENT_SCOPE)
 
+# Include path
+INCLUDE_DIRECTORIES(${LFDPROTO_INCLUDES})
+
 # Build as a shared library
 ADD_LIBRARY(libfdproto SHARED ${LFDPROTO_SRC})
-
-# Include path
-TARGET_INCLUDE_DIRECTORIES(libfdproto PRIVATE /a/b/c ${LFDPROTO_INCLUDES})
 
 ADD_DEPENDENCIES(libfdproto version_information)

libfdproto/messages.c

@@ -1777 +1777 @@
         if (avp->avp_model == NULL) {
                 /* In the case where we don't know the type of AVP, just copy the raw data or source */
-                /* there might be no data if the AVP is empty */
+                CHECK_PARAMS( avp->avp_source || avp->avp_rawdata );
                 
                 if ( avp->avp_rawdata != NULL ) {
@@ -1783 +1783 @@
                         memcpy(&buffer[*offset], avp->avp_rawdata, avp->avp_rawlen);
                         *offset += PAD4(avp->avp_rawlen);
-                } else if ( avp->avp_source != NULL ) {
+                } else {
                         /* the message was not parsed completely */
                         size_t datalen = avp->avp_public.avp_len - GETAVPHDRSZ(avp->avp_public.avp_flags);

libfdproto/ostr.c

@@ -37 +37 @@
 
 #if (!defined(DIAMID_IDNA_IGNORE) && !defined(DIAMID_IDNA_REJECT))
-/* Process IDNA with stringprep -- See RFC5890 -- and libidn2 documentation... */
-#include <idn2.h> /* idn2_to_ascii_8z() */
+/* Process IDNA with stringprep -- See RFC5890 -- and libidn documentation... */
+#include <idna.h> /* idna_to_ascii_8z() */
 #endif /* !defined(DIAMID_IDNA_IGNORE) && !defined(DIAMID_IDNA_REJECT) */
 
@@ -227 +227 @@
                 }
                 
-                ret = idn2_to_ascii_8z ( *id, &processed, IDNA_USE_STD3_ASCII_RULES );
-                if (ret == IDN2_OK) {
+                ret = idna_to_ascii_8z ( *id, &processed, IDNA_USE_STD3_ASCII_RULES );
+                if (ret == IDNA_SUCCESS) {
                         TRACE_DEBUG(INFO, "The string '%s' is not a valid DiameterIdentity, it was changed to '%s'", *id, processed);
                         if (memory == 0)
@@ -236 +236 @@
                         /* Done! */
                 } else {
-                        TRACE_DEBUG(INFO, "The string '%s' is not a valid DiameterIdentity and cannot be sanitized: %s", *id, idn2_strerror (ret));
+                        TRACE_DEBUG(INFO, "The string '%s' is not a valid DiameterIdentity and cannot be sanitanized: %s", *id, idna_strerror (ret));
                         return EINVAL;
                 }