picnoir/glibc
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

linux: Use socket-constants-time64.h on tst-socket-timestamp-compat

Browse source 
The kernel header might not define the SO_TIMESTAMP{NS}_OLD or
SO_TIMESTAMP{NS}_NEW if it older than v5.1.

Reviewed-by: Carlos O'Donell <carlos@redhat.com>
Reviewed-by: Tulio Magno Quites Machado Filho <tuliom@linux.ibm.com>
This commit is contained in:
Adhemerval Zanella 2022-02-14 10:35:30 -03:00
parent f9db5433f3
commit fee62d6c62
1 changed files with 13 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
sysdeps/unix/sysv/linux/tst-socket-timestamp-compat.c
View file

@ -22,6 +22,7 @@
#include <support/xsocket.h>
#include <support/xunistd.h>
#include <stdbool.h>
#include <socket-constants-time64.h>
/* AF_INET socket and address used to receive data. */
static int srv;
@ -88,7 +89,7 @@ do_test_large_buffer (bool mc)
/* Enable 32 bit timeval precision and check if no 64 bit timeval stamp
is created. */
{
int r = setsockopt (srv, SOL_SOCKET, SO_TIMESTAMP_OLD, &(int){1},
int r = setsockopt (srv, SOL_SOCKET, COMPAT_SO_TIMESTAMP_OLD, &(int){1},
sizeof (int));
TEST_VERIFY_EXIT (r != -1);
@ -103,10 +104,10 @@ do_test_large_buffer (bool mc)
if (cmsg->cmsg_level != SOL_SOCKET)
continue;
if (sizeof (time_t) > 4 && cmsg->cmsg_type == SO_TIMESTAMP_NEW)
if (sizeof (time_t) > 4 && cmsg->cmsg_type == COMPAT_SO_TIMESTAMP_NEW)
found_timestamp = true;
else
TEST_VERIFY (cmsg->cmsg_type != SO_TIMESTAMP_NEW);
TEST_VERIFY (cmsg->cmsg_type != COMPAT_SO_TIMESTAMP_NEW);
}
TEST_COMPARE (found_timestamp, sizeof (time_t) > 4);
@ -114,7 +115,7 @@ do_test_large_buffer (bool mc)
/* Same as before, but for timespec. */
{
int r = setsockopt (srv, SOL_SOCKET, SO_TIMESTAMPNS_OLD, &(int){1},
int r = setsockopt (srv, SOL_SOCKET, COMPAT_SO_TIMESTAMPNS_OLD, &(int){1},
sizeof (int));
TEST_VERIFY_EXIT (r != -1);
@ -129,10 +130,10 @@ do_test_large_buffer (bool mc)
if (cmsg->cmsg_level != SOL_SOCKET)
continue;
if (sizeof (time_t) > 4 && cmsg->cmsg_type == SO_TIMESTAMPNS_NEW)
if (sizeof (time_t) > 4 && cmsg->cmsg_type == COMPAT_SO_TIMESTAMPNS_NEW)
found_timestamp = true;
else
TEST_VERIFY (cmsg->cmsg_type != SO_TIMESTAMPNS_NEW);
TEST_VERIFY (cmsg->cmsg_type != COMPAT_SO_TIMESTAMPNS_NEW);
}
TEST_COMPARE (found_timestamp, sizeof (time_t) > 4);
@ -151,7 +152,7 @@ do_test_small_buffer (bool mc)
/* Enable 32 bit timeval precision and check if no 64 bit timeval stamp
is created. */
{
int r = setsockopt (srv, SOL_SOCKET, SO_TIMESTAMP_OLD, &(int){1},
int r = setsockopt (srv, SOL_SOCKET, COMPAT_SO_TIMESTAMP_OLD, &(int){1},
sizeof (int));
TEST_VERIFY_EXIT (r != -1);
@ -172,10 +173,10 @@ do_test_small_buffer (bool mc)
if (cmsg->cmsg_level != SOL_SOCKET)
continue;
if (sizeof (time_t) > 4 && cmsg->cmsg_type == SO_TIMESTAMP_NEW)
if (sizeof (time_t) > 4 && cmsg->cmsg_type == COMPAT_SO_TIMESTAMP_NEW)
found_timestamp = true;
else
TEST_VERIFY (cmsg->cmsg_type != SO_TIMESTAMP_NEW);
TEST_VERIFY (cmsg->cmsg_type != COMPAT_SO_TIMESTAMP_NEW);
}
if (sizeof (time_t) > 4)
@ -192,7 +193,7 @@ do_test_small_buffer (bool mc)
/* Same as before, but for timespec. */
{
int r = setsockopt (srv, SOL_SOCKET, SO_TIMESTAMPNS_OLD, &(int){1},
int r = setsockopt (srv, SOL_SOCKET, COMPAT_SO_TIMESTAMPNS_OLD, &(int){1},
sizeof (int));
TEST_VERIFY_EXIT (r != -1);
@ -213,10 +214,10 @@ do_test_small_buffer (bool mc)
if (cmsg->cmsg_level != SOL_SOCKET)
continue;
if (sizeof (time_t) > 4 && cmsg->cmsg_type == SO_TIMESTAMPNS_NEW)
if (sizeof (time_t) > 4 && cmsg->cmsg_type == COMPAT_SO_TIMESTAMPNS_NEW)
found_timestamp = true;
else
TEST_VERIFY (cmsg->cmsg_type != SO_TIMESTAMPNS_NEW);
TEST_VERIFY (cmsg->cmsg_type != COMPAT_SO_TIMESTAMPNS_NEW);
}
if (sizeof (time_t) > 4)