From owner-dev-commits-src-main@freebsd.org Tue Jun 8 10:49:49 2021 Return-Path: Delivered-To: dev-commits-src-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 4515065D379; Tue, 8 Jun 2021 10:49:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Fzn7K1Xkxz4RwX; Tue, 8 Jun 2021 10:49:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 1D3CD273EF; Tue, 8 Jun 2021 10:49:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 158AnnJ8048664; Tue, 8 Jun 2021 10:49:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 158Ann8V048663; Tue, 8 Jun 2021 10:49:49 GMT (envelope-from git) Date: Tue, 8 Jun 2021 10:49:49 GMT Message-Id: <202106081049.158Ann8V048663@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Lutz Donnerhacke Subject: git: 09307dbfb888 - main - tests/netgraph: Allow receiving answers to messages MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: donner X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 09307dbfb888a98232096c751a96ecb3344aa77c Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for the main branch of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 Jun 2021 10:49:49 -0000 The branch main has been updated by donner: URL: https://cgit.FreeBSD.org/src/commit/?id=09307dbfb888a98232096c751a96ecb3344aa77c commit 09307dbfb888a98232096c751a96ecb3344aa77c Author: Lutz Donnerhacke AuthorDate: 2021-06-05 22:37:22 +0000 Commit: Lutz Donnerhacke CommitDate: 2021-06-08 10:49:04 +0000 tests/netgraph: Allow receiving answers to messages Add msg_handler in order to receive messages from netgraph nodes to be tested. Reviewed by: kp MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D30657 --- tests/sys/netgraph/util.c | 17 ++++++++++++----- tests/sys/netgraph/util.h | 2 ++ 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/tests/sys/netgraph/util.c b/tests/sys/netgraph/util.c index 37d005393e91..450a176971a7 100644 --- a/tests/sys/netgraph/util.c +++ b/tests/sys/netgraph/util.c @@ -34,7 +34,6 @@ #include #include #include -#include #include #include @@ -59,9 +58,10 @@ struct data_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); +static void handle_msg(void *ctx); void ng_connect(char const *path1, char const *hook1, @@ -143,14 +143,21 @@ ng_send_data(char const *hook, CHECK(, -1 != NgSendData(ds, hook, data, len)); } +void +ng_register_msg(ng_msg_handler_t proc) { + msg_handler = proc; +} + static void -handle_msg(void) { +handle_msg(void *ctx) { struct ng_mesg *m; char path[NG_PATHSIZ]; ATF_REQUIRE(-1 != NgAllocRecvMsg(cs, &m, path)); - printf("Got message from %s\n", path); + if(msg_handler != NULL) + (*msg_handler)(path, m, ctx); + free(m); } @@ -191,7 +198,7 @@ retry: return 0; default: /* something to do */ if (FD_ISSET(cs, &fds)) - handle_msg(); + handle_msg(context); if (FD_ISSET(ds, &fds)) handle_data(context); return 1; diff --git a/tests/sys/netgraph/util.h b/tests/sys/netgraph/util.h index 73afa5a24805..93ddc91f79bc 100644 --- a/tests/sys/netgraph/util.h +++ b/tests/sys/netgraph/util.h @@ -46,6 +46,8 @@ 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); +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_handle_event (unsigned int ms, void *ctx);