Changeset 1122:d4371b7aa0ff in freeDiameter for include

Timestamp:

May 14, 2013, 7:01:31 PM (11 years ago)

Author:

Sebastien Decugis <sdecugis@freediameter.net>

Branch:

default

Phase:

public

Message:

New CMake option: ADDRESS_AVP_INCLUDE_PORT. Turn off for standard Host-IP-Address AVPs

Location:

include/freeDiameter

Files:

• CMakeLists.txt (modified) (1 diff)
• freeDiameter-host.h.in (modified) (1 diff)
• libfdcore.h (modified) (1 diff)
• libfdproto.h (modified) (1 diff)

include/freeDiameter/CMakeLists.txt

@@ -33 +33 @@
 # compliancy of their implementation with the Diameter RFC...
 OPTION(WORKAROUND_ACCEPT_INVALID_VSAI "Do not reject a CER/CEA with a Vendor-Specific-Application-Id AVP containing both Auth- and Acct- application AVPs?" OFF)
+
+# If the following is defined, the Address-based AVPs issued locally are extended to include the port information.
+OPTION(ADDRESS_AVP_INCLUDE_PORT "Include the port number in the Address-based AVPs?" ON)
 
 MARK_AS_ADVANCED(DISABLE_SCTP DEBUG_SCTP SCTP_USE_MAPPED_ADDRESSES ERRORS_ON_TODO DIAMID_IDNA_IGNORE DIAMID_IDNA_REJECT DISABLE_PEER_EXPIRY WORKAROUND_ACCEPT_INVALID_VSAI)

include/freeDiameter/freeDiameter-host.h.in

@@ -61 +61 @@
 #cmakedefine DISABLE_PEER_EXPIRY
 #cmakedefine WORKAROUND_ACCEPT_INVALID_VSAI
+#cmakedefine ADDRESS_AVP_INCLUDE_PORT
 #cmakedefine GNUTLS_VERSION_210
 #cmakedefine GNUTLS_VERSION_300

include/freeDiameter/libfdcore.h

@@ -137 +137 @@
         uint16_t         cnf_port_tls;  /* the local port for Diameter/TLS (default: 3869) in host byte order */
         uint16_t         cnf_sctp_str;  /* default max number of streams for SCTP associations (def: 30) */
-        struct fd_list   cnf_endpoints; /* the local endpoints to bind the server to. list of struct fd_endpoint. default is empty (bind all) */
+        struct fd_list   cnf_endpoints; /* the local endpoints to bind the server to. list of struct fd_endpoint. default is empty (bind all). After servers are started, this is the actual list of endpoints including port information. */
         struct fd_list   cnf_apps;      /* Applications locally supported (except relay, see flags). Use fd_disp_app_support to add one. list of struct fd_app. */
         uint16_t         cnf_dispthr;   /* Number of dispatch threads to create */

include/freeDiameter/libfdproto.h

@@ -610 +610 @@
                                 ((((sSA *)_sa_)->sa_family == AF_INET6) ? (sizeof(sSA6)) :      \
                                         0 ) ) )
-
-DECLARE_FD_DUMP_PROTOTYPE(fd_sa_dump_node, sSA * sa, int flags);
-DECLARE_FD_DUMP_PROTOTYPE(fd_sa_dump_node_serv, sSA * sa, int flags);
+#define sSAport( _sa_ ) \
+        ( (socklen_t) ( (((sSA *)_sa_)->sa_family == AF_INET) ? (((sSA4 *)(_sa_))->sin_port) :          \
+                                ((((sSA *)_sa_)->sa_family == AF_INET6) ? (((sSA6 *)(_sa_))->sin6_port) :       \
+                                        0 ) ) )
+
+DECLARE_FD_DUMP_PROTOTYPE(fd_sa_dump, sSA * sa, int flags);
 #define sSA_DUMP_STRLEN (INET6_ADDRSTRLEN + 1 + 32 + 2)
 void fd_sa_sdump_numeric(char * buf /* must be at least sSA_DUMP_STRLEN */, sSA * sa);