>From d4f6a210f44a2bbfedfc60353758c39fb86f8d7a Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sat, 27 Jan 2018 10:57:59 +0100 Subject: [PATCH 2/2] Fix malfunction of socket functions on HP-UX in 64-bit mode. * m4/socketlib.m4 (gl_SOCKETLIB): Add comment. * m4/extensions.m4 (AC_USE_SYSTEM_EXTENSIONS): Define _HPUX_ALT_XOPEN_SOCKET_API. * modules/accept (Depends-on): Add 'extensions'. * modules/getpeername (Depends-on): Likewise. * modules/getsockname (Depends-on): Likewise. * modules/getsockopt (Depends-on): Likewise. * modules/recvfrom (Depends-on): Likewise. * doc/posix-functions/accept.texi: Mention the HP-UX socklen_t problem. * doc/posix-functions/getpeername.texi: Likewise. * doc/posix-functions/getsockname.texi: Likewise. * doc/posix-functions/getsockopt.texi: Likewise. * doc/posix-functions/recvfrom.texi: Likewise. --- ChangeLog | 17 +++++++++++++++++ doc/posix-functions/accept.texi | 5 +++++ doc/posix-functions/getpeername.texi | 5 +++++ doc/posix-functions/getsockname.texi | 5 +++++ doc/posix-functions/getsockopt.texi | 5 +++++ doc/posix-functions/recvfrom.texi | 5 +++++ m4/extensions.m4 | 8 +++++++- m4/socketlib.m4 | 6 +++++- modules/accept | 1 + modules/getpeername | 1 + modules/getsockname | 1 + modules/getsockopt | 1 + modules/recvfrom | 1 + 13 files changed, 59 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 70d4219..e4e24f6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,22 @@ 2018-01-27 Bruno Haible + Fix malfunction of socket functions on HP-UX in 64-bit mode. + * m4/socketlib.m4 (gl_SOCKETLIB): Add comment. + * m4/extensions.m4 (AC_USE_SYSTEM_EXTENSIONS): Define + _HPUX_ALT_XOPEN_SOCKET_API. + * modules/accept (Depends-on): Add 'extensions'. + * modules/getpeername (Depends-on): Likewise. + * modules/getsockname (Depends-on): Likewise. + * modules/getsockopt (Depends-on): Likewise. + * modules/recvfrom (Depends-on): Likewise. + * doc/posix-functions/accept.texi: Mention the HP-UX socklen_t problem. + * doc/posix-functions/getpeername.texi: Likewise. + * doc/posix-functions/getsockname.texi: Likewise. + * doc/posix-functions/getsockopt.texi: Likewise. + * doc/posix-functions/recvfrom.texi: Likewise. + +2018-01-27 Bruno Haible + getsockname tests: More tests. * tests/test-getsockname.c (open_server_socket): New function, mostly copied from test-poll.c. diff --git a/doc/posix-functions/accept.texi b/doc/posix-functions/accept.texi index a92ea3f..b1216ee 100644 --- a/doc/posix-functions/accept.texi +++ b/doc/posix-functions/accept.texi @@ -17,6 +17,11 @@ the @code{accept} function cannot be used in calls to @code{read}, On Windows platforms (excluding Cygwin), error codes from this function are not placed in @code{errno}, and @code{WSAGetLastError} must be used instead. address@hidden +On HP-UX 11, in 64-bit mode, when the macro @code{_HPUX_ALT_XOPEN_SOCKET_API} +is not defined, this function behaves incorrectly because it is declared +to take a pointer to a 64-bit wide @code{socklen_t} entity but in fact +considers it as a pointer to a 32-bit wide @code{unsigned int} entity. @end itemize Portability problems not fixed by Gnulib: diff --git a/doc/posix-functions/getpeername.texi b/doc/posix-functions/getpeername.texi index 5b2776e..8476e0a 100644 --- a/doc/posix-functions/getpeername.texi +++ b/doc/posix-functions/getpeername.texi @@ -12,6 +12,11 @@ Portability problems fixed by Gnulib: On Windows platforms (excluding Cygwin), error codes from this function are not placed in @code{errno}, and @code{WSAGetLastError} must be used instead. address@hidden +On HP-UX 11, in 64-bit mode, when the macro @code{_HPUX_ALT_XOPEN_SOCKET_API} +is not defined, this function behaves incorrectly because it is declared +to take a pointer to a 64-bit wide @code{socklen_t} entity but in fact +considers it as a pointer to a 32-bit wide @code{unsigned int} entity. @end itemize Portability problems not fixed by Gnulib: diff --git a/doc/posix-functions/getsockname.texi b/doc/posix-functions/getsockname.texi index 7d462a7..714565d 100644 --- a/doc/posix-functions/getsockname.texi +++ b/doc/posix-functions/getsockname.texi @@ -12,6 +12,11 @@ Portability problems fixed by Gnulib: On Windows platforms (excluding Cygwin), error codes from this function are not placed in @code{errno}, and @code{WSAGetLastError} must be used instead. address@hidden +On HP-UX 11, in 64-bit mode, when the macro @code{_HPUX_ALT_XOPEN_SOCKET_API} +is not defined, this function behaves incorrectly because it is declared +to take a pointer to a 64-bit wide @code{socklen_t} entity but in fact +considers it as a pointer to a 32-bit wide @code{unsigned int} entity. @end itemize Portability problems not fixed by Gnulib: diff --git a/doc/posix-functions/getsockopt.texi b/doc/posix-functions/getsockopt.texi index 9e7d26e..f15c934 100644 --- a/doc/posix-functions/getsockopt.texi +++ b/doc/posix-functions/getsockopt.texi @@ -12,6 +12,11 @@ Portability problems fixed by Gnulib: On Windows platforms (excluding Cygwin), error codes from this function are not placed in @code{errno}, and @code{WSAGetLastError} must be used instead. address@hidden +On HP-UX 11, in 64-bit mode, when the macro @code{_HPUX_ALT_XOPEN_SOCKET_API} +is not defined, this function behaves incorrectly because it is declared +to take a pointer to a 64-bit wide @code{socklen_t} entity but in fact +considers it as a pointer to a 32-bit wide @code{unsigned int} entity. @end itemize Portability problems not fixed by Gnulib: diff --git a/doc/posix-functions/recvfrom.texi b/doc/posix-functions/recvfrom.texi index f591d0c..251ed5c 100644 --- a/doc/posix-functions/recvfrom.texi +++ b/doc/posix-functions/recvfrom.texi @@ -16,6 +16,11 @@ OSF/1 5.1. On Windows platforms (excluding Cygwin), error codes from this function are not placed in @code{errno}, and @code{WSAGetLastError} must be used instead. address@hidden +On HP-UX 11, in 64-bit mode, when the macro @code{_HPUX_ALT_XOPEN_SOCKET_API} +is not defined, this function behaves incorrectly because it is declared +to take a pointer to a 64-bit wide @code{socklen_t} entity but in fact +considers it as a pointer to a 32-bit wide @code{unsigned int} entity. @end itemize Portability problems not fixed by Gnulib: diff --git a/m4/extensions.m4 b/m4/extensions.m4 index d1b2321..71a854f 100644 --- a/m4/extensions.m4 +++ b/m4/extensions.m4 @@ -1,4 +1,4 @@ -# serial 17 -*- Autoconf -*- +# serial 18 -*- Autoconf -*- # Enable extensions on systems that normally disable them. # Copyright (C) 2003, 2006-2018 Free Software Foundation, Inc. @@ -118,6 +118,11 @@ dnl configure.ac when using autoheader 2.62. #ifndef _XOPEN_SOURCE # undef _XOPEN_SOURCE #endif +/* Enable X/Open compliant socket functions that do not require linking + with -lxnet on HP-UX 11.11. */ +#ifndef _HPUX_ALT_XOPEN_SOCKET_API +# undef _HPUX_ALT_XOPEN_SOCKET_API +#endif /* Enable general extensions on Solaris. */ #ifndef __EXTENSIONS__ # undef __EXTENSIONS__ @@ -163,6 +168,7 @@ dnl configure.ac when using autoheader 2.62. [ac_cv_should_define__xopen_source=yes])])]) test $ac_cv_should_define__xopen_source = yes && AC_DEFINE([_XOPEN_SOURCE], [500]) + AC_DEFINE([_HPUX_ALT_XOPEN_SOCKET_API]) ])# AC_USE_SYSTEM_EXTENSIONS # gl_USE_SYSTEM_EXTENSIONS diff --git a/m4/socketlib.m4 b/m4/socketlib.m4 index ca240b1..a725d3c 100644 --- a/m4/socketlib.m4 +++ b/m4/socketlib.m4 @@ -1,4 +1,4 @@ -# socketlib.m4 serial 1 +# socketlib.m4 serial 2 dnl Copyright (C) 2008-2018 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -38,6 +38,10 @@ AC_DEFUN([gl_SOCKETLIB], dnl Solaris has most socket functions in libsocket. dnl Haiku has most socket functions in libnetwork. dnl BeOS has most socket functions in libnet. + dnl On HP-UX, do NOT link with libxnet, because in 64-bit mode this would + dnl break code (e.g. in libraries) that invokes accept(), getpeername(), + dnl getsockname(), getsockopt(), or recvfrom() with a 32-bit addrlen. See + dnl "man xopen_networking" for details. AC_CACHE_CHECK([for library containing setsockopt], [gl_cv_lib_socket], [ gl_cv_lib_socket= AC_LINK_IFELSE([AC_LANG_PROGRAM([[extern diff --git a/modules/accept b/modules/accept index 059a56d..b997566 100644 --- a/modules/accept +++ b/modules/accept @@ -6,6 +6,7 @@ lib/accept.c lib/w32sock.h Depends-on: +extensions sys_socket socketlib errno [test "$ac_cv_header_winsock2_h" = yes] diff --git a/modules/getpeername b/modules/getpeername index d1ef822..53f077b 100644 --- a/modules/getpeername +++ b/modules/getpeername @@ -7,6 +7,7 @@ lib/getpeername.c lib/w32sock.h Depends-on: +extensions sys_socket socketlib errno [test "$ac_cv_header_winsock2_h" = yes] diff --git a/modules/getsockname b/modules/getsockname index 15cf490..8a8ffe0 100644 --- a/modules/getsockname +++ b/modules/getsockname @@ -7,6 +7,7 @@ lib/getsockname.c lib/w32sock.h Depends-on: +extensions sys_socket socketlib errno [test "$ac_cv_header_winsock2_h" = yes] diff --git a/modules/getsockopt b/modules/getsockopt index 1cd1f2e..adb4b87 100644 --- a/modules/getsockopt +++ b/modules/getsockopt @@ -6,6 +6,7 @@ lib/getsockopt.c lib/w32sock.h Depends-on: +extensions sys_socket socketlib sys_time [test "$ac_cv_header_winsock2_h" = yes] diff --git a/modules/recvfrom b/modules/recvfrom index 2b051b4..590f6fe 100644 --- a/modules/recvfrom +++ b/modules/recvfrom @@ -6,6 +6,7 @@ lib/recvfrom.c lib/w32sock.h Depends-on: +extensions sys_socket socketlib errno [test "$ac_cv_header_winsock2_h" = yes] -- 2.7.4