From nobody Fri Apr 11 14:03:57 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 4ZYz1p0C3qz5s48D; Fri, 11 Apr 2025 14:03:58 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZYz1n3znlz43MP; Fri, 11 Apr 2025 14:03:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1744380237; 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=voYM8R1x6bWq2b2jJlZ/50nxabDFWZZQ3kAcM7ANUKM=; b=YVcn8wfzf9jH2H9wc7fFZYZuwXdrHTlfRvs6R4VInHqqVgodLjrlTkoUXMNcWwNatyvFp2 tExbqsMca5KjN+vn1ZDd/8lzczg+e6z4FsseF09lczgvlxR6Kd8Z/fA/TbZn8qrlFXLKyd QYMsnBuhi5m5mNRYB9Jtzdy6pogCbKUtnetCBHS+jQ22aFVQUZHZ5qcQlu1ayfpswxKE1J HVqQg5DX+wnZ/Sjmmk0pf23aLoYhJG3Rtr+ovDhk0fwNg2VB4jBV95Ri/OxgY7w+3MrDh9 hMHRvOAR4m1O7AreVHyqHEH3m6U0qi58pDx/nkMZe5YmKgOFRcughoa6Gl6a5Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1744380237; a=rsa-sha256; cv=none; b=rIC7pSDBFDVxWX8HZqbTYL7B1LZdRaw0NK9noq4gSY6gqvzQ9K67wxLXppneeg9D/g10Ua v7BtzaRqaOaYUNtjEs5qfsoc2ZdK04pxM3mQceokEy5KrLHN76UxJ0lvENZ65xuD41h7aj 1ZzatgKX1mRPcriK9pIv7Ce9IsgCq9CIKJezaSNLK3g32QGH/r9isMjtp1UvX/rk2IZ6zY aRpU5fBRpGz21AI3cfPbhKth/Wq6pPEN/6QNcLGgK5oPiyXSvHDVu+BKybmNiN99Fmv58T sLMU7AdXmezjbt3A6KFHyqiUxcgB9FysyzH5G6pq8gJVLDOsPnV1Z3JtW2TI3w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1744380237; 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=voYM8R1x6bWq2b2jJlZ/50nxabDFWZZQ3kAcM7ANUKM=; b=GgR//JPmQEORoDgEH1erB2nTjTaNjWLGqOZb//omA/fmhgBMU0Sf1Ar1M+5Um6NDpaCFmR paw3PgdqqGfYGA/f/QH+ARpb+FxxQWYpqeayqOQ+JsUuznGVxfWQenyQ5S8zXcsCRFaV4V KnxatMon4JuVZGzWBz6+JHTQU7awIzSN4OiHOih6UHzfWh+EbZonGdZeoVMULPn/y4igDY /dAQ88ESTSd4l4VN4VSlRP9onayBBI1PZRa1/nlMWLMpfxAfRvo/RyNAVT92VtMLFvPycw HXOrqXnRnxGxHguVSpeK1Zytbo0/ZrQcVSaEIRrhUfiRvKvvt8+BxbN6uM+16g== 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 4ZYz1n3RrfzcLh; Fri, 11 Apr 2025 14:03:57 +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 53BE3vRC053614; Fri, 11 Apr 2025 14:03:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53BE3vEm053611; Fri, 11 Apr 2025 14:03:57 GMT (envelope-from git) Date: Fri, 11 Apr 2025 14:03:57 GMT Message-Id: <202504111403.53BE3vEm053611@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 251439f1a068 - main - ctld: Remove dead code in UCL parsing of hex DSCP values 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 251439f1a06867a6baccb274c671b2169c9959fd Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=251439f1a06867a6baccb274c671b2169c9959fd commit 251439f1a06867a6baccb274c671b2169c9959fd Author: John Baldwin AuthorDate: 2025-04-11 14:00:39 +0000 Commit: John Baldwin CommitDate: 2025-04-11 14:00:39 +0000 ctld: Remove dead code in UCL parsing of hex DSCP values libucl treats strings starting with "0x" as an integer if they do not contain invalid characters. The code also looks broken as it only calls strtol if the string exactly matches "0x" without any trailing characters. Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D49644 --- usr.sbin/ctld/uclparse.cc | 3 --- 1 file changed, 3 deletions(-) diff --git a/usr.sbin/ctld/uclparse.cc b/usr.sbin/ctld/uclparse.cc index 05cfcc8df7e7..ccb0b45a5ab1 100644 --- a/usr.sbin/ctld/uclparse.cc +++ b/usr.sbin/ctld/uclparse.cc @@ -570,9 +570,6 @@ uclparse_dscp(const char *group_type, const char *pg_name, return (portal_group_set_dscp(ucl_object_toint(obj))); key = ucl_object_tostring(obj); - if (strcmp(key, "0x") == 0) - return (portal_group_set_dscp(strtol(key + 2, NULL, 16))); - if (strcmp(key, "be") == 0 || strcmp(key, "cs0") == 0) portal_group_set_dscp(IPTOS_DSCP_CS0 >> 2); else if (strcmp(key, "ef") == 0)