mirror of
https://github.com/systemd/systemd-stable.git
synced 2024-10-26 17:25:34 +03:00
socket-util: introduce CMSG_SPACE_TIMEVAL/TIMESPEC macro to support additional 64bit timeval or timespec
Fixes #20482 and #20564.
(cherry picked from commit 9365e296fe
)
This commit is contained in:
parent
03ea9efe22
commit
0d11d72418
@ -239,6 +239,28 @@ static inline int getsockopt_int(int fd, int level, int optname, int *ret) {
|
|||||||
int socket_bind_to_ifname(int fd, const char *ifname);
|
int socket_bind_to_ifname(int fd, const char *ifname);
|
||||||
int socket_bind_to_ifindex(int fd, int ifindex);
|
int socket_bind_to_ifindex(int fd, int ifindex);
|
||||||
|
|
||||||
|
/* Define a 64bit version of timeval/timespec in any case, even on 32bit userspace. */
|
||||||
|
struct timeval_large {
|
||||||
|
uint64_t tvl_sec, tvl_usec;
|
||||||
|
};
|
||||||
|
struct timespec_large {
|
||||||
|
uint64_t tvl_sec, tvl_nsec;
|
||||||
|
};
|
||||||
|
|
||||||
|
/* glibc duplicates timespec/timeval on certain 32bit archs, once in 32bit and once in 64bit.
|
||||||
|
* See __convert_scm_timestamps() in glibc source code. Hence, we need additional buffer space for them
|
||||||
|
* to prevent from recvmsg_safe() returning -EXFULL. */
|
||||||
|
#define CMSG_SPACE_TIMEVAL \
|
||||||
|
((sizeof(struct timeval) == sizeof(struct timeval_large)) ? \
|
||||||
|
CMSG_SPACE(sizeof(struct timeval)) : \
|
||||||
|
CMSG_SPACE(sizeof(struct timeval)) + \
|
||||||
|
CMSG_SPACE(sizeof(struct timeval_large)))
|
||||||
|
#define CMSG_SPACE_TIMESPEC \
|
||||||
|
((sizeof(struct timespec) == sizeof(struct timespec_large)) ? \
|
||||||
|
CMSG_SPACE(sizeof(struct timespec)) : \
|
||||||
|
CMSG_SPACE(sizeof(struct timespec)) + \
|
||||||
|
CMSG_SPACE(sizeof(struct timespec_large)))
|
||||||
|
|
||||||
ssize_t recvmsg_safe(int sockfd, struct msghdr *msg, int flags);
|
ssize_t recvmsg_safe(int sockfd, struct msghdr *msg, int flags);
|
||||||
|
|
||||||
int socket_pass_pktinfo(int fd, bool b);
|
int socket_pass_pktinfo(int fd, bool b);
|
||||||
|
@ -1273,7 +1273,7 @@ int server_process_datagram(
|
|||||||
* identical to NAME_MAX. For now we use that, but this should be updated one day when the final
|
* identical to NAME_MAX. For now we use that, but this should be updated one day when the final
|
||||||
* limit is known. */
|
* limit is known. */
|
||||||
CMSG_BUFFER_TYPE(CMSG_SPACE(sizeof(struct ucred)) +
|
CMSG_BUFFER_TYPE(CMSG_SPACE(sizeof(struct ucred)) +
|
||||||
CMSG_SPACE(sizeof(struct timeval)) +
|
CMSG_SPACE_TIMEVAL +
|
||||||
CMSG_SPACE(sizeof(int)) + /* fd */
|
CMSG_SPACE(sizeof(int)) + /* fd */
|
||||||
CMSG_SPACE(NAME_MAX) /* selinux label */) control;
|
CMSG_SPACE(NAME_MAX) /* selinux label */) control;
|
||||||
|
|
||||||
|
@ -149,7 +149,7 @@ int icmp6_receive(int fd, void *buffer, size_t size, struct in6_addr *dst,
|
|||||||
triple_timestamp *timestamp) {
|
triple_timestamp *timestamp) {
|
||||||
|
|
||||||
CMSG_BUFFER_TYPE(CMSG_SPACE(sizeof(int)) + /* ttl */
|
CMSG_BUFFER_TYPE(CMSG_SPACE(sizeof(int)) + /* ttl */
|
||||||
CMSG_SPACE(sizeof(struct timeval))) control;
|
CMSG_SPACE_TIMEVAL) control;
|
||||||
struct iovec iov = {};
|
struct iovec iov = {};
|
||||||
union sockaddr_union sa = {};
|
union sockaddr_union sa = {};
|
||||||
struct msghdr msg = {
|
struct msghdr msg = {
|
||||||
|
@ -413,7 +413,7 @@ static int manager_receive_response(sd_event_source *source, int fd, uint32_t re
|
|||||||
.iov_base = &ntpmsg,
|
.iov_base = &ntpmsg,
|
||||||
.iov_len = sizeof(ntpmsg),
|
.iov_len = sizeof(ntpmsg),
|
||||||
};
|
};
|
||||||
CMSG_BUFFER_TYPE(CMSG_SPACE(sizeof(struct timespec))) control;
|
CMSG_BUFFER_TYPE(CMSG_SPACE_TIMESPEC) control;
|
||||||
union sockaddr_union server_addr;
|
union sockaddr_union server_addr;
|
||||||
struct msghdr msghdr = {
|
struct msghdr msghdr = {
|
||||||
.msg_iov = &iov,
|
.msg_iov = &iov,
|
||||||
|
Loading…
Reference in New Issue
Block a user