From nobody Sat Aug 23 00:11:27 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 4c7yCN0VXwz65RXj; Sat, 23 Aug 2025 00:11:28 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c7yCM4Tbmz3ZvL; Sat, 23 Aug 2025 00:11:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755907887; 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=De5t2xTkzCzvTOuSdCVVLjMEXH/R6721s6M0YNBps7U=; b=OxQv7hXfE2+n7JHmAUi8oA0qFvR6IewG+Zbo4Z0eGpHINNGdl5kllwCbFGjIr2kBqRbufc +1+dUEEcn1l6BEMTeo+gZ9pYp/cn6tjxfCm4WSDDsWxgxdg4IUcnDUg9aavzRZcUOmTlfn h7gNO6JwBFsDj6L9X2Z87qtIq9wkyY4hTX1IFycisylX9rY9VJHxzA0O3FaN1lvyDgLP5O GROgfg15qK4zkZ4hv0/2edGGmKj/6guoIFiTS19vRJqCNS904Qdjcd48nU+uRTTCKZO468 h18RLR7qScXo27qZQxEyxvDJ1IufcTDYd6kgLRemMR6SMq5tCpfhIz8P5D+kUg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755907887; 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=De5t2xTkzCzvTOuSdCVVLjMEXH/R6721s6M0YNBps7U=; b=PpL1tyawX0BshQGeKoXYPU70QccjXQ+rugTAGZC5hBzmO1OQ25PmuQBeaMdEp08mSdy1+8 FRt6AWGZuPbao853NOGEVsb2TmMP+La06UcSR74eFV0fygFDRayetM6hx/MPvMqF0k+buL hKa6klWA0LJ8AA+TirWGHqqkeLt1ALhmfGOc3DlArDJbAMQpaubVrMZd7PDW0VyAavzJJz P49MT07PMbR7x8pM92oeKAjLY4C17gTyoSeZTzCCJpMCMWZxSkQd6lpPEpGDlF3k7koDPT cRNRdmvU179V+rzHIb9QxWKTG95m1N78a9DQyjjqLxpVew+adt7DUFFFb5dxBA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755907887; a=rsa-sha256; cv=none; b=Jw1Rl3GGhIYVHKrMYSGvqyjiygbScKIDUQtbl5LFMcLhT80iQRMYSGNIbYydJsy91wGzVe aHf9z+GrT7N7bs+0h6yqI4eSmijj9qubSoHoHkIeQXpDFgl1TmzNmhMP6ANmQM4xAwTanr ZRism6oAwZ3O/AR4UrRLs0hJSWR+UmFXPTkYc9fPeM7F1kOr9uVeRnhJyxCKSTsTiPvWiF NBXhe92Xq5c90q7Q9G59J4hl6AOtDza8xiNs9f2ww3/aZbvJsJRiUUt4L7E23YGHfqbqNw /6/2UKq/stEvCkIRRY9WNOoHCBfTGBq8ERssfDySkMQ1/ugaOJIsVS1s++uXpg== 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 4c7yCM3n2Wz17FC; Sat, 23 Aug 2025 00:11:27 +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 57N0BRG8099891; Sat, 23 Aug 2025 00:11:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57N0BRnG099888; Sat, 23 Aug 2025 00:11:27 GMT (envelope-from git) Date: Sat, 23 Aug 2025 00:11:27 GMT Message-Id: <202508230011.57N0BRnG099888@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Lexi Winter Subject: git: 8b728c63f777 - stable/14 - ifconfig/ifbridge.c: add get_vlan_id() 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: ivy X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 8b728c63f777f3b2e220fe28fbe24b74f5a7c388 Auto-Submitted: auto-generated The branch stable/14 has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=8b728c63f777f3b2e220fe28fbe24b74f5a7c388 commit 8b728c63f777f3b2e220fe28fbe24b74f5a7c388 Author: Lexi Winter AuthorDate: 2025-07-28 14:09:29 +0000 Commit: Lexi Winter CommitDate: 2025-08-23 00:10:15 +0000 ifconfig/ifbridge.c: add get_vlan_id() This is like get_val() but takes an ether_vlanid_t* and ensures the value is a valid VLAN ID. This avoids redundant comparisons and casting when parsing VLAN IDs. Reviewed by: des Differential Revision: https://reviews.freebsd.org/D51548 (cherry picked from commit 287a5fdcd3c941ce73705c664b5df4932ba3bad4) --- sbin/ifconfig/ifbridge.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/sbin/ifconfig/ifbridge.c b/sbin/ifconfig/ifbridge.c index 2d0af1255a73..973c4f9cfe6e 100644 --- a/sbin/ifconfig/ifbridge.c +++ b/sbin/ifconfig/ifbridge.c @@ -79,6 +79,20 @@ get_val(const char *cp, u_long *valp) return (0); } +static int +get_vlan_id(const char *cp, ether_vlanid_t *valp) +{ + u_long val; + + if (get_val(cp, &val) == -1) + return (-1); + if (val < 0x1 || val > 0xffe) + return (-1); + + *valp = (ether_vlanid_t)val; + return (0); +} + static int do_cmd(if_ctx *ctx, u_long op, void *arg, size_t argsize, int set) {