Changeset 245:6a71c3f3ab77 in freeDiameter

Timestamp:

Apr 2, 2010, 2:49:42 PM (14 years ago)

Author:

Sebastien Decugis <sdecugis@nict.go.jp>

Branch:

default

Phase:

public

Message:

bind on FreeBSD is more sensitive...

Files:

• freeDiameter/cnxctx.c (modified) (1 diff)
• freeDiameter/sctp.c (modified) (1 diff)
• include/freeDiameter/libfreeDiameter.h (modified) (1 diff)

freeDiameter/cnxctx.c

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

freeDiameter/sctp.c

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

include/freeDiameter/libfreeDiameter.h

@@ -455 +455 @@
 /* The sockaddr length of a sSS structure */
 #define sSSlen( _ss_ )  \
-        ( (socklen_t) ( ((_ss_)->ss_family == AF_INET) ? (sizeof(sSA4)) :               \
-                                (((_ss_)->ss_family == AF_INET6) ? (sizeof(sSA6)) :     \
+        ( (socklen_t) ( (((sSS *)_ss_)->ss_family == AF_INET) ? (sizeof(sSA4)) :                \
+                                ((((sSS *)_ss_)->ss_family == AF_INET6) ? (sizeof(sSA6)) :      \
                                         0 ) ) )