From nobody Fri Apr 8 00:03:16 2022 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 9963B1A870B8; Fri, 8 Apr 2022 00:03:17 +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 4KZJP107Dhz4kqv; Fri, 8 Apr 2022 00:03:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649376197; 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=CAf9HdT2zKevUj/iMgXM5PxLzO9O+VKXnfA9JDTsjD8=; b=sgqKToL/HWO9Nhbtl0Iaqv2g+GmgiEUbg3Bbhd8Kb78c4Il+lu4LurroX1xrTn3P9tCWwk m1Gy1W6clGdy1eOEKX/HKSz60jtYcz/Hr0FKQMhNZkmegDhKgASwi3RWqCYXOyNJZNdQUi ImYvV1cWdtXu3FJLaKaihaaQK7SYEIpVRzL++tyFkdAi6JfA5erVI4yYPpCxQWiF5iLNQV 7dOBn8iwE5fTKHPNiD+IoQZ8er5vL7Sb+Upywf+oAsKKGjo1TYQr8VE4+GCK9yubKh0nXv svuS6KJrJJUeecQEjgQHzjtNHWp5rvxYt9S6bQK8JI+f11r9zpeYY9h17rRQcA== 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 B8F4A1A02D; Fri, 8 Apr 2022 00:03:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 23803GVG086146; Fri, 8 Apr 2022 00:03:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23803Gto086145; Fri, 8 Apr 2022 00:03:16 GMT (envelope-from git) Date: Fri, 8 Apr 2022 00:03:16 GMT Message-Id: <202204080003.23803Gto086145@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: 3f0871d7fc4e - main - ngatm: Expand #if 0 to cover all lines involving mlen. 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3f0871d7fc4e478d85645d1202506143718a6157 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649376197; 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=CAf9HdT2zKevUj/iMgXM5PxLzO9O+VKXnfA9JDTsjD8=; b=a8BlHrwJDmgemu63OjKwvCWNMTdXrrKv/JIfrMbLAOrig1S0r5GZA6LOEscv2ygu+pR3fg fVICn87uPP+u2b+KbT9lZtRj0n9Q6cGf3ZU4QpgjVdVoVNP6PlQgcomyDAsBvadXms0U7C wxtkBgkFJXoHQryNahx8XJBECJRf4Tlt5YPz9uJaSbrR0T1ORIQTjd21lOGIIT+8zR34L4 Il3vgkrh15+ic1zvT7gwuNyOO5vxJaxACQr+hKOWbsa7GEY6FKlvD924ajpPHFb6NinD/6 1SIoSlbolBVUKcsuRf/htk5diqNzDPTkQCAlpNjZ84VZsk2C5bYfoh5QHaffgA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1649376197; a=rsa-sha256; cv=none; b=Xa7/GC3WM7je+VfHDJonKEBYQjrVZqLZ5ETIO+HIdlRVE+uuEWNCBt5zUD1+XuM1/fcV/W 0iSI6gur9eOfLQsbVLIOwaLcZO6kaMs79ymD9XZs0+lUux8ZPCC46mr+pFlbHZOJW6UnvV GhqdJ76yjoI5QZNZIwi3VmxUOJstcluigw5J7beAq/M5r1uj/zw/ejIjk4TQcN6V0ta4F8 NMNq0gETOaOO/O93HL9BTvlZC951x8mTJF3q967QxAZkd1lkTwGr9liy6hECpUmTt+at0w PyFWbLP8FdkaWPKO8qLldUyeK2FuN/PyThl+461s6wlBnfTsv8sYJRxlS7Xpsg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=3f0871d7fc4e478d85645d1202506143718a6157 commit 3f0871d7fc4e478d85645d1202506143718a6157 Author: John Baldwin AuthorDate: 2022-04-08 00:01:26 +0000 Commit: John Baldwin CommitDate: 2022-04-08 00:01:26 +0000 ngatm: Expand #if 0 to cover all lines involving mlen. --- sys/contrib/ngatm/netnatm/msg/privmsg.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sys/contrib/ngatm/netnatm/msg/privmsg.c b/sys/contrib/ngatm/netnatm/msg/privmsg.c index 76a7f69aa3c6..73e3944c06e6 100644 --- a/sys/contrib/ngatm/netnatm/msg/privmsg.c +++ b/sys/contrib/ngatm/netnatm/msg/privmsg.c @@ -44,7 +44,9 @@ int uni_decode_head(struct uni_msg *msg, struct uni_all *out, struct unicx *cx __unused) { +#if 0 u_int mlen; +#endif cx->errcnt = 0; (void)memset(out, 0, sizeof(struct uni_all)); @@ -92,6 +94,7 @@ uni_decode_head(struct uni_msg *msg, struct uni_all *out, msg->b_rptr++; +#if 0 mlen = *msg->b_rptr++ << 8; mlen |= *msg->b_rptr++; @@ -100,7 +103,6 @@ uni_decode_head(struct uni_msg *msg, struct uni_all *out, * shorten it. If it is shorter, probably one of the IE * decoders will break, but we should proceed. 5.5.6.5 */ -#if 0 if(uni_msg_len(msg) > mlen) msg->b_wptr = msg->b_rptr + mlen; #endif