Changeset 246:6418a188c1b5 in freeDiameter for include

Timestamp:

Apr 2, 2010, 3:27:46 PM (14 years ago)

Author:

Sebastien Decugis <sdecugis@nict.go.jp>

Branch:

default

Phase:

public

Message:

getnameinfo is also more sensitive on freeBSD

File:

• include/freeDiameter/libfreeDiameter.h (modified) (4 diffs)

include/freeDiameter/libfreeDiameter.h

@@ -272 +272 @@
 #define sSA6    struct sockaddr_in6
 
+/* The sockaddr length of a sSS structure */
+#define sSAlen( _sa_ )  \
+        ( (socklen_t) ( (((sSA *)_sa_)->sa_family == AF_INET) ? (sizeof(sSA4)) :                \
+                                ((((sSA *)_sa_)->sa_family == AF_INET6) ? (sizeof(sSA6)) :      \
+                                        0 ) ) )
+
 /* Dump one sockaddr Node information */
 #define sSA_DUMP_NODE( sa, flag ) {                             \
@@ -278 +284 @@
         if (__sa) {                                             \
           int __rc = getnameinfo(__sa,                          \
-                        sizeof(sSS),                            \
+                        sSAlen(__sa),                           \
                         __addrbuf,                              \
                         sizeof(__addrbuf),                      \
@@ -299 +305 @@
         if (__sa) {                                                     \
           int __rc = getnameinfo(__sa,                                  \
-                        sizeof(sSS),                                    \
+                        sSAlen(__sa),                                   \
                         __addrbuf,                                      \
                         sizeof(__addrbuf),                              \
@@ -452 +458 @@
                         "Unknown"))
 #endif /* DISABLE_SCTP */
-
-/* The sockaddr length of a sSS structure */
-#define sSSlen( _ss_ )  \
-        ( (socklen_t) ( (((sSS *)_ss_)->ss_family == AF_INET) ? (sizeof(sSA4)) :                \
-                                ((((sSS *)_ss_)->ss_family == AF_INET6) ? (sizeof(sSA6)) :      \
-                                        0 ) ) )
 
 /* Define the value of IP loopback address */