From nobody Tue Oct 04 03:57:27 2022 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4MhP6b57Mpz4dl1t; Tue, 4 Oct 2022 03:57:27 +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 4MhP6b4BNLz3rqR; Tue, 4 Oct 2022 03:57:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664855847; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KRettu/IqJyQ7TyOHrEse5JgDhaUaLKg8FBsjZ8DJ64=; b=FzmiXCu1NVjip0ww31Zg8yDd7JwW7fzo7brWT74JQ2l/2vKfL5kQjiygVOgfBjDHGFW8mo bifomO7me/igmNogwY1JGMLG5GdZmFWiVPJTyg6MbdVzU0my8r01ualVlwErkaYprlAM67 ZA3WcygB/TzRUuryDqHN9FOghefdmoe7Zm8pG15+NgvI710RH3NmXc33f/wdIyUmfFT+oX hkbpVnsF7dArryZqepsj9ORPaWf2i2QvpVlTqRuco2gFRBrKf/QSJOZbH9dE6wVopzOafA tt/lGkE4GLcSo8mDas/t3VIP/c30NnAAuaxWaouHG0e4TdEIlhlIFeOLQW0z+w== 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 4MhP6b3FtvzQv5; Tue, 4 Oct 2022 03:57:27 +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 2943vRw8015200; Tue, 4 Oct 2022 03:57:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2943vR4M015199; Tue, 4 Oct 2022 03:57:27 GMT (envelope-from git) Date: Tue, 4 Oct 2022 03:57:27 GMT Message-Id: <202210040357.2943vR4M015199@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: 24b96f35b911 - main - netinet*: move ipproto_register() and co to ip_var.h and ip6_var.h List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 24b96f35b9113919602b8e0e6177ac4dfb848482 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664855847; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KRettu/IqJyQ7TyOHrEse5JgDhaUaLKg8FBsjZ8DJ64=; b=dSZcIoq6ELHG2K2pDZCX2NLdiKQkS+2yHpzip2aeS+wxKS2u92RDyOcrSBjpoWh7wmi6a5 8FqJjHPMkMmlc+6cIJwsMwWysDrj+5isAqAk5yk4zDztCOUQGf5objDpQqLB5FE2axYzVR H4SGFqmics3tWTjM2PJJ4b/8GRAVRyd+b7GMHUemvz41XYlMBGXQC8Jv+EqxiyK/vnSjNn sCig7O3mpjHN0qPM/9b+AC+MiNNXfdoAU2XCrPXQLUMjh8lEHzWSH1E8VPr5+IxRI9qGH3 carGyrdjes3hlqTLBjm011yOW+iTnievCbIvvxvNr6BN3vh4OpUHJtR+Vi+DWg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1664855847; a=rsa-sha256; cv=none; b=fK2D98AyaKNa2dd6uQVYVUsOP+p9AO5+AEtmv12IEwYSpJNhza5PxHOMiuG5gWny9KC0K1 NdHsR69TmIg8y+b00yFhIA979AbT41lDl2kSaH/gtav1yvIlCkK6+7XfUwjFOVMwThdZjs qjaSbFeiiCLCjfFQc2FeQgi46YnyQxXhTs9PTFU4UXpfFz5fp5fVbsB4Uh3D4W96JC7hPX Twp+Gyl4o7sKltq+7o64NY8ARddrT1mG15EueLtXScW2a8HnySwtxhE1SoQiBS8IuTcbSS mUiaNpAOgf/z/1RUuNdvxKVdRUIRV+Ci26cGVQMe/nDOi9OjkHaxoCeeP9asKg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=24b96f35b9113919602b8e0e6177ac4dfb848482 commit 24b96f35b9113919602b8e0e6177ac4dfb848482 Author: Gleb Smirnoff AuthorDate: 2022-10-04 03:53:04 +0000 Commit: Gleb Smirnoff CommitDate: 2022-10-04 03:53:04 +0000 netinet*: move ipproto_register() and co to ip_var.h and ip6_var.h This is a FreeBSD KPI and belongs to private header not netinet/in.h. Reviewed by: melifaro Differential revision: https://reviews.freebsd.org/D36723 --- sys/netinet/in.h | 17 ----------------- sys/netinet/ip_var.h | 10 ++++++++++ sys/netinet6/ip6_input.c | 7 ++++--- sys/netinet6/ip6_var.h | 10 ++++++++++ 4 files changed, 24 insertions(+), 20 deletions(-) diff --git a/sys/netinet/in.h b/sys/netinet/in.h index 43d26b9f7804..44d64190ed01 100644 --- a/sys/netinet/in.h +++ b/sys/netinet/in.h @@ -696,23 +696,6 @@ void in_ifdetach(struct ifnet *); #define satosin(sa) ((struct sockaddr_in *)(sa)) #define sintosa(sin) ((struct sockaddr *)(sin)) #define ifatoia(ifa) ((struct in_ifaddr *)(ifa)) - -typedef int ipproto_input_t(struct mbuf **, int *, int); -typedef void ipproto_ctlinput_t(int, struct sockaddr *, void *); -int ipproto_register(uint8_t, ipproto_input_t, ipproto_ctlinput_t); -int ipproto_unregister(uint8_t); -int ip6proto_register(uint8_t, ipproto_input_t, ipproto_ctlinput_t); -int ip6proto_unregister(uint8_t); -#define IPPROTO_REGISTER(prot, input, ctl) do { \ - int error __diagused; \ - error = ipproto_register(prot, input, ctl); \ - MPASS(error == 0); \ -} while (0) -#define IP6PROTO_REGISTER(prot, input, ctl) do { \ - int error __diagused; \ - error = ip6proto_register(prot, input, ctl); \ - MPASS(error == 0); \ -} while (0) #endif /* _KERNEL */ /* INET6 stuff */ diff --git a/sys/netinet/ip_var.h b/sys/netinet/ip_var.h index d7bdb154741c..70afa5e1bce8 100644 --- a/sys/netinet/ip_var.h +++ b/sys/netinet/ip_var.h @@ -239,6 +239,16 @@ extern int (*ip_rsvp_vif)(struct socket *, struct sockopt *); extern void (*ip_rsvp_force_done)(struct socket *); extern int (*rsvp_input_p)(struct mbuf **, int *, int); +typedef int ipproto_input_t(struct mbuf **, int *, int); +typedef void ipproto_ctlinput_t(int, struct sockaddr *, void *); +int ipproto_register(uint8_t, ipproto_input_t, ipproto_ctlinput_t); +int ipproto_unregister(uint8_t); +#define IPPROTO_REGISTER(prot, input, ctl) do { \ + int error __diagused; \ + error = ipproto_register(prot, input, ctl); \ + MPASS(error == 0); \ +} while (0) + VNET_DECLARE(struct pfil_head *, inet_pfil_head); #define V_inet_pfil_head VNET(inet_pfil_head) #define PFIL_INET_NAME "inet" diff --git a/sys/netinet6/ip6_input.c b/sys/netinet6/ip6_input.c index 2407050f6905..5c802beae2ee 100644 --- a/sys/netinet6/ip6_input.c +++ b/sys/netinet6/ip6_input.c @@ -131,9 +131,9 @@ __FBSDID("$FreeBSD$"); #include -ipproto_input_t *ip6_protox[IPPROTO_MAX] = { +ip6proto_input_t *ip6_protox[IPPROTO_MAX] = { [0 ... IPPROTO_MAX - 1] = rip6_input }; -ipproto_ctlinput_t *ip6_ctlprotox[IPPROTO_MAX] = { +ip6proto_ctlinput_t *ip6_ctlprotox[IPPROTO_MAX] = { [0 ... IPPROTO_MAX - 1] = rip6_ctlinput }; VNET_DEFINE(struct in6_ifaddrhead, in6_ifaddrhead); @@ -308,7 +308,8 @@ ip6_init(void *arg __unused) SYSINIT(ip6_init, SI_SUB_PROTO_DOMAIN, SI_ORDER_THIRD, ip6_init, NULL); int -ip6proto_register(uint8_t proto, ipproto_input_t input, ipproto_ctlinput_t ctl) +ip6proto_register(uint8_t proto, ip6proto_input_t input, + ip6proto_ctlinput_t ctl) { MPASS(proto > 0); diff --git a/sys/netinet6/ip6_var.h b/sys/netinet6/ip6_var.h index c78cf52946fe..69ed33bd8e70 100644 --- a/sys/netinet6/ip6_var.h +++ b/sys/netinet6/ip6_var.h @@ -413,6 +413,16 @@ int in6_selectroute(struct sockaddr_in6 *, struct ip6_pktopts *, u_int32_t ip6_randomid(void); u_int32_t ip6_randomflowlabel(void); void in6_delayed_cksum(struct mbuf *m, uint32_t plen, u_short offset); + +typedef int ip6proto_input_t(struct mbuf **, int *, int); +typedef void ip6proto_ctlinput_t(int, struct sockaddr *, void *); +int ip6proto_register(uint8_t, ip6proto_input_t, ip6proto_ctlinput_t); +int ip6proto_unregister(uint8_t); +#define IP6PROTO_REGISTER(prot, input, ctl) do { \ + int error __diagused; \ + error = ip6proto_register(prot, input, ctl); \ + MPASS(error == 0); \ +} while (0) #endif /* _KERNEL */ #endif /* !_NETINET6_IP6_VAR_H_ */