From nobody Wed Feb 12 19:34:34 2025 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 4YtT640RSBz5nGX7; Wed, 12 Feb 2025 19:34:36 +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 4YtT623hmfz3T5h; Wed, 12 Feb 2025 19:34:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739388874; 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=nI0ZSrGgtKuS9J92eaO2vf2akHoVI4UAUleNmEx9dlo=; b=ISH0ylJFK3JWQm9gfLZnvn8X7vz1vxhvk1BpO3WDQ3xwZeTblKG1pQnpsPKRDpzlx7nrO8 gVMe2VR0YwuJcvtgCMFD+kzGt5GiOmUm53aYK1Gl2IxZ8Gwd//SqMvX1fvzAHZl9RxTWOp KaIWj+CqT/c/6fY96JZhXGqkMLcN1F+H5HtVVfOzZczLAgE4BW6/kEBROs/7+JnToinrzL yq3G81cP8hitn0iv9eDAbKsl2H0ZBqxR0WcTwsQ3/UIR6i8n0bIdWec7DQd7k+8G5+/lxx 501fniLcGHVMSRWbW9DUrEY31AseOjYZfQTCuQ3hP6W+77BMoletc22KPCV7Rg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739388874; 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=nI0ZSrGgtKuS9J92eaO2vf2akHoVI4UAUleNmEx9dlo=; b=iZ9/xtokcp1nHXnBjH37KjGsm4BNEgNVzV3Ig/WlOqflR5Lr3kOMmpNSUrkIlkxU8Zrdmq emWAYv9QDxZR8L02258b4NdYUwrf5gOqj5LVP9LCB/MDgZNzuBe02pO1Ya9EhMgr98UOZ5 0ig0A91meEJVH52vycXTM8WosTlMm6hlMMLsAoqSDgg69BWHxN1LN81ldOnAdam9cNPUw9 QosAERRVtdAHa1/WBVxPNzH8Jf9R9C5Mvuh6OvJqY/BHwDNydSJgXR1CkVg5lH8c4PwZex jRYUyasJSokwadUlcKYCYHzthvT/FtxUBM0rVN7CKgWJr4DBBzC40EdQTIdKRQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739388874; a=rsa-sha256; cv=none; b=BOxJYAy+0de+PmDGajz9rGhj9+84EWx4HK8eyhvoPR2FZMOj/0OdrLhS8EIZ0SMYP56J3Y NviTnIHFC8mbGbv0TohwSRTqpBpTY8HmQUzvadbBfSSy0ortowMp41tGJTvQb938G7AmHV UXUcIQ+POe1UhPSpD2clIVsb1svCIqUVMr4ftTx0V9MG3NyE7EY0BMYSC1mITYJEfjVbRj GYBVM+c1pIDhrPgtvyqmiidNYLJJVj+3nPdhBByXRP8B4Z9Bae9wWipfi7QCkeEhhBX7yD ZO8L2R8OR23CVxnH5+4HMiUhQlrCfOiZHIRIJVM5cD9N2jSGeljz8sd0q9MWLA== 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 4YtT622kJjz1BgN; Wed, 12 Feb 2025 19:34:34 +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 51CJYYHI059905; Wed, 12 Feb 2025 19:34:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51CJYYR2059902; Wed, 12 Feb 2025 19:34:34 GMT (envelope-from git) Date: Wed, 12 Feb 2025 19:34:34 GMT Message-Id: <202502121934.51CJYYR2059902@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: 5e6a462277b1 - main - ctld: Fix parsing of text values for DSCP in UCL parser 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: 5e6a462277b1e28ea5338a3031c509c829dcf588 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=5e6a462277b1e28ea5338a3031c509c829dcf588 commit 5e6a462277b1e28ea5338a3031c509c829dcf588 Author: John Baldwin AuthorDate: 2025-02-12 19:27:53 +0000 Commit: John Baldwin CommitDate: 2025-02-12 19:27:53 +0000 ctld: Fix parsing of text values for DSCP in UCL parser Reviewed by: asomers Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D48933 --- usr.sbin/ctld/uclparse.c | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/usr.sbin/ctld/uclparse.c b/usr.sbin/ctld/uclparse.c index b782779f4d0e..fb14a7fe618a 100644 --- a/usr.sbin/ctld/uclparse.c +++ b/usr.sbin/ctld/uclparse.c @@ -505,49 +505,49 @@ uclparse_dscp(const char *group_type, struct portal_group *portal_group, key = ucl_object_tostring(obj); if (strcmp(key, "0x") == 0) portal_group->pg_dscp = strtol(key + 2, NULL, 16); - else if (strcmp(key, "be") || strcmp(key, "cs0")) + else if (strcmp(key, "be") == 0 || strcmp(key, "cs0") == 0) portal_group->pg_dscp = IPTOS_DSCP_CS0 >> 2; - else if (strcmp(key, "ef")) + else if (strcmp(key, "ef") == 0) portal_group->pg_dscp = IPTOS_DSCP_EF >> 2; - else if (strcmp(key, "cs0")) + else if (strcmp(key, "cs0") == 0) portal_group->pg_dscp = IPTOS_DSCP_CS0 >> 2; - else if (strcmp(key, "cs1")) + else if (strcmp(key, "cs1") == 0) portal_group->pg_dscp = IPTOS_DSCP_CS1 >> 2; - else if (strcmp(key, "cs2")) + else if (strcmp(key, "cs2") == 0) portal_group->pg_dscp = IPTOS_DSCP_CS2 >> 2; - else if (strcmp(key, "cs3")) + else if (strcmp(key, "cs3") == 0) portal_group->pg_dscp = IPTOS_DSCP_CS3 >> 2; - else if (strcmp(key, "cs4")) + else if (strcmp(key, "cs4") == 0) portal_group->pg_dscp = IPTOS_DSCP_CS4 >> 2; - else if (strcmp(key, "cs5")) + else if (strcmp(key, "cs5") == 0) portal_group->pg_dscp = IPTOS_DSCP_CS5 >> 2; - else if (strcmp(key, "cs6")) + else if (strcmp(key, "cs6") == 0) portal_group->pg_dscp = IPTOS_DSCP_CS6 >> 2; - else if (strcmp(key, "cs7")) + else if (strcmp(key, "cs7") == 0) portal_group->pg_dscp = IPTOS_DSCP_CS7 >> 2; - else if (strcmp(key, "af11")) + else if (strcmp(key, "af11") == 0) portal_group->pg_dscp = IPTOS_DSCP_AF11 >> 2; - else if (strcmp(key, "af12")) + else if (strcmp(key, "af12") == 0) portal_group->pg_dscp = IPTOS_DSCP_AF12 >> 2; - else if (strcmp(key, "af13")) + else if (strcmp(key, "af13") == 0) portal_group->pg_dscp = IPTOS_DSCP_AF13 >> 2; - else if (strcmp(key, "af21")) + else if (strcmp(key, "af21") == 0) portal_group->pg_dscp = IPTOS_DSCP_AF21 >> 2; - else if (strcmp(key, "af22")) + else if (strcmp(key, "af22") == 0) portal_group->pg_dscp = IPTOS_DSCP_AF22 >> 2; - else if (strcmp(key, "af23")) + else if (strcmp(key, "af23") == 0) portal_group->pg_dscp = IPTOS_DSCP_AF23 >> 2; - else if (strcmp(key, "af31")) + else if (strcmp(key, "af31") == 0) portal_group->pg_dscp = IPTOS_DSCP_AF31 >> 2; - else if (strcmp(key, "af32")) + else if (strcmp(key, "af32") == 0) portal_group->pg_dscp = IPTOS_DSCP_AF32 >> 2; - else if (strcmp(key, "af33")) + else if (strcmp(key, "af33") == 0) portal_group->pg_dscp = IPTOS_DSCP_AF33 >> 2; - else if (strcmp(key, "af41")) + else if (strcmp(key, "af41") == 0) portal_group->pg_dscp = IPTOS_DSCP_AF41 >> 2; - else if (strcmp(key, "af42")) + else if (strcmp(key, "af42") == 0) portal_group->pg_dscp = IPTOS_DSCP_AF42 >> 2; - else if (strcmp(key, "af43")) + else if (strcmp(key, "af43") == 0) portal_group->pg_dscp = IPTOS_DSCP_AF43 >> 2; else { log_warnx("\"dscp\" property value is not a supported textual value");