d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Auto-generate 2 test cases that differ only in structure and SCM_XXX constant

Browse Source 
used. We can do it programmatically, but that would make code convoluted
and more complex. I have two more of those types coming for the CLOCK_REALTIME
and CLOCK_MONOTONIC. This seems like an elegant and scallable approach.
This commit is contained in:
Maxim Sobolev 2016-12-06 18:22:25 +00:00
parent 4dafad49c6
commit 0d49655f96
5 changed files with 45 additions and 205 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
tools/regression/sockets/unix_cmsg/Makefile
View File

@ -1,11 +1,31 @@
# $FreeBSD$
PROG= unix_cmsg
SRCS= unix_cmsg.c t_bintime.h t_bintime.c uc_common.h uc_common.c \
t_generic.h t_generic.c t_peercred.h t_peercred.c t_timeval.h \
t_timeval.c t_cmsgcred.h t_cmsgcred.c t_sockcred.h t_sockcred.c \
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
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 <bsd.prog.mk>

156
tools/regression/sockets/unix_cmsg/t_bintime.c
View File

@ -1,156 +0,0 @@
/*-
* 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 <sys/cdefs.h>
__FBSDID("$FreeBSD$");
#include <sys/time.h>
#include <sys/types.h>
#include <sys/socket.h>
#include <sys/un.h>
#include <inttypes.h>
#include <stdarg.h>
#include <stdbool.h>
#include <stdlib.h>
#include "t_bintime.h"
#include "t_generic.h"
#include "uc_common.h"
static int
check_scm_bintime(struct cmsghdr *cmsghdr)
{
const struct bintime *bt;
if (uc_check_cmsghdr(cmsghdr, SCM_BINTIME, sizeof(struct bintime)) < 0)
return (-1);
bt = (struct bintime *)CMSG_DATA(cmsghdr);
uc_dbgmsg("bintime.sec %"PRIdMAX", bintime.frac %"PRIu64,
(intmax_t)bt->sec, bt->frac);
return (0);
}
static int
t_bintime_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 bintime));
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_BINTIME, sizeof(struct bintime));
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_bintime_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 bintime));
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_bintime(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_bintime(void)
{
return (t_generic(t_bintime_client, t_bintime_server));
}

29
tools/regression/sockets/unix_cmsg/t_timeval.h
View File

@ -1,29 +0,0 @@
/*-
* 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.
*
* $FreeBSD$
*/
int t_timeval(void);

35
tools/regression/sockets/unix_cmsg/t_timeval.c → tools/regression/sockets/unix_cmsg/t_xxxtime.c.in
View File

@ -27,6 +27,7 @@
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
#include <sys/time.h>
#include <sys/types.h>
#include <sys/socket.h>
#include <sys/un.h>
@ -35,28 +36,29 @@ __FBSDID("$FreeBSD$");
#include <stdbool.h>
#include <stdlib.h>
#include "uc_common.h"
#include "t_%%TTYPE%%.h"
#include "t_generic.h"
#include "t_timeval.h"
#include "uc_common.h"
#if defined(%%SCM_TTYPE%%)
static int
check_scm_timestamp(struct cmsghdr *cmsghdr)
check_scm_%%TTYPE%%(struct cmsghdr *cmsghdr)
{
const struct timeval *tv;
const struct %%DTYPE%% *bt;
if (uc_check_cmsghdr(cmsghdr, SCM_TIMESTAMP, sizeof(struct timeval)) < 0)
if (uc_check_cmsghdr(cmsghdr, %%SCM_TTYPE%%, sizeof(struct %%DTYPE%%)) < 0)
return (-1);
tv = (struct timeval *)CMSG_DATA(cmsghdr);
bt = (struct %%DTYPE%% *)CMSG_DATA(cmsghdr);
uc_dbgmsg("timeval.tv_sec %"PRIdMAX", timeval.tv_usec %"PRIdMAX,
(intmax_t)tv->tv_sec, (intmax_t)tv->tv_usec);
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_timeval_client(int fd)
t_%%TTYPE%%_client(int fd)
{
struct msghdr msghdr;
struct iovec iov[1];
@ -69,14 +71,14 @@ t_timeval_client(int fd)
rv = -2;
cmsg_size = CMSG_SPACE(sizeof(struct timeval));
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_TIMESTAMP, sizeof(struct timeval));
%%SCM_TTYPE%%, sizeof(struct %%DTYPE%%));
if (uc_socket_connect(fd) < 0)
goto done;
@ -91,7 +93,7 @@ t_timeval_client(int fd)
}
static int
t_timeval_server(int fd1)
t_%%TTYPE%%_server(int fd1)
{
struct msghdr msghdr;
struct iovec iov[1];
@ -107,7 +109,7 @@ t_timeval_server(int fd1)
fd2 = -1;
rv = -2;
cmsg_size = CMSG_SPACE(sizeof(struct timeval));
cmsg_size = CMSG_SPACE(sizeof(struct %%DTYPE%%));
cmsg_data = malloc(cmsg_size);
if (cmsg_data == NULL) {
uc_logmsg("malloc");
@ -135,7 +137,7 @@ t_timeval_server(int fd1)
break;
cmsghdr = CMSG_FIRSTHDR(&msghdr);
if (check_scm_timestamp(cmsghdr) < 0)
if (check_scm_%%TTYPE%%(cmsghdr) < 0)
break;
}
if (i > uc_cfg.ipc_msg.msg_num)
@ -149,7 +151,8 @@ t_timeval_server(int fd1)
}
int
t_timeval(void)
t_%%TTYPE%%(void)
{
return (t_generic(t_timeval_client, t_timeval_server));
return (t_generic(t_%%TTYPE%%_client, t_%%TTYPE%%_server));
}
#endif /* %%SCM_TTYPE%% */

4
tools/regression/sockets/unix_cmsg/t_bintime.h → tools/regression/sockets/unix_cmsg/t_xxxtime.h.in
View File

@ -27,4 +27,6 @@
* $FreeBSD$
*/
int t_bintime(void);
#if defined(%%SCM_TTYPE%%)
int t_%%TTYPE%%(void);
#endif