Changeset 246:6418a188c1b5 in freeDiameter

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

Files:

• freeDiameter/cnxctx.c (modified) (1 diff)
• freeDiameter/p_cnx.c (modified) (1 diff)
• freeDiameter/sctp.c (modified) (1 diff)
• freeDiameter/tests/testcnx.c (modified) (1 diff)
• include/freeDiameter/libfreeDiameter.h (modified) (4 diffs)

freeDiameter/cnxctx.c

@@ -129 +129 @@
 
         /* Create the socket */
-        CHECK_FCT_DO( fd_tcp_create_bind_server( &cnx->cc_socket, sa, sSSlen(sa) ), goto error );
+        CHECK_FCT_DO( fd_tcp_create_bind_server( &cnx->cc_socket, sa, sSAlen(sa) ), goto error );
 
         /* Generate the name for the connection object */

freeDiameter/p_cnx.c

@@ -228 +228 @@
                 switch (nc->proto) {
                         case IPPROTO_TCP:
-                                cnx = fd_cnx_cli_connect_tcp((sSA *)&nc->ss, sSSlen(&nc->ss));
+                                cnx = fd_cnx_cli_connect_tcp((sSA *)&nc->ss, sSAlen(&nc->ss));
                                 break;
 #ifndef DISABLE_SCTP                    

freeDiameter/sctp.c

@@ -714 +714 @@
                         s.sin6.sin6_port = htons(port);
                 
-                CHECK_SYS( bind(*sock, &s.sa, sSSlen(&s)) );
+                CHECK_SYS( bind(*sock, &s.sa, sSAlen(&s)) );
                 
         } else {

freeDiameter/tests/testcnx.c

@@ -486 +486 @@
                         {
                                 struct fd_endpoint * ep = (struct fd_endpoint *)(eps.next);
-                                cnx = fd_cnx_cli_connect_tcp( &ep->sa, sSSlen(&ep->ss) );
+                                cnx = fd_cnx_cli_connect_tcp( &ep->sa, sSAlen(&ep->ss) );
                                 CHECK( 1, (cnx ? 1 : 0) ^ cf->expect_failure );
                         }

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 */