From nobody Sat Sep 03 22:44:26 2022 X-Original-To: dev-commits-src-all@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 4MKqbL25D0z4bmVR; Sat, 3 Sep 2022 22:44:30 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (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 "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4MKqbL1c7wz4J5n; Sat, 3 Sep 2022 22:44:30 +0000 (UTC) (envelope-from bz@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1662245070; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=KChALpQEL2aQDimWGlR99kuoSiWO0vwJfC8V6neiH9M=; b=AkE7dHAwkrfDhvpDyNbs41yFNGL0H3oAPum0QTlO8y6qWXBxVMxu0nD26SnDiMv4Q8Acs5 tBdqWHLgboBTt5eLnOaraLkOryUnug+WK1G+VMTw2bKb4SIpAPnjD8V54fOvpd9m++GMiF YnHf9T0eeoJ+UuBmz0z9CviYoGT4xs7tenXGeRKkcSXS6GAvIkw7gqqyJev2IYfrxWGT+n NK2QeUmGiFCWnjv4cp9Fo+p6KuFPgf97u/mSRgdOixEvzT0nvmAlaX2C28gXpnf1BJR6Xr V6eADQ2sVWqVrMVw1dyUU2QJPTNryVW6PSATi1hthMA3iygm8Rp5oPL9uEdgVA== Received: from mx1.sbone.de (cross.sbone.de [195.201.62.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mx1.sbone.de", Issuer "SBone.DE" (not verified)) (Authenticated sender: bz/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4MKqbK6NRdzlZY; Sat, 3 Sep 2022 22:44:29 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from mail.sbone.de (mail.sbone.de [IPv6:fde9:577b:c1a9:4902:0:7404:2:1025]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.sbone.de (Postfix) with ESMTPS id 84D038D4A213; Sat, 3 Sep 2022 22:44:28 +0000 (UTC) Received: from content-filter.t4-02.sbone.de (content-filter.t4-02.sbone.de [IPv6:fde9:577b:c1a9:4902:0:7404:2:2742]) (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) (No client certificate requested) by mail.sbone.de (Postfix) with ESMTPS id A34DE5C3A831; Sat, 3 Sep 2022 22:44:27 +0000 (UTC) X-Virus-Scanned: amavisd-new at sbone.de Received: from mail.sbone.de ([IPv6:fde9:577b:c1a9:4902:0:7404:2:1025]) by content-filter.t4-02.sbone.de (content-filter.t4-02.sbone.de [IPv6:fde9:577b:c1a9:4902:0:7404:2:2742]) (amavisd-new, port 10024) with ESMTP id PnLJRgXhfxss; Sat, 3 Sep 2022 22:44:26 +0000 (UTC) Received: from strong-iwl0.sbone.de (strong-iwl0.sbone.de [IPv6:fde9:577b:c1a9:4902:b66b:fcff:fef3:e3d2]) (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) (No client certificate requested) by mail.sbone.de (Postfix) with ESMTPSA id 5D7845C3A82F; Sat, 3 Sep 2022 22:44:26 +0000 (UTC) Date: Sat, 3 Sep 2022 22:44:26 +0000 (UTC) From: "Bjoern A. Zeeb" To: Gleb Smirnoff cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: e72c522858cb - main - divert(4): make it compilable and working without INET In-Reply-To: <202208302249.27UMnSwI022109@gitrepo.freebsd.org> Message-ID: <6q6n8553-2143-n24p-4816-406549997s@mnoonqbm.arg> References: <202208302249.27UMnSwI022109@gitrepo.freebsd.org> X-OpenPGP-Key-Id: 0x14003F198FEFA3E77207EE8D2B58B8F83CCF1842 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII; format=flowed ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1662245070; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=KChALpQEL2aQDimWGlR99kuoSiWO0vwJfC8V6neiH9M=; b=iAmqzxQTpF5b+PDK+sXH6H6pGSQSvUYe0APuARbKbWAOehoLqFkq9j3XC3FvkKm1q7lUwx QvJ7gtWB2mCAiezk2M7dkVgSq/uGn537IVEiBVhNDgM94ZQxzTMFH+eD6p5gPEsiD9IJPE WUaNZ7SN73kqWs/UzzBsWGcKpC8hmawPvgEf5BYAnEMH3vntlPYktb/fHaMIpEajw6+vx9 g27TWhBnd5JAWUueQq2OXOiCDurAB9qvszcyFlU9lPFSJDNzZnLYX1ZW2mTP0UEfVAHJWe 2Tj74KVy1JagjHQphTFYbbjfImVNNcAOaHI1hS7HBiLyRdGUgKuNzYMu5UJqjg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1662245070; a=rsa-sha256; cv=none; b=mzg+ZiNQNuucky3YtkYXx4RWdsIpMUDsMdMGOJyCANjjDQiCq+8cdvyKQw+rt0RSv97gnO 7oBRBirPxIOGCRwFHAVvxWk/9GUTuBGDrdCc9DyM3Zc0IYBWF+CCKH9NISFUdstzVd/tLW 6oEIvSb4CEAamoxcd8UrsyEpf890tHTPzoHpNG/yru5418EqPFnBHw3eRb9+ZUiTx4RMBZ 22pbbXYrbR8q4ZWDydTW/mmiLOFQDSsZ+a8B5BfmZot7b++7Apxm8AsS2UXsEO7OqvbfnB VsvA8SDZaVJqiXbH1ykhr3vkMsYauZJ+Up5YIaB/U67/G+ldpVJ8d2JU6KuKFg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N On Tue, 30 Aug 2022, Gleb Smirnoff wrote: > The branch main has been updated by glebius: > > URL: https://cgit.FreeBSD.org/src/commit/?id=e72c522858cb3fe179b8ec5700cdbf46c45e917e > > commit e72c522858cb3fe179b8ec5700cdbf46c45e917e > Author: Gleb Smirnoff > AuthorDate: 2022-08-30 22:09:21 +0000 > Commit: Gleb Smirnoff > CommitDate: 2022-08-30 22:09:21 +0000 > > divert(4): make it compilable and working without INET > > Differential revision: https://reviews.freebsd.org/D36383 Well, almost at least.... - sysctls require INET - ip_divert_ptr still requires INET or INET6 (raw_ip.c) - one of the SCTP blocks has a early-ended #ifdef INET which can just be fixed easily compared to the two above. diff --git sys/netinet/ip_divert.c sys/netinet/ip_divert.c index 2a5a7677cb71..d1270ee72499 100644 --- sys/netinet/ip_divert.c +++ sys/netinet/ip_divert.c @@ -117,6 +117,8 @@ __FBSDID("$FreeBSD$"); * will apply the entire ruleset to the packet). */ +#ifdef INET static SYSCTL_NODE(_net_inet, OID_AUTO, divert, CTLFLAG_RW | CTLFLAG_MPSAFE, 0, "divert(4)"); +#endif VNET_PCPUSTAT_DEFINE_STATIC(struct divstat, divstat); @@ -125,6 +127,8 @@ VNET_PCPUSTAT_SYSINIT(divstat); VNET_PCPUSTAT_SYSUNINIT(divstat); #endif +#ifdef INET SYSCTL_VNET_PCPUSTAT(_net_inet_divert, OID_AUTO, stats, struct divstat, divstat, "divert(4) socket statistics"); +#endif #define DIVSTAT_INC(name) \ VNET_PCPUSTAT_ADD(struct divstat, divstat, div_ ## name, 1) @@ -191,5 +195,4 @@ divert_packet(struct mbuf *m, bool incoming) m->m_pkthdr.csum_flags &= ~CSUM_DELAY_DATA; } -#endif #if defined(SCTP) || defined(SCTP_SUPPORT) if (m->m_pkthdr.csum_flags & CSUM_SCTP) { @@ -201,4 +204,5 @@ divert_packet(struct mbuf *m, bool incoming) } #endif +#endif /* INET */ #ifdef INET6 if (m->m_pkthdr.csum_flags & CSUM_DELAY_DATA_IPV6) { @@ -686,7 +690,9 @@ div_pcblist(SYSCTL_HANDLER_ARGS) return (error); } +#ifdef INET SYSCTL_PROC(_net_inet_divert, OID_AUTO, pcblist, CTLTYPE_OPAQUE | CTLFLAG_RD | CTLFLAG_MPSAFE, NULL, 0, div_pcblist, "S,xinpcb", "List of active divert sockets"); +#endif static struct protosw div_protosw = { @@ -715,5 +721,7 @@ div_modevent(module_t mod, int type, void *unused) case MOD_LOAD: domain_add(&divertdomain); +#if defined(INET6) || defined(INET) ip_divert_ptr = divert_packet; +#endif break; case MOD_QUIESCE: @@ -747,5 +755,7 @@ div_modevent(module_t mod, int type, void *unused) } DIVERT_UNLOCK(); +#if defined(INET6) || defined(INET) ip_divert_ptr = NULL; +#endif domain_remove(&divertdomain); break; -- Bjoern A. Zeeb r15:7