From nobody Thu Aug 01 20:19:15 2024 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 4WZgKc1gbnz5RNqR; Thu, 01 Aug 2024 20:19:16 +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 4WZgKc0mW3z4HcZ; Thu, 1 Aug 2024 20:19:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1722543556; 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=KJRhr1jh3kdWUY/PHJW+SB3FoRc1FVuvXxfs4HZDc0g=; b=G89At2X2KqO1GKBgAAn7iAuWsYctbJxwMexRzgxWlkkWpcvZ1lrov0oRhTZVxZk7FNlQ1c cd/oVXwYeAp1GiIC1aItTYDuu2KrJnJso/HF0ogdTo7Lc053WX4ErQz5nx/87Sg3yQUjQ4 hoJsRTFeTACD1tTiruYI4JrJWGvpJNcg7WcQKydXFWCxwTdIgQ1i9/TmyJaRTcF+4lRWif tmQLqGNXzQXHhOF/ociyw3SR5glYNDSQnXeiSpzdznBeJSR92a0W3XSjuAdoLWPXqwOsSs FLEs7Zep4wUF0p6Ihh3m9tJT6uqujWS0MbJ5fDi1hqa9LeMXaww/5qwRqBrw5A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1722543556; a=rsa-sha256; cv=none; b=d+/YCpJMbNMcJXaADSpX8y+WHZUYmyY7Qm3hgebbnupwaK59Nk7lddIstWiy3pVhu0dTXn XHkxQeIjbhyjBTYMLWzdnk3UmEQbZ7vitee97pAKGbhcPTgtYHlEJ9ia1D1TxmVfZBg9t/ hoLWebfAVhMYdbuU8W8ryyT/Yl8WH6chklIJK4jz8WT9dLchdU158/Bfa2ptpMiphLHKHO SrIRsF/B6eA4M2ZrDfN/e9+QHe/chHvhV5Mpc+2NJoWzLRlLf22Mt0wMx/M8FLizzdT+nv uwhCFjy/0Fab7wPG2dXk/Pp5gg44g+pYg5O5QJTUuj3UfkdpFF45MoH8GL2xnw== 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=1722543556; 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=KJRhr1jh3kdWUY/PHJW+SB3FoRc1FVuvXxfs4HZDc0g=; b=WIEeRXw9YaQF39Pi9VjUm9wp+zbyPukNfxDzb6IWbAzait10jG4RQ6KuePsSYUEbJSTpWq BZNJIFEjxJzsnI9mcmMUyrsqEozNR0Tu2YnnH0lLAQ3hzKP7HaBTdXjBZxz87Zktu4zu0d QbXMyy5IQkzqTniFJtQPvvVQILsbuhPXbmMrcUaeDVO/Y0JUkjp2J2oj7Q+d3zP7qcxvDo DY4AN1B2h8R+t2pCUf8W2nWkwXp7UemL/VcGcWNv54RbK0m04N8IafIo0KPKt2kNMYTwI/ 0DCSPcRfqAkLV6MDlVu2edntqBK/45Aa9GjF11M8gnZEH8llYQGQjis9fJvfpQ== 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 4WZgKc0Mctz101f; Thu, 1 Aug 2024 20:19:16 +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 471KJF8u004338; Thu, 1 Aug 2024 20:19:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 471KJFUK004335; Thu, 1 Aug 2024 20:19:15 GMT (envelope-from git) Date: Thu, 1 Aug 2024 20:19:15 GMT Message-Id: <202408012019.471KJFUK004335@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: 25152e8f1a37 - stable/13 - Revert "sctp: improve consistency" 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: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 25152e8f1a37fbb785bfc56a83a68860fe75f8ea Auto-Submitted: auto-generated The branch stable/13 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=25152e8f1a37fbb785bfc56a83a68860fe75f8ea commit 25152e8f1a37fbb785bfc56a83a68860fe75f8ea Author: Michael Tuexen AuthorDate: 2024-08-01 20:19:05 +0000 Commit: Michael Tuexen CommitDate: 2024-08-01 20:19:05 +0000 Revert "sctp: improve consistency" This reverts commit bf28627b71c6feae3f3fdf614c7b65d71d682bac. --- sys/netinet/sctp_output.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/sys/netinet/sctp_output.c b/sys/netinet/sctp_output.c index ab97d9b13e5d..7626e4ec066c 100644 --- a/sys/netinet/sctp_output.c +++ b/sys/netinet/sctp_output.c @@ -5019,20 +5019,11 @@ sctp_arethere_unrecognized_parameters(struct mbuf *in_initpkt, at += padded_size; break; case SCTP_HAS_NAT_SUPPORT: - if (padded_size != sizeof(struct sctp_paramhdr)) { - SCTPDBG(SCTP_DEBUG_OUTPUT1, "Invalid size - error nat support %d\n", plen); - goto invalid_size; - } *nat_friendly = 1; -<<<<<<< HEAD /* fall through */ -======= - at += padded_size; - break; ->>>>>>> 533faf21c19d (sctp: improve consistency) case SCTP_PRSCTP_SUPPORTED: if (padded_size != sizeof(struct sctp_paramhdr)) { - SCTPDBG(SCTP_DEBUG_OUTPUT1, "Invalid size - error prsctp %d\n", plen); + SCTPDBG(SCTP_DEBUG_OUTPUT1, "Invalid size - error prsctp/nat support %d\n", plen); goto invalid_size; } at += padded_size;