mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-21 12:30:06 +00:00
socket: Add time64 alias for getsockopt
Reviewed-by: Lukasz Majewski <lukma@denx.de> Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
This commit is contained in:
parent
6856975ed4
commit
02c17c8c14
@ -31,7 +31,14 @@ routines := accept bind connect getpeername getsockname getsockopt \
|
||||
setsockopt shutdown socket socketpair isfdtype opensock \
|
||||
sockatmark accept4 recvmmsg sendmmsg
|
||||
|
||||
tests := tst-accept4
|
||||
tests := \
|
||||
tst-accept4 \
|
||||
tst-sockopt \
|
||||
# tests
|
||||
|
||||
tests-time64 := \
|
||||
tst-sockopt-time64 \
|
||||
# tests
|
||||
|
||||
aux := sa_len
|
||||
|
||||
|
@ -251,9 +251,24 @@ extern int __REDIRECT (recvmmsg, (int __fd, struct mmsghdr *__vmessages,
|
||||
/* Put the current value for socket FD's option OPTNAME at protocol level LEVEL
|
||||
into OPTVAL (which is *OPTLEN bytes long), and set *OPTLEN to the value's
|
||||
actual length. Returns 0 on success, -1 for errors. */
|
||||
#ifndef __USE_TIME_BITS64
|
||||
extern int getsockopt (int __fd, int __level, int __optname,
|
||||
void *__restrict __optval,
|
||||
socklen_t *__restrict __optlen) __THROW;
|
||||
#else
|
||||
# ifdef __REDIRECT
|
||||
extern int __REDIRECT_NTH (getsockopt,
|
||||
(int __fd, int __level, int __optname,
|
||||
void *__restrict __optval,
|
||||
socklen_t *__restrict __optlen),
|
||||
__getsockopt64);
|
||||
# else
|
||||
extern int __getsockopt64 (int __fd, int __level, int __optname,
|
||||
void *__restrict __optval,
|
||||
socklen_t *__restrict __optlen) __THROW;
|
||||
# define getsockopt __getsockopt64
|
||||
# endif
|
||||
#endif
|
||||
|
||||
/* Set socket FD's option OPTNAME at protocol level LEVEL
|
||||
to *OPTVAL (which is OPTLEN bytes long).
|
||||
|
1
socket/tst-sockopt-time64.c
Normal file
1
socket/tst-sockopt-time64.c
Normal file
@ -0,0 +1 @@
|
||||
#include "tst-sockopt.c"
|
52
socket/tst-sockopt.c
Normal file
52
socket/tst-sockopt.c
Normal file
@ -0,0 +1,52 @@
|
||||
/* Smoke test for socket options.
|
||||
Copyright (C) 2021 Free Software Foundation, Inc.
|
||||
This file is part of the GNU C Library.
|
||||
|
||||
The GNU C Library is free software; you can redistribute it and/or
|
||||
modify it under the terms of the GNU Lesser General Public
|
||||
License as published by the Free Software Foundation; either
|
||||
version 2.1 of the License, or (at your option) any later version.
|
||||
|
||||
The GNU C Library is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
Lesser General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU Lesser General Public
|
||||
License along with the GNU C Library; if not, see
|
||||
<https://www.gnu.org/licenses/>. */
|
||||
|
||||
#include <support/xsocket.h>
|
||||
#include <support/xunistd.h>
|
||||
#include <support/check.h>
|
||||
#include <netinet/in.h>
|
||||
|
||||
static int
|
||||
do_test (void)
|
||||
{
|
||||
int fd = xsocket (AF_INET, SOCK_STREAM, IPPROTO_TCP);
|
||||
|
||||
struct linger value = { -1, -1 };
|
||||
socklen_t optlen = sizeof (value);
|
||||
TEST_COMPARE (getsockopt (fd, SOL_SOCKET, SO_LINGER, &value, &optlen), 0);
|
||||
TEST_COMPARE (optlen, sizeof (value));
|
||||
TEST_COMPARE (value.l_onoff, 0);
|
||||
TEST_COMPARE (value.l_linger, 0);
|
||||
|
||||
value.l_onoff = 1;
|
||||
value.l_linger = 30;
|
||||
TEST_COMPARE (setsockopt (fd, SOL_SOCKET, SO_LINGER, &value, sizeof (value)),
|
||||
0);
|
||||
|
||||
value.l_onoff = -1;
|
||||
value.l_linger = -1;
|
||||
TEST_COMPARE (getsockopt (fd, SOL_SOCKET, SO_LINGER, &value, &optlen), 0);
|
||||
TEST_COMPARE (optlen, sizeof (value));
|
||||
TEST_COMPARE (value.l_onoff, 1);
|
||||
TEST_COMPARE (value.l_linger, 30);
|
||||
|
||||
xclose (fd);
|
||||
return 0;
|
||||
}
|
||||
|
||||
#include <support/test-driver.c>
|
@ -225,6 +225,7 @@ libc {
|
||||
__gai_suspend_time64;
|
||||
__getitimer64;
|
||||
__getrusage64;
|
||||
__getsockopt64;
|
||||
__gettimeofday64;
|
||||
__glob64_time64;
|
||||
__globfree64_time64;
|
||||
|
@ -218,6 +218,7 @@ GLIBC_2.34 __futimesat64 F
|
||||
GLIBC_2.34 __gai_suspend_time64 F
|
||||
GLIBC_2.34 __getitimer64 F
|
||||
GLIBC_2.34 __getrusage64 F
|
||||
GLIBC_2.34 __getsockopt64 F
|
||||
GLIBC_2.34 __gettimeofday64 F
|
||||
GLIBC_2.34 __glob64_time64 F
|
||||
GLIBC_2.34 __globfree64_time64 F
|
||||
|
@ -215,6 +215,7 @@ GLIBC_2.34 __futimesat64 F
|
||||
GLIBC_2.34 __gai_suspend_time64 F
|
||||
GLIBC_2.34 __getitimer64 F
|
||||
GLIBC_2.34 __getrusage64 F
|
||||
GLIBC_2.34 __getsockopt64 F
|
||||
GLIBC_2.34 __gettimeofday64 F
|
||||
GLIBC_2.34 __glob64_time64 F
|
||||
GLIBC_2.34 __globfree64_time64 F
|
||||
|
@ -2374,6 +2374,7 @@ GLIBC_2.34 __futimesat64 F
|
||||
GLIBC_2.34 __gai_suspend_time64 F
|
||||
GLIBC_2.34 __getitimer64 F
|
||||
GLIBC_2.34 __getrusage64 F
|
||||
GLIBC_2.34 __getsockopt64 F
|
||||
GLIBC_2.34 __gettimeofday64 F
|
||||
GLIBC_2.34 __glob64_time64 F
|
||||
GLIBC_2.34 __globfree64_time64 F
|
||||
|
@ -101,3 +101,6 @@ __getsockopt (int fd, int level, int optname, void *optval, socklen_t *len)
|
||||
return r;
|
||||
}
|
||||
weak_alias (__getsockopt, getsockopt)
|
||||
#if __TIMESIZE != 64
|
||||
weak_alias (__getsockopt, __getsockopt64)
|
||||
#endif
|
||||
|
@ -2323,6 +2323,7 @@ GLIBC_2.34 __futimesat64 F
|
||||
GLIBC_2.34 __gai_suspend_time64 F
|
||||
GLIBC_2.34 __getitimer64 F
|
||||
GLIBC_2.34 __getrusage64 F
|
||||
GLIBC_2.34 __getsockopt64 F
|
||||
GLIBC_2.34 __gettimeofday64 F
|
||||
GLIBC_2.34 __glob64_time64 F
|
||||
GLIBC_2.34 __globfree64_time64 F
|
||||
|
@ -2506,6 +2506,7 @@ GLIBC_2.34 __futimesat64 F
|
||||
GLIBC_2.34 __gai_suspend_time64 F
|
||||
GLIBC_2.34 __getitimer64 F
|
||||
GLIBC_2.34 __getrusage64 F
|
||||
GLIBC_2.34 __getsockopt64 F
|
||||
GLIBC_2.34 __gettimeofday64 F
|
||||
GLIBC_2.34 __glob64_time64 F
|
||||
GLIBC_2.34 __globfree64_time64 F
|
||||
|
@ -219,6 +219,7 @@ GLIBC_2.34 __futimesat64 F
|
||||
GLIBC_2.34 __gai_suspend_time64 F
|
||||
GLIBC_2.34 __getitimer64 F
|
||||
GLIBC_2.34 __getrusage64 F
|
||||
GLIBC_2.34 __getsockopt64 F
|
||||
GLIBC_2.34 __gettimeofday64 F
|
||||
GLIBC_2.34 __glob64_time64 F
|
||||
GLIBC_2.34 __globfree64_time64 F
|
||||
|
@ -2450,6 +2450,7 @@ GLIBC_2.34 __futimesat64 F
|
||||
GLIBC_2.34 __gai_suspend_time64 F
|
||||
GLIBC_2.34 __getitimer64 F
|
||||
GLIBC_2.34 __getrusage64 F
|
||||
GLIBC_2.34 __getsockopt64 F
|
||||
GLIBC_2.34 __gettimeofday64 F
|
||||
GLIBC_2.34 __glob64_time64 F
|
||||
GLIBC_2.34 __globfree64_time64 F
|
||||
|
@ -2423,6 +2423,7 @@ GLIBC_2.34 __futimesat64 F
|
||||
GLIBC_2.34 __gai_suspend_time64 F
|
||||
GLIBC_2.34 __getitimer64 F
|
||||
GLIBC_2.34 __getrusage64 F
|
||||
GLIBC_2.34 __getsockopt64 F
|
||||
GLIBC_2.34 __gettimeofday64 F
|
||||
GLIBC_2.34 __glob64_time64 F
|
||||
GLIBC_2.34 __globfree64_time64 F
|
||||
|
@ -2420,6 +2420,7 @@ GLIBC_2.34 __futimesat64 F
|
||||
GLIBC_2.34 __gai_suspend_time64 F
|
||||
GLIBC_2.34 __getitimer64 F
|
||||
GLIBC_2.34 __getrusage64 F
|
||||
GLIBC_2.34 __getsockopt64 F
|
||||
GLIBC_2.34 __gettimeofday64 F
|
||||
GLIBC_2.34 __glob64_time64 F
|
||||
GLIBC_2.34 __globfree64_time64 F
|
||||
|
@ -2415,6 +2415,7 @@ GLIBC_2.34 __futimesat64 F
|
||||
GLIBC_2.34 __gai_suspend_time64 F
|
||||
GLIBC_2.34 __getitimer64 F
|
||||
GLIBC_2.34 __getrusage64 F
|
||||
GLIBC_2.34 __getsockopt64 F
|
||||
GLIBC_2.34 __gettimeofday64 F
|
||||
GLIBC_2.34 __glob64_time64 F
|
||||
GLIBC_2.34 __globfree64_time64 F
|
||||
|
@ -2413,6 +2413,7 @@ GLIBC_2.34 __futimesat64 F
|
||||
GLIBC_2.34 __gai_suspend_time64 F
|
||||
GLIBC_2.34 __getitimer64 F
|
||||
GLIBC_2.34 __getrusage64 F
|
||||
GLIBC_2.34 __getsockopt64 F
|
||||
GLIBC_2.34 __gettimeofday64 F
|
||||
GLIBC_2.34 __glob64_time64 F
|
||||
GLIBC_2.34 __globfree64_time64 F
|
||||
|
@ -2421,6 +2421,7 @@ GLIBC_2.34 __futimesat64 F
|
||||
GLIBC_2.34 __gai_suspend_time64 F
|
||||
GLIBC_2.34 __getitimer64 F
|
||||
GLIBC_2.34 __getrusage64 F
|
||||
GLIBC_2.34 __getsockopt64 F
|
||||
GLIBC_2.34 __gettimeofday64 F
|
||||
GLIBC_2.34 __glob64_time64 F
|
||||
GLIBC_2.34 __globfree64_time64 F
|
||||
|
@ -2462,6 +2462,7 @@ GLIBC_2.34 __futimesat64 F
|
||||
GLIBC_2.34 __gai_suspend_time64 F
|
||||
GLIBC_2.34 __getitimer64 F
|
||||
GLIBC_2.34 __getrusage64 F
|
||||
GLIBC_2.34 __getsockopt64 F
|
||||
GLIBC_2.34 __gettimeofday64 F
|
||||
GLIBC_2.34 __glob64_time64 F
|
||||
GLIBC_2.34 __globfree64_time64 F
|
||||
|
@ -2477,6 +2477,7 @@ GLIBC_2.34 __futimesat64 F
|
||||
GLIBC_2.34 __gai_suspend_time64 F
|
||||
GLIBC_2.34 __getitimer64 F
|
||||
GLIBC_2.34 __getrusage64 F
|
||||
GLIBC_2.34 __getsockopt64 F
|
||||
GLIBC_2.34 __gettimeofday64 F
|
||||
GLIBC_2.34 __glob64_time64 F
|
||||
GLIBC_2.34 __globfree64_time64 F
|
||||
|
@ -2510,6 +2510,7 @@ GLIBC_2.34 __futimesat64 F
|
||||
GLIBC_2.34 __gai_suspend_time64 F
|
||||
GLIBC_2.34 __getitimer64 F
|
||||
GLIBC_2.34 __getrusage64 F
|
||||
GLIBC_2.34 __getsockopt64 F
|
||||
GLIBC_2.34 __gettimeofday64 F
|
||||
GLIBC_2.34 __glob64_time64 F
|
||||
GLIBC_2.34 __globfree64_time64 F
|
||||
|
@ -2475,6 +2475,7 @@ GLIBC_2.34 __futimesat64 F
|
||||
GLIBC_2.34 __gai_suspend_time64 F
|
||||
GLIBC_2.34 __getitimer64 F
|
||||
GLIBC_2.34 __getrusage64 F
|
||||
GLIBC_2.34 __getsockopt64 F
|
||||
GLIBC_2.34 __gettimeofday64 F
|
||||
GLIBC_2.34 __glob64_time64 F
|
||||
GLIBC_2.34 __globfree64_time64 F
|
||||
|
@ -2330,6 +2330,7 @@ GLIBC_2.34 __futimesat64 F
|
||||
GLIBC_2.34 __gai_suspend_time64 F
|
||||
GLIBC_2.34 __getitimer64 F
|
||||
GLIBC_2.34 __getrusage64 F
|
||||
GLIBC_2.34 __getsockopt64 F
|
||||
GLIBC_2.34 __gettimeofday64 F
|
||||
GLIBC_2.34 __glob64_time64 F
|
||||
GLIBC_2.34 __globfree64_time64 F
|
||||
|
@ -2327,6 +2327,7 @@ GLIBC_2.34 __futimesat64 F
|
||||
GLIBC_2.34 __gai_suspend_time64 F
|
||||
GLIBC_2.34 __getitimer64 F
|
||||
GLIBC_2.34 __getrusage64 F
|
||||
GLIBC_2.34 __getsockopt64 F
|
||||
GLIBC_2.34 __gettimeofday64 F
|
||||
GLIBC_2.34 __glob64_time64 F
|
||||
GLIBC_2.34 __globfree64_time64 F
|
||||
|
@ -2470,6 +2470,7 @@ GLIBC_2.34 __futimesat64 F
|
||||
GLIBC_2.34 __gai_suspend_time64 F
|
||||
GLIBC_2.34 __getitimer64 F
|
||||
GLIBC_2.34 __getrusage64 F
|
||||
GLIBC_2.34 __getsockopt64 F
|
||||
GLIBC_2.34 __gettimeofday64 F
|
||||
GLIBC_2.34 __glob64_time64 F
|
||||
GLIBC_2.34 __globfree64_time64 F
|
||||
|
Loading…
Reference in New Issue
Block a user