diff options
| author | Dmitry V. Levin <ldv@strace.io> | 2022-01-07 08:01:00 +0000 |
|---|---|---|
| committer | Dmitry V. Levin <ldv@strace.io> | 2022-01-07 08:01:00 +0000 |
| commit | 95523cd3041ef706e985862e78c58bb67614bd79 (patch) | |
| tree | 23a989c0d6f2feca9019eeb5679e79f29c4272cf | |
| parent | ddd1791daf31db3d2eb3f4479705819fcf8755ab (diff) | |
| download | strace-95523cd3041ef706e985862e78c58bb67614bd79.tar.gz | |
xlat: update SO_VM_* constants
* bundled/linux/include/uapi/linux/vm_sockets.h: Update to
headers_install'ed Linux kernel v5.16-rc8.
* src/xlat/sock_vsock_options.in (SO_VM_SOCKETS_CONNECT_TIMEOUT): Rename
to SO_VM_SOCKETS_CONNECT_TIMEOUT_OLD, renamed by Linux kernel commit
v5.16-rc1~159^2~251.
(SO_VM_SOCKETS_CONNECT_TIMEOUT_NEW): New constant introduced by the same
commit.
| -rw-r--r-- | bundled/linux/include/uapi/linux/vm_sockets.h | 11 | ||||
| -rw-r--r-- | src/xlat/sock_vsock_options.in | 3 |
2 files changed, 12 insertions, 2 deletions
diff --git a/bundled/linux/include/uapi/linux/vm_sockets.h b/bundled/linux/include/uapi/linux/vm_sockets.h index 6fe66a01d..3692d4391 100644 --- a/bundled/linux/include/uapi/linux/vm_sockets.h +++ b/bundled/linux/include/uapi/linux/vm_sockets.h @@ -64,7 +64,7 @@ * timeout for a STREAM socket. */ -#define SO_VM_SOCKETS_CONNECT_TIMEOUT 6 +#define SO_VM_SOCKETS_CONNECT_TIMEOUT_OLD 6 /* Option name for using non-blocking send/receive. Use as the option name * for setsockopt(3) or getsockopt(3) to set or get the non-blocking @@ -81,6 +81,15 @@ #define SO_VM_SOCKETS_NONBLOCK_TXRX 7 +#define SO_VM_SOCKETS_CONNECT_TIMEOUT_NEW 8 + +#if __BITS_PER_LONG == 64 || (defined(__x86_64__) && defined(__ILP32__)) +#define SO_VM_SOCKETS_CONNECT_TIMEOUT SO_VM_SOCKETS_CONNECT_TIMEOUT_OLD +#else +#define SO_VM_SOCKETS_CONNECT_TIMEOUT \ + (sizeof(time_t) == sizeof(__kernel_long_t) ? SO_VM_SOCKETS_CONNECT_TIMEOUT_OLD : SO_VM_SOCKETS_CONNECT_TIMEOUT_NEW) +#endif + /* The vSocket equivalent of INADDR_ANY. This works for the svm_cid field of * sockaddr_vm and indicates the context ID of the current endpoint. */ diff --git a/src/xlat/sock_vsock_options.in b/src/xlat/sock_vsock_options.in index e268205fa..1700fa5f0 100644 --- a/src/xlat/sock_vsock_options.in +++ b/src/xlat/sock_vsock_options.in @@ -5,5 +5,6 @@ SO_VM_SOCKETS_BUFFER_MIN_SIZE 1 SO_VM_SOCKETS_BUFFER_MAX_SIZE 2 SO_VM_SOCKETS_PEER_HOST_VM_ID 3 SO_VM_SOCKETS_TRUSTED 5 -SO_VM_SOCKETS_CONNECT_TIMEOUT 6 +SO_VM_SOCKETS_CONNECT_TIMEOUT_OLD 6 SO_VM_SOCKETS_NONBLOCK_TXRX 7 +SO_VM_SOCKETS_CONNECT_TIMEOUT_NEW 8 |