From nobody Mon Jan 13 21:28:56 2025 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 4YX53r2RmDz5kqsk; Mon, 13 Jan 2025 21:28:56 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YX53r1dVqz3jyT; Mon, 13 Jan 2025 21:28:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1736803736; 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=YMZOF1B4o2Vnxf0ZYd25V66L2QlaFlHl6XqfGmXoKr0=; b=PlVS3vM0+C1tuggbwYybt6PIYy7GT883GU9ym2Y2n5OxCzoHYNRlVvJ0xCNYhYeCpD3bli LdDTC/qylcyyGVqXl+IFwBKCasN+suziefc3rJnbCTFdghtNdeNdY1Gm1RjUiuBk9UZATn g3FZ+nPdTUdRcyTbLk1ju0wy5Irl/7ncwMbazD9ozeCPAwgEL0RnadlBYldVetIJazl94J K5fURkHDsYbUt9+3dOFn9S9N+sOps8DnDiL+fvCbjZP34jAToak9a248S1PIuzU/KLcso+ MzDQctDeHrUwUJClM3yVrK536Fmz36dywezgYNIyK+NmXCcj9fvhwXOVl8QReQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1736803736; 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=YMZOF1B4o2Vnxf0ZYd25V66L2QlaFlHl6XqfGmXoKr0=; b=ieuGVuxXxxPI/koZKmxAyvbw7iFgDGtMBNxtnGSosgWfHpNERaDp06vd5FXEQl09W/OfiI I61XwA4ZWsGQ2sht8ispK7fVTIymzqQRMCBfJVz4PR2XnUS3g90i0/+FJ4F9zoWEptorPM 1FgUtpniq0W0eNcPV0OXa78D/f9yKtB4OCbrdWj9wG8HBXWWv63tZGLfshbLPt4xZbdmNH wSr0/zQntMcW/AWX+hCL/InGzfRxLDJROl7F9wI3NzHdIx2JEBwUs9/m7iIa4l+fKG4ulL Sie87MlLFgGxHdRkr213/P5bmONxQJLaJde8G/RNO8BIBXXxIDDZHs570g0Fsw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1736803736; a=rsa-sha256; cv=none; b=Dms4f+Lo+y+joeEZR6VnPn3Pc44JXLJyCPt7AtJVsu0lvja08Qsz8J9x0SjzeuS0hpZqQF 030DFYyeftuIBRho3PDlyl3G9pdEIli1LUVkmm0FX/0Q9TY59gFjiWstc7Pt/8JXUyipPY r5eloMPYE7PHzHGwJ5hgi/+eyeQc6mfW0prl/Wws21Z26Tvs1k8IgkXTKKUDziM4frHwcA BcC8eFRDuSmvl7dG2xxBa/k+kpksPPH26FX8wiz39Lwr57XdVXuz2P4T6jLoCvVB4wCwz4 F9Y5MaBgByPMBWHeGzomWqN9e803UDeqS75NXdlP/4DTB/eK9ubN7gmHv7yMkA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YX53r17s0znn4; Mon, 13 Jan 2025 21:28:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 50DLSuPj066564; Mon, 13 Jan 2025 21:28:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50DLSuAQ066561; Mon, 13 Jan 2025 21:28:56 GMT (envelope-from git) Date: Mon, 13 Jan 2025 21:28:56 GMT Message-Id: <202501132128.50DLSuAQ066561@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: 63f28490237f - main - ng_ksocket: fix build without INET6 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: 63f28490237fd8a8646c897e93b82e1ee0962502 Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=63f28490237fd8a8646c897e93b82e1ee0962502 commit 63f28490237fd8a8646c897e93b82e1ee0962502 Author: Gleb Smirnoff AuthorDate: 2025-01-13 21:27:32 +0000 Commit: Gleb Smirnoff CommitDate: 2025-01-13 21:27:32 +0000 ng_ksocket: fix build without INET6 Fixes: 9234a50752cd47887849d4665af0f9f4abdefb5d --- sys/netgraph/ng_ksocket.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/sys/netgraph/ng_ksocket.c b/sys/netgraph/ng_ksocket.c index 43a2747224f3..74b2e211c0ed 100644 --- a/sys/netgraph/ng_ksocket.c +++ b/sys/netgraph/ng_ksocket.c @@ -44,6 +44,8 @@ * version of a socket... kindof like the reverse of the socket node type. */ +#include "opt_inet6.h" + #include #include #include @@ -313,7 +315,7 @@ ng_ksocket_sockaddr_parse(const struct ng_parse_type *type, sin->sin_len = sizeof(*sin); break; } - +#ifdef INET6 case PF_INET6: { struct sockaddr_in6 *const sin6 = (struct sockaddr_in6 *)sa; @@ -366,7 +368,7 @@ ng_ksocket_sockaddr_parse(const struct ng_parse_type *type, sin6->sin6_len = sizeof(*sin6); break; } - +#endif /* INET6 */ default: return (EINVAL); } @@ -424,7 +426,7 @@ ng_ksocket_sockaddr_unparse(const struct ng_parse_type *type, *off += sizeof(*sin); return(0); } - +#ifdef INET6 case PF_INET6: { const struct sockaddr_in6 *sin6 = (const struct sockaddr_in6 *)sa; @@ -443,7 +445,7 @@ ng_ksocket_sockaddr_unparse(const struct ng_parse_type *type, *off += sizeof(*sin6); return(0); } - +#endif /* INET6 */ default: return (*ng_ksocket_generic_sockaddr_type.supertype->unparse) (&ng_ksocket_generic_sockaddr_type,