Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit64ef572

Browse files
committed
Remove configure probes for sockaddr_storage members.
Remove four probes for members of sockaddr_storage. Keep only the probefor sockaddr's sa_len, which is enough for our two remaining places thatknow about _len fields:1. ifaddr.c needs to know if sockaddr has sa_len to understand theresult of ioctl(SIOCGIFCONF). Only AIX is still using the relevant codetoday, but it seems like a good idea to keep it compilable on Linux.2. ip.c was testing for presence of ss_len to decide whether to fill insun_len in our getaddrinfo_unix() function. It's just as good to testfor sa_len. If you have one, you have them all.(The code in#2 isn't actually needed at all on several OSes I checkedsince modern versions ignore sa_len on input to system calls. Provingthat's the case for all relevant OSes is left for another day, butwouldn't get rid of that last probe anyway if we still want it for#1.)Discussion:https://postgr.es/m/CA%2BhUKGJJjF2AqdU_Aug5n2MAc1gr%3DGykNjVBZq%2Bd6Jrcp3Dyvg%40mail.gmail.com
1 parent838f798 commit64ef572

File tree

7 files changed

+8
-91
lines changed

7 files changed

+8
-91
lines changed

‎config/c-library.m4

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -73,20 +73,14 @@ AC_DEFUN([PGAC_UNION_SEMUN],
7373
])])# PGAC_UNION_SEMUN
7474

7575

76-
# PGAC_STRUCT_SOCKADDR_STORAGE_MEMBERS
77-
# --------------------------------------
78-
# Check the members of `struct sockaddr_storage'. We need to know about
79-
# ss_family and ss_len. (Some platforms follow RFC 2553 and call them
80-
# __ss_family and __ss_len.) We also check struct sockaddr's sa_len.
81-
AC_DEFUN([PGAC_STRUCT_SOCKADDR_STORAGE_MEMBERS],
82-
[AC_CHECK_MEMBERS([struct sockaddr_storage.ss_family,
83-
struct sockaddr_storage.__ss_family,
84-
struct sockaddr_storage.ss_len,
85-
struct sockaddr_storage.__ss_len,
86-
struct sockaddr.sa_len],[],[],
76+
# PGAC_STRUCT_SOCKADDR_MEMBERS
77+
# ----------------------------
78+
# Check if struct sockaddr and subtypes have 4.4BSD-style length.
79+
AC_DEFUN([PGAC_STRUCT_SOCKADDR_SA_LEN],
80+
[AC_CHECK_MEMBERS([struct sockaddr.sa_len],[],[],
8781
[#include <sys/types.h>
8882
#include <sys/socket.h>
89-
])])#PGAC_STRUCT_SOCKADDR_STORAGE_MEMBERS
83+
])])#PGAC_STRUCT_SOCKADDR_MEMBERS
9084

9185

9286
# PGAC_TYPE_LOCALE_T

‎configure

Lines changed: 0 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -14990,54 +14990,6 @@ _ACEOF
1499014990

1499114991
fi
1499214992

14993-
ac_fn_c_check_member "$LINENO" "struct sockaddr_storage" "ss_family" "ac_cv_member_struct_sockaddr_storage_ss_family" "#include <sys/types.h>
14994-
#include <sys/socket.h>
14995-
14996-
"
14997-
if test "x$ac_cv_member_struct_sockaddr_storage_ss_family" = xyes; then :
14998-
14999-
cat >>confdefs.h <<_ACEOF
15000-
#define HAVE_STRUCT_SOCKADDR_STORAGE_SS_FAMILY 1
15001-
_ACEOF
15002-
15003-
15004-
fi
15005-
ac_fn_c_check_member "$LINENO" "struct sockaddr_storage" "__ss_family" "ac_cv_member_struct_sockaddr_storage___ss_family" "#include <sys/types.h>
15006-
#include <sys/socket.h>
15007-
15008-
"
15009-
if test "x$ac_cv_member_struct_sockaddr_storage___ss_family" = xyes; then :
15010-
15011-
cat >>confdefs.h <<_ACEOF
15012-
#define HAVE_STRUCT_SOCKADDR_STORAGE___SS_FAMILY 1
15013-
_ACEOF
15014-
15015-
15016-
fi
15017-
ac_fn_c_check_member "$LINENO" "struct sockaddr_storage" "ss_len" "ac_cv_member_struct_sockaddr_storage_ss_len" "#include <sys/types.h>
15018-
#include <sys/socket.h>
15019-
15020-
"
15021-
if test "x$ac_cv_member_struct_sockaddr_storage_ss_len" = xyes; then :
15022-
15023-
cat >>confdefs.h <<_ACEOF
15024-
#define HAVE_STRUCT_SOCKADDR_STORAGE_SS_LEN 1
15025-
_ACEOF
15026-
15027-
15028-
fi
15029-
ac_fn_c_check_member "$LINENO" "struct sockaddr_storage" "__ss_len" "ac_cv_member_struct_sockaddr_storage___ss_len" "#include <sys/types.h>
15030-
#include <sys/socket.h>
15031-
15032-
"
15033-
if test "x$ac_cv_member_struct_sockaddr_storage___ss_len" = xyes; then :
15034-
15035-
cat >>confdefs.h <<_ACEOF
15036-
#define HAVE_STRUCT_SOCKADDR_STORAGE___SS_LEN 1
15037-
_ACEOF
15038-
15039-
15040-
fi
1504114993
ac_fn_c_check_member "$LINENO" "struct sockaddr" "sa_len" "ac_cv_member_struct_sockaddr_sa_len" "#include <sys/types.h>
1504214994
#include <sys/socket.h>
1504314995

‎configure.ac

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1614,7 +1614,7 @@ PGAC_C_COMPUTED_GOTO
16141614
PGAC_STRUCT_TIMEZONE
16151615
PGAC_UNION_SEMUN
16161616
AC_CHECK_TYPES(socklen_t,[],[],[#include <sys/socket.h>])
1617-
PGAC_STRUCT_SOCKADDR_STORAGE_MEMBERS
1617+
PGAC_STRUCT_SOCKADDR_SA_LEN
16181618

16191619
PGAC_TYPE_LOCALE_T
16201620

‎src/common/ip.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ getaddrinfo_unix(const char *path, const struct addrinfo *hintsp,
227227
* something with it. To suppress the warning, clamp the struct size to
228228
* what will fit in sun_len.
229229
*/
230-
#ifdefHAVE_STRUCT_SOCKADDR_STORAGE_SS_LEN
230+
#ifdefHAVE_STRUCT_SOCKADDR_SA_LEN
231231
unp->sun_len=Min(sizeof(structsockaddr_un),
232232
((size_t)1 << (sizeof(unp->sun_len)*BITS_PER_BYTE))-1);
233233
#endif

‎src/include/libpq/pqcomm.h

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -21,19 +21,6 @@
2121
#include<netdb.h>
2222
#include<netinet/in.h>
2323

24-
#ifndefHAVE_STRUCT_SOCKADDR_STORAGE_SS_FAMILY
25-
#ifdefHAVE_STRUCT_SOCKADDR_STORAGE___SS_FAMILY
26-
#definess_family __ss_family
27-
#else
28-
#error struct sockaddr_storage does not provide an ss_family member
29-
#endif
30-
#endif
31-
32-
#ifdefHAVE_STRUCT_SOCKADDR_STORAGE___SS_LEN
33-
#definess_len __ss_len
34-
#defineHAVE_STRUCT_SOCKADDR_STORAGE_SS_LEN 1
35-
#endif
36-
3724
typedefstruct
3825
{
3926
structsockaddr_storageaddr;

‎src/include/pg_config.h.in

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -442,18 +442,6 @@
442442
/* Define to 1 if `sa_len' is a member of `struct sockaddr'. */
443443
#undef HAVE_STRUCT_SOCKADDR_SA_LEN
444444

445-
/* Define to 1 if `ss_family' is a member of `struct sockaddr_storage'. */
446-
#undef HAVE_STRUCT_SOCKADDR_STORAGE_SS_FAMILY
447-
448-
/* Define to 1 if `ss_len' is a member of `struct sockaddr_storage'. */
449-
#undef HAVE_STRUCT_SOCKADDR_STORAGE_SS_LEN
450-
451-
/* Define to 1 if `__ss_family' is a member of `struct sockaddr_storage'. */
452-
#undef HAVE_STRUCT_SOCKADDR_STORAGE___SS_FAMILY
453-
454-
/* Define to 1 if `__ss_len' is a member of `struct sockaddr_storage'. */
455-
#undef HAVE_STRUCT_SOCKADDR_STORAGE___SS_LEN
456-
457445
/* Define to 1 if `tm_zone' is a member of `struct tm'. */
458446
#undef HAVE_STRUCT_TM_TM_ZONE
459447

‎src/tools/msvc/Solution.pm

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -343,10 +343,6 @@ sub GenerateFiles
343343
HAVE_STRUCT_CMSGCRED=>undef,
344344
HAVE_STRUCT_OPTION=>undef,
345345
HAVE_STRUCT_SOCKADDR_SA_LEN=>undef,
346-
HAVE_STRUCT_SOCKADDR_STORAGE_SS_FAMILY=> 1,
347-
HAVE_STRUCT_SOCKADDR_STORAGE_SS_LEN=>undef,
348-
HAVE_STRUCT_SOCKADDR_STORAGE___SS_FAMILY=>undef,
349-
HAVE_STRUCT_SOCKADDR_STORAGE___SS_LEN=>undef,
350346
HAVE_STRUCT_TM_TM_ZONE=>undef,
351347
HAVE_SYNC_FILE_RANGE=>undef,
352348
HAVE_SYNCFS=>undef,

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp