CDRIVER-2015 getpeername and getsockopt params, part 2

Author: ajdavis

CMakeLists.txt

@@ -166,6 +166,9 @@ if (MINGW)
    set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_CRT_RAND_S")
 endif ()
 
+# Reasonable default. CheckCompiler.m4 checks thoroughly for HP-UX's sake.
+set (MONGOC_SOCKET_ARG2 "struct sockaddr")
+
 include(CheckTypeSize)
 if (MSVC)
    SET(CMAKE_EXTRA_INCLUDE_FILES "ws2tcpip.h")
@@ -177,19 +180,12 @@ SET(CMAKE_EXTRA_INCLUDE_FILES)
 
 if (HAVE_SOCKLEN)
    set(MONGOC_HAVE_SOCKLEN 1)
+   set (MONGOC_SOCKET_ARG3 "socklen_t")
 else()
    set(MONGOC_HAVE_SOCKLEN 0)
+   set (MONGOC_SOCKET_ARG3 "int")
 endif()
 
-# Reasonable defaults. CheckCompiler.m4 checks thoroughly for HP-UX's sake.
-set (ACCEPT_ARG2 "struct sockaddr")
-set (ACCEPT_ARG3 "socklen_t")
-set (GETPEERNAME_ARG2 "struct sockaddr")
-set (GETPEERNAME_ARG3 "socklen_t")
-set (GETSOCKNAME_ARG2 "struct sockaddr")
-set (GETSOCKNAME_ARG3 "socklen_t")
-set (GETSOCKOPT_ARG5 "socklen_t")
-
 set (SOURCE_DIR "${PROJECT_SOURCE_DIR}/")
 
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR}/build/cmake)

build/autotools/CheckCompiler.m4

@@ -43,6 +43,8 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([
 #endif
 ])], [c_compiler="sun"], [])
 
+# The type of parameters for accept, getpeername, getsockname, getsockopt
+# all vary the same way by platform.
 AX_PROTOTYPE(accept, [
    #include <sys/types.h>
    #include <sys/socket.h>
@@ -54,39 +56,10 @@ AX_PROTOTYPE(accept, [
 ARG2, [struct sockaddr, void],
 ARG3, [socklen_t, size_t, int])
 
-AX_PROTOTYPE(getpeername, [
-   #include <sys/types.h>
-   #include <sys/socket.h>
-], [
-   int a = 0;
-   ARG2 *b = 0;
-   ARG3 *c = 0;
-   getpeername (a, b, c);],
-ARG2, [struct sockaddr, void],
-ARG3, [socklen_t, size_t, int])
-
-AX_PROTOTYPE(getsockname, [
-   #include <sys/types.h>
-   #include <sys/socket.h>
-], [
-   int a = 0;
-   ARG2 *b = 0;
-   ARG3 *c = 0;
-   getsockname (a, b, c);],
-ARG2, [struct sockaddr, void],
-ARG3, [socklen_t, size_t, int])
-
-AX_PROTOTYPE(getsockopt, [
-   #include <sys/types.h>
-   #include <sys/socket.h>
-], [
-   int a = 0;
-   int b = 0;
-   int c = 0;
-   void *d = 0;
-   ARG5 *e = 0;
-   getsockopt (a, b, c, d, e);],
-ARG5, [socklen_t, int])
+MONGOC_SOCKET_ARG2="$ACCEPT_ARG2"
+AC_SUBST(MONGOC_SOCKET_ARG2)
+MONGOC_SOCKET_ARG3="$ACCEPT_ARG3"
+AC_SUBST(MONGOC_SOCKET_ARG3)
 
 AC_LANG_POP([C])
 

src/mongoc/mongoc-config.h.in

@@ -219,13 +219,8 @@
  * Set from configure, see
  * https://curl.haxx.se/mail/lib-2009-04/0287.html
  */
-#define MONGOC_ACCEPT_ARG2 @ACCEPT_ARG2@
-#define MONGOC_ACCEPT_ARG3 @ACCEPT_ARG3@
-#define MONGOC_GETPEERNAME_ARG2 @GETPEERNAME_ARG2@
-#define MONGOC_GETPEERNAME_ARG3 @GETPEERNAME_ARG3@
-#define MONGOC_GETSOCKNAME_ARG2 @GETSOCKNAME_ARG2@
-#define MONGOC_GETSOCKNAME_ARG3 @GETSOCKNAME_ARG3@
-#define MONGOC_GETSOCKOPT_ARG5 @GETSOCKOPT_ARG5@
+#define MONGOC_SOCKET_ARG2 @MONGOC_SOCKET_ARG2@
+#define MONGOC_SOCKET_ARG3 @MONGOC_SOCKET_ARG3@
 
 /*
  * NOTICE:

src/mongoc/mongoc-socket.c

@@ -33,6 +33,9 @@
    ((expire_at >= 0) && (expire_at < (bson_get_monotonic_time ())))
 
 
+/* either struct sockaddr or void, depending on platform */
+typedef MONGOC_SOCKET_ARG2 mongoc_sockaddr_t;
+
 /*
  *--------------------------------------------------------------------------
  *
@@ -427,7 +430,7 @@ mongoc_socket_accept_ex (mongoc_socket_t *sock, /* IN */
 
 again:
    errno = 0;
-   sd = accept (sock->sd, (struct sockaddr *) &addr, &addrlen);
+   sd = accept (sock->sd, (mongoc_sockaddr_t *) &addr, &addrlen);
 
    _mongoc_socket_capture_errno (sock);
 #ifdef _WIN32
@@ -586,7 +589,7 @@ mongoc_socket_connect (mongoc_socket_t *sock,       /* IN */
    int ret;
    int optval;
    /* getsockopt parameter types vary, we check in CheckCompiler.m4 */
-   MONGOC_GETSOCKOPT_ARG5 optlen = (MONGOC_GETSOCKOPT_ARG5) sizeof optval;
+   mongoc_socklen_t optlen = (mongoc_socklen_t) sizeof optval;
 
    ENTRY;
 
@@ -1186,7 +1189,7 @@ mongoc_socket_getsockname (mongoc_socket_t *sock,     /* IN */
 
    BSON_ASSERT (sock);
 
-   ret = getsockname (sock->sd, addr, addrlen);
+   ret = getsockname (sock->sd, (mongoc_sockaddr_t *) addr, addrlen);
 
    _mongoc_socket_capture_errno (sock);
 
@@ -1198,8 +1201,8 @@ char *
 mongoc_socket_getnameinfo (mongoc_socket_t *sock) /* IN */
 {
    /* getpeername parameter types vary, we check in CheckCompiler.m4 */
-   MONGOC_GETPEERNAME_ARG2 addr;
-   MONGOC_GETPEERNAME_ARG3 len = (MONGOC_GETPEERNAME_ARG3) sizeof addr;
+   mongoc_sockaddr_t addr;
+   mongoc_socklen_t len = (mongoc_socklen_t) sizeof addr;
    char *ret;
    char host[BSON_HOST_NAME_MAX + 1];
 

src/mongoc/mongoc-socket.h

@@ -45,11 +45,7 @@
 BSON_BEGIN_DECLS
 
 
-#ifdef MONGOC_HAVE_SOCKLEN
-typedef socklen_t mongoc_socklen_t;
-#else
-typedef int mongoc_socklen_t;
-#endif
+typedef MONGOC_SOCKET_ARG3 mongoc_socklen_t;
 
 typedef struct _mongoc_socket_t mongoc_socket_t;