Index: head/tools/regression/sockets/unix_cmsg/Makefile =================================================================== --- head/tools/regression/sockets/unix_cmsg/Makefile (revision 309772) +++ head/tools/regression/sockets/unix_cmsg/Makefile (revision 309773) @@ -1,31 +1,32 @@ # $FreeBSD$ PROG= unix_cmsg SRCS= ${AUTOSRCS} unix_cmsg.c uc_common.h uc_common.c \ t_generic.h t_generic.c t_peercred.h t_peercred.c \ t_cmsgcred.h t_cmsgcred.c t_sockcred.h t_sockcred.c \ - t_cmsgcred_sockcred.h t_cmsgcred_sockcred.c t_cmsg_len.h t_cmsg_len.c + t_cmsgcred_sockcred.h t_cmsgcred_sockcred.c t_cmsg_len.h t_cmsg_len.c \ + uc_check_time.h uc_check_time.c CLEANFILES+= ${AUTOSRCS} MAN= WARNS?= 3 REXP_bintime= 's|%%TTYPE%%|bintime|g ; s|%%DTYPE%%|bintime|g ; \ s|%%SCM_TTYPE%%|SCM_BINTIME|g ; \ s|%%MAJ_MEMB%%|sec|g ; s|%%MIN_MEMB%%|frac|g' REXP_timeval= 's|%%TTYPE%%|timeval|g ; s|%%DTYPE%%|timeval|g ; \ s|%%SCM_TTYPE%%|SCM_TIMESTAMP|g ; \ s|%%MAJ_MEMB%%|tv_sec|g ; s|%%MIN_MEMB%%|tv_usec|g' .for ttype in bintime timeval AUTOSRCS+= t_${ttype}.h t_${ttype}.c t_${ttype}.o: t_${ttype}.c t_${ttype}.h t_${ttype}.c: t_xxxtime.c.in sed ${REXP_${ttype}} < ${.ALLSRC} > ${.TARGET} t_${ttype}.h: t_xxxtime.h.in sed ${REXP_${ttype}} < ${.ALLSRC} > ${.TARGET} .endfor .include Index: head/tools/regression/sockets/unix_cmsg/t_xxxtime.c.in =================================================================== --- head/tools/regression/sockets/unix_cmsg/t_xxxtime.c.in (revision 309772) +++ head/tools/regression/sockets/unix_cmsg/t_xxxtime.c.in (revision 309773) @@ -1,158 +1,162 @@ /*- * Copyright (c) 2005 Andrey Simonenko * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ #include __FBSDID("$FreeBSD$"); #include #include #include #include #include #include #include #include #include "t_%%TTYPE%%.h" #include "t_generic.h" #include "uc_common.h" +#include "uc_check_time.h" #if defined(%%SCM_TTYPE%%) static int check_scm_%%TTYPE%%(struct cmsghdr *cmsghdr) { const struct %%DTYPE%% *bt; if (uc_check_cmsghdr(cmsghdr, %%SCM_TTYPE%%, sizeof(struct %%DTYPE%%)) < 0) return (-1); bt = (struct %%DTYPE%% *)CMSG_DATA(cmsghdr); + + if (uc_check_%%TTYPE%%(bt) < 0) + return (-1); uc_dbgmsg("%%DTYPE%%.%%MAJ_MEMB%% %"PRIdMAX", %%DTYPE%%.%%MIN_MEMB%% %"PRIuMAX, (intmax_t)bt->%%MAJ_MEMB%%, (uintmax_t)bt->%%MIN_MEMB%%); return (0); } static int t_%%TTYPE%%_client(int fd) { struct msghdr msghdr; struct iovec iov[1]; void *cmsg_data; size_t cmsg_size; int rv; if (uc_sync_recv() < 0) return (-2); rv = -2; cmsg_size = CMSG_SPACE(sizeof(struct %%DTYPE%%)); cmsg_data = malloc(cmsg_size); if (cmsg_data == NULL) { uc_logmsg("malloc"); goto done; } uc_msghdr_init_client(&msghdr, iov, cmsg_data, cmsg_size, %%SCM_TTYPE%%, sizeof(struct %%DTYPE%%)); if (uc_socket_connect(fd) < 0) goto done; if (uc_message_sendn(fd, &msghdr) < 0) goto done; rv = 0; done: free(cmsg_data); return (rv); } static int t_%%TTYPE%%_server(int fd1) { struct msghdr msghdr; struct iovec iov[1]; struct cmsghdr *cmsghdr; void *cmsg_data; size_t cmsg_size; u_int i; int fd2, rv; if (uc_sync_send() < 0) return (-2); fd2 = -1; rv = -2; cmsg_size = CMSG_SPACE(sizeof(struct %%DTYPE%%)); cmsg_data = malloc(cmsg_size); if (cmsg_data == NULL) { uc_logmsg("malloc"); goto done; } if (uc_cfg.sock_type == SOCK_STREAM) { fd2 = uc_socket_accept(fd1); if (fd2 < 0) goto done; } else fd2 = fd1; rv = -1; for (i = 1; i <= uc_cfg.ipc_msg.msg_num; ++i) { uc_dbgmsg("message #%u", i); uc_msghdr_init_server(&msghdr, iov, cmsg_data, cmsg_size); if (uc_message_recv(fd2, &msghdr) < 0) { rv = -2; break; } if (uc_check_msghdr(&msghdr, sizeof(*cmsghdr)) < 0) break; cmsghdr = CMSG_FIRSTHDR(&msghdr); if (check_scm_%%TTYPE%%(cmsghdr) < 0) break; } if (i > uc_cfg.ipc_msg.msg_num) rv = 0; done: free(cmsg_data); if (uc_cfg.sock_type == SOCK_STREAM && fd2 >= 0) if (uc_socket_close(fd2) < 0) rv = -2; return (rv); } int t_%%TTYPE%%(void) { return (t_generic(t_%%TTYPE%%_client, t_%%TTYPE%%_server)); } #endif /* %%SCM_TTYPE%% */ Index: head/tools/regression/sockets/unix_cmsg/uc_check_time.c =================================================================== --- head/tools/regression/sockets/unix_cmsg/uc_check_time.c (nonexistent) +++ head/tools/regression/sockets/unix_cmsg/uc_check_time.c (revision 309773) @@ -0,0 +1,101 @@ +/*- + * Copyright (c) 2016 Maksym Sobolyev + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#include +__FBSDID("$FreeBSD$"); + +#include +#include + +#include "uc_check_time.h" + +static const struct timeval max_diff_tv = {.tv_sec = 1, .tv_usec = 0}; +static const struct timespec max_diff_ts = {.tv_sec = 1, .tv_nsec = 0}; + +#define timespeccmp(tvp, uvp, cmp) \ + (((tvp)->tv_sec == (uvp)->tv_sec) ? \ + ((tvp)->tv_nsec cmp (uvp)->tv_nsec) : \ + ((tvp)->tv_sec cmp (uvp)->tv_sec)) +#define timespecsub(vvp, uvp) \ + do { \ + (vvp)->tv_sec -= (uvp)->tv_sec; \ + (vvp)->tv_nsec -= (uvp)->tv_nsec; \ + if ((vvp)->tv_nsec < 0) { \ + (vvp)->tv_sec--; \ + (vvp)->tv_nsec += 1000000000; \ + } \ + } while (0) + +int +uc_check_bintime(const struct bintime *mt) +{ + struct timespec bt; + + bintime2timespec(mt, &bt); + return (uc_check_timespec_real(&bt)); +} + +int +uc_check_timeval(const struct timeval *bt) +{ + struct timeval ct, dt; + + if (gettimeofday(&ct, NULL) < 0) + return (-1); + timersub(&ct, bt, &dt); + if (!timercmp(&dt, &max_diff_tv, <)) + return (-1); + + return (0); +} + +int +uc_check_timespec_real(const struct timespec *bt) +{ + struct timespec ct; + + if (clock_gettime(CLOCK_REALTIME, &ct) < 0) + return (-1); + timespecsub(&ct, bt); + if (!timespeccmp(&ct, &max_diff_ts, <)) + return (-1); + + return (0); +} + +int +uc_check_timespec_mono(const struct timespec *bt) +{ + struct timespec ct; + + if (clock_gettime(CLOCK_MONOTONIC, &ct) < 0) + return (-1); + timespecsub(&ct, bt); + if (!timespeccmp(&ct, &max_diff_ts, <)) + return (-1); + + return (0); +} Property changes on: head/tools/regression/sockets/unix_cmsg/uc_check_time.c ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +FreeBSD=%H \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/tools/regression/sockets/unix_cmsg/uc_check_time.h =================================================================== --- head/tools/regression/sockets/unix_cmsg/uc_check_time.h (nonexistent) +++ head/tools/regression/sockets/unix_cmsg/uc_check_time.h (revision 309773) @@ -0,0 +1,36 @@ +/*- + * Copyright (c) 2016 Maksym Sobolyev + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * $FreeBSD$ + */ + +struct bintime; +struct timeval; +struct timespec; + +int uc_check_bintime(const struct bintime *bt); +int uc_check_timeval(const struct timeval *bt); +int uc_check_timespec_real(const struct timespec *bt); +int uc_check_timespec_mono(const struct timespec *bt); Property changes on: head/tools/regression/sockets/unix_cmsg/uc_check_time.h ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +FreeBSD=%H \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property