diff --git a/tests/sys/netgraph/util.c b/tests/sys/netgraph/util.c index 450a176971a7..dbf62599aa04 100644 --- a/tests/sys/netgraph/util.c +++ b/tests/sys/netgraph/util.c @@ -1,240 +1,249 @@ /* * SPDX-License-Identifier: BSD-3-Clause * * Copyright 2021 Lutz Donnerhacke * * 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. * 3. Neither the name of the copyright holder nor the names of its * contributors may be used to endorse or promote products derived * from this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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 COPYRIGHT HOLDER 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 #include #include #include #include #include #include "util.h" static int cs = -1, ds = -1; static ng_error_t error_handling = FAIL; -#define CHECK(r, x) do { \ - if (error_handling == FAIL) \ - ATF_REQUIRE(x); \ - else if(!(x)) \ - return r; \ +#define CHECK(r, x) do { \ + if (!(x)) { \ + if (error_handling == PASS) \ + return r; \ + atf_tc_fail_requirement(file, line, "%s (%s)", \ + #x " not met", strerror(errno));\ + } \ } while(0) struct data_handler { char const *hook; ng_data_handler_t handler; SLIST_ENTRY(data_handler) next; }; static SLIST_HEAD(, data_handler) data_head = SLIST_HEAD_INITIALIZER(data_head); static ng_msg_handler_t msg_handler = NULL; static void handle_data(void *ctx); static void handle_msg(void *ctx); void -ng_connect(char const *path1, char const *hook1, - char const *path2, char const *hook2) +_ng_connect(char const *path1, char const *hook1, + char const *path2, char const *hook2, + char const *file, size_t line) { struct ngm_connect c; strncpy(c.ourhook, hook1, sizeof(c.ourhook)); strncpy(c.peerhook, hook2, sizeof(c.peerhook)); strncpy(c.path, path2, sizeof(c.path)); CHECK(, -1 != NgSendMsg(cs, path1, NGM_GENERIC_COOKIE, NGM_CONNECT, &c, sizeof(c))); } void -ng_mkpeer(char const *path1, char const *hook1, - char const *type, char const *hook2) +_ng_mkpeer(char const *path1, char const *hook1, + char const *type, char const *hook2, + char const *file, size_t line) { struct ngm_mkpeer p; strncpy(p.ourhook, hook1, sizeof(p.ourhook)); strncpy(p.peerhook, hook2, sizeof(p.peerhook)); strncpy(p.type, type, sizeof(p.type)); CHECK(, -1 != NgSendMsg(cs, path1, NGM_GENERIC_COOKIE, NGM_MKPEER, &p, sizeof(p))); } void -ng_rmhook(char const *path, char const *hook) +_ng_rmhook(char const *path, char const *hook, + char const *file, size_t line) { struct ngm_rmhook h; strncpy(h.ourhook, hook, sizeof(h.ourhook)); CHECK(, -1 != NgSendMsg(cs, path, NGM_GENERIC_COOKIE, NGM_RMHOOK, &h, sizeof(h))); } void -ng_name(char const *path, char const *name) +_ng_name(char const *path, char const *name, + char const *file, size_t line) { struct ngm_name n; strncpy(n.name, name, sizeof(n.name)); CHECK(, -1 != NgSendMsg(cs, path, NGM_GENERIC_COOKIE, NGM_NAME, &n, sizeof(n))); } void -ng_shutdown(char const *path) +_ng_shutdown(char const *path, + char const *file, size_t line) { CHECK(, -1 != NgSendMsg(cs, path, NGM_GENERIC_COOKIE, NGM_SHUTDOWN, NULL, 0)); } void ng_register_data(char const *hook, ng_data_handler_t proc) { struct data_handler *p; ATF_REQUIRE(NULL != (p = calloc(1, sizeof(struct data_handler)))); ATF_REQUIRE(NULL != (p->hook = strdup(hook))); ATF_REQUIRE(NULL != (p->handler = proc)); SLIST_INSERT_HEAD(&data_head, p, next); } void -ng_send_data(char const *hook, - void const *data, size_t len) +_ng_send_data(char const *hook, + void const *data, size_t len, + char const *file, size_t line) { CHECK(, -1 != NgSendData(ds, hook, data, len)); } void ng_register_msg(ng_msg_handler_t proc) { msg_handler = proc; } static void handle_msg(void *ctx) { struct ng_mesg *m; char path[NG_PATHSIZ]; ATF_REQUIRE(-1 != NgAllocRecvMsg(cs, &m, path)); if(msg_handler != NULL) (*msg_handler)(path, m, ctx); free(m); } static void handle_data(void *ctx) { char hook[NG_HOOKSIZ]; struct data_handler *hnd; u_char *data; int len; ATF_REQUIRE(0 < (len = NgAllocRecvData(ds, &data, hook))); SLIST_FOREACH(hnd, &data_head, next) if (0 == strcmp(hnd->hook, hook)) break; if (hnd != NULL) (*(hnd->handler))(data, len, ctx); free(data); } int ng_handle_event(unsigned int ms, void *context) { fd_set fds; int maxfd = (ds < cs) ? cs : ds; struct timeval timeout = { 0, ms * 1000lu }; FD_ZERO(&fds); FD_SET(cs, &fds); FD_SET(ds, &fds); retry: switch (select(maxfd+1, &fds, NULL, NULL, &timeout)) { case -1: ATF_REQUIRE_ERRNO(EINTR, 1); goto retry; case 0: /* timeout */ return 0; default: /* something to do */ if (FD_ISSET(cs, &fds)) handle_msg(context); if (FD_ISSET(ds, &fds)) handle_data(context); return 1; } } void ng_handle_events(unsigned int ms, void *context) { while(ng_handle_event(ms, context)) ; } int -ng_send_msg(char const *path, char const *msg) +_ng_send_msg(char const *path, char const *msg, + char const *file, size_t line) { int res; CHECK(-1, -1 != (res = NgSendAsciiMsg(cs, path, "%s", msg))); return (res); } ng_error_t ng_errors(ng_error_t n) { ng_error_t o = error_handling; error_handling = n; return (o); } void -ng_init(void) { +_ng_init(char const *file, size_t line) { if (cs >= 0) /* prevent reinit */ return; - ATF_REQUIRE(0 == NgMkSockNode(NULL, &cs, &ds)); + CHECK(, 0 == NgMkSockNode(NULL, &cs, &ds)); NgSetDebug(3); } diff --git a/tests/sys/netgraph/util.h b/tests/sys/netgraph/util.h index 93ddc91f79bc..41243e15fb10 100644 --- a/tests/sys/netgraph/util.h +++ b/tests/sys/netgraph/util.h @@ -1,59 +1,87 @@ /* * SPDX-License-Identifier: BSD-3-Clause * * Copyright 2021 Lutz Donnerhacke * * 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. * 3. Neither the name of the copyright holder nor the names of its * contributors may be used to endorse or promote products derived * from this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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 COPYRIGHT HOLDER 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 -void ng_connect (char const *path1, char const *hook1, - char const *path2, char const *hook2); -void ng_mkpeer (char const *path1, char const *hook1, - char const *type, char const *hook2); -void ng_shutdown(char const *path); -void ng_rmhook (char const *path, char const *hook); -void ng_name (char const *path, char const *name); +void _ng_connect (char const *path1, char const *hook1, + char const *path2, char const *hook2, + char const *file, size_t line); +#define ng_connect(p1,h1,p2,h2) \ + _ng_connect(p1,h1,p2,h2,__FILE__,__LINE__) + +void _ng_mkpeer (char const *path1, char const *hook1, + char const *type, char const *hook2, + char const *file, size_t line); +#define ng_mkpeer(p1,h1,t,h2) \ + _ng_mkpeer(p1,h1,t,h2,__FILE__,__LINE__) + +void _ng_shutdown(char const *path, + char const *file, size_t line); +#define ng_shutdown(p) \ + _ng_shutdown(p,__FILE__,__LINE__) + +void _ng_rmhook (char const *path, char const *hook, + char const *file, size_t line); +#define ng_rmhook(p,h) \ + _ng_rmhook(p,h,__FILE__,__LINE__) + +void _ng_name (char const *path, char const *name, + char const *file, size_t line); +#define ng_name(p,n) \ + _ng_name(p,n,__FILE__,__LINE__) + typedef void (*ng_data_handler_t)(void *, size_t, void *ctx); void ng_register_data(char const *hook, ng_data_handler_t proc); -void ng_send_data(char const *hook, void const *, size_t); +void _ng_send_data(char const *hook, void const *, size_t, + char const *file, size_t line); +#define ng_send_data(h,d,l) \ + _ng_send_data(h,d,l,__FILE__,__LINE__) typedef void (*ng_msg_handler_t)(char const *, struct ng_mesg *, void *); void ng_register_msg(ng_msg_handler_t proc); -int ng_send_msg(char const *path, char const *msg); +int _ng_send_msg(char const *path, char const *msg, + char const *file, size_t line); +#define ng_send_msg(p,m) \ + _ng_send_msg(p,m,__FILE__,__LINE__) int ng_handle_event (unsigned int ms, void *ctx); void ng_handle_events(unsigned int ms, void *ctx); typedef enum { FAIL, PASS } ng_error_t; ng_error_t ng_errors(ng_error_t); -void ng_init(void); +void _ng_init(char const *file, size_t line); +#define ng_init() \ + _ng_init(__FILE__,__LINE__)