Changeset 1122:d4371b7aa0ff in freeDiameter for include/freeDiameter/libfdproto.h

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

File:

• include/freeDiameter/libfdproto.h (modified) (1 diff)

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);