|
@@ -8,6 +8,8 @@
|
|
|
#define IS32BIT(x) !((x)+0x80000000ULL>>32)
|
|
|
#define CLAMP(x) (int)(IS32BIT(x) ? (x) : 0x7fffffffU+((0ULL+(x))>>63))
|
|
|
|
|
|
+hidden void __convert_scm_timestamps(struct msghdr *, socklen_t);
|
|
|
+
|
|
|
int recvmmsg(int fd, struct mmsghdr *msgvec, unsigned int vlen, unsigned int flags, struct timespec *timeout)
|
|
|
{
|
|
|
#if LONG_MAX > INT_MAX
|
|
@@ -19,14 +21,18 @@ int recvmmsg(int fd, struct mmsghdr *msgvec, unsigned int vlen, unsigned int fla
|
|
|
#ifdef SYS_recvmmsg_time64
|
|
|
time_t s = timeout ? timeout->tv_sec : 0;
|
|
|
long ns = timeout ? timeout->tv_nsec : 0;
|
|
|
- int r = -ENOSYS;
|
|
|
- if (SYS_recvmmsg == SYS_recvmmsg_time64 || !IS32BIT(s))
|
|
|
- r = __syscall_cp(SYS_recvmmsg_time64, fd, msgvec, vlen, flags,
|
|
|
+ int r = __syscall_cp(SYS_recvmmsg_time64, fd, msgvec, vlen, flags,
|
|
|
timeout ? ((long long[]){s, ns}) : 0);
|
|
|
if (SYS_recvmmsg == SYS_recvmmsg_time64 || r!=-ENOSYS)
|
|
|
return __syscall_ret(r);
|
|
|
- return syscall_cp(SYS_recvmmsg, fd, msgvec, vlen, flags,
|
|
|
+ if (vlen > IOV_MAX) vlen = IOV_MAX;
|
|
|
+ socklen_t csize[vlen];
|
|
|
+ for (int i=0; i<vlen; i++) csize[i] = msgvec[i].msg_hdr.msg_controllen;
|
|
|
+ r = __syscall_cp(SYS_recvmmsg, fd, msgvec, vlen, flags,
|
|
|
timeout ? ((long[]){CLAMP(s), ns}) : 0);
|
|
|
+ for (int i=0; i<r; i++)
|
|
|
+ __convert_scm_timestamps(&msgvec[i].msg_hdr, csize[i]);
|
|
|
+ return __syscall_ret(r);
|
|
|
#else
|
|
|
return syscall_cp(SYS_recvmmsg, fd, msgvec, vlen, flags, timeout);
|
|
|
#endif
|