From nobody Sat Jan 20 21:23:03 2024 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 4THTwl3JhSz57X4P; Sat, 20 Jan 2024 21:23:03 +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 4THTwl2nCvz4vWD; Sat, 20 Jan 2024 21:23:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705785783; 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=zETwuUJk86NlpiNelm+am6IXB1essWTo2qt/0AsLXaY=; b=alvMsLDLeWlT9SSKguzeNdUr/wuK99I3QVfnPfS/1yx3F/x2ItE2Fl0c+CKsBj3uvqFjXa k4KKWkeFU8bkPAumZkakNX9JWjfkoMxuprQBGsEcsb3GxWNTdaMpjkI9Qga6iSbTZFifJX +Hr+rNcCh4Z0LKcbWQ5u/CnRKSNEyi9PrS41r2BvpSJAQS1buDYp43JOS6MSr/soI6HR5F 2qtxOSXX/kEFaM6+SQ6lMm0ytJHc9IStxfcV8bszJOlg+Cxec3tYK9k9IoMVgHdbS/Z7GN HzJIO8PjaNCA4E+g6OoxXOG/Qipm8+TDMVwSMlLI/YPPlWh9cegn/1vAqup9Dg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705785783; 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=zETwuUJk86NlpiNelm+am6IXB1essWTo2qt/0AsLXaY=; b=ZVYl0IxuIndZzYsOmaJsiApt2PKkpAnU/UBxwVlVRUaAEizto9k1LJ06WlpCX/mtjxujFa a/vXNgf3sXrfPjCGv4khgbTuPZQ3/raC15Qi9fGLfreCWAUS4+qC/woC2LoNtc858NtpHf 7kqJ8FAiWkPF3eRg9u7glpOEqgYyUKh+Vmewt/XAtqZXo2BwcMwrJZH+5wAkBdW5zbA+EZ j+6Jt3E06dKcegiiHMvbKf7S2hHo5GvCEoA5t8MVliVLnztahegvuSrYW+Wg7F5Yp0Qesu uExQbrfhCB2+Qws1G4lquopvbTRNc8LxvVcOYsT3JxA00gcKjuqocE20e5Cg7Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705785783; a=rsa-sha256; cv=none; b=sRVAhjbhs0QmPu9ruFFpXNapSr47/O89e5n6BmIBdT4tAbLuegOTvSllS6K6e89ULXp8mr /qmQCKDEj23wh3a4TyJGiFGU4FooD+875njIYWL2mpSQymwece74FOj+P3Rn8DX09CTcip i89V8j5PHjqjVyxLh1w/S090TAUGHcOQvxM3dAW/beTZf2FB8Up3i5qWcqMF5qZYlbK5j3 lj0YYI2Mgr6dg+djnJzMdxZTJ5B/rU0f/iqUWf5GlkgM62PTOHVMoLBoqXK+FTl8BiBZiP gbsFEfCkXQjiAWaw29h0iGUN4EMPusqi7ILIm5noipUBomXeoWmfNaHFNSaNNg== 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 4THTwl1r4lzrTC; Sat, 20 Jan 2024 21:23:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 40KLN3o0041827; Sat, 20 Jan 2024 21:23:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40KLN3LP041824; Sat, 20 Jan 2024 21:23:03 GMT (envelope-from git) Date: Sat, 20 Jan 2024 21:23:03 GMT Message-Id: <202401202123.40KLN3LP041824@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: c3d7bb5aca77 - main - netipsec: fix LINT-NOINET build 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: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c3d7bb5aca7749626b5c70dfa86ee8f07960f44a Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=c3d7bb5aca7749626b5c70dfa86ee8f07960f44a commit c3d7bb5aca7749626b5c70dfa86ee8f07960f44a Author: Kristof Provost AuthorDate: 2024-01-20 14:37:40 +0000 Commit: Kristof Provost CommitDate: 2024-01-20 21:22:21 +0000 netipsec: fix LINT-NOINET build udp_ipsec_input() is used for INET6, so we need it even in NOINET builds. Build the relevant file if either of INET or INET6 are set. --- sys/modules/ipsec/Makefile | 4 +++- sys/netipsec/ipsec_support.h | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/sys/modules/ipsec/Makefile b/sys/modules/ipsec/Makefile index 7aaac6f79525..08a2e88d5794 100644 --- a/sys/modules/ipsec/Makefile +++ b/sys/modules/ipsec/Makefile @@ -5,6 +5,8 @@ KMOD= ipsec SRCS= if_ipsec.c ipsec.c ipsec_input.c ipsec_mbuf.c ipsec_mod.c \ ipsec_output.c xform_ah.c xform_esp.c xform_ipcomp.c \ opt_inet.h opt_inet6.h opt_ipsec.h opt_kern_tls.h opt_sctp.h -SRCS.INET= udpencap.c +.if "${MK_INET}" != "no" || "${MK_INET6}" != "no" +SRCS+= udpencap.c +.endif .include diff --git a/sys/netipsec/ipsec_support.h b/sys/netipsec/ipsec_support.h index 905b2b6cd764..b7be62104d12 100644 --- a/sys/netipsec/ipsec_support.h +++ b/sys/netipsec/ipsec_support.h @@ -49,9 +49,11 @@ int ipsec_init_pcbpolicy(struct inpcb *); int ipsec_delete_pcbpolicy(struct inpcb *); int ipsec_copy_pcbpolicy(struct inpcb *, struct inpcb *); -#ifdef INET +#if defined(INET) || defined(INET6) int udp_ipsec_input(struct mbuf *, int, int); int udp_ipsec_pcbctl(struct inpcb *, struct sockopt *); +#endif +#ifdef INET int ipsec4_in_reject(const struct mbuf *, struct inpcb *); int ipsec4_input(struct mbuf *, int, int); int ipsec4_forward(struct mbuf *);