Received: by 2002:a05:6a10:f347:0:0:0:0 with SMTP id d7csp1503430pxu; Tue, 24 Nov 2020 01:44:47 -0800 (PST) X-Google-Smtp-Source: ABdhPJyPJAN5X2JTf73QlwKBLWF01KZ/avyhog7OO4Ym3m4FoMyuoIRAIIEY98O8UYVquqm01IbZ X-Received: by 2002:a17:906:3704:: with SMTP id d4mr3262632ejc.338.1606211087373; Tue, 24 Nov 2020 01:44:47 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1606211087; cv=none; d=google.com; s=arc-20160816; b=nINQbIisI8Fz5etmk/pc+CdmeHj+Z1lL0Z40jiR45U1SYmEIsZUVTPJvNJYI8L+nZi Q5mD1CSwFPEyk4yz0O9HUCC2k15Okkqove/xL9p/W8C3TfqRethjN1PtC6Sg+pjqkI/H LNcAskv2k20meMlsSMUygtOERl+Dk7FJWbyvTmf4oKkor05KvRDj5EpJwOSl0ERzAgqe HOeCfuJhKuE7dopWd4OxcdS1SdKDtgFFT3Am2gb/aynITJzBpJQWS9JJNxC78Xwd9p+v RMTRYLyrh7OSU/ScjoPghvQAJt11OYfcN4WeCluEuL6/5beuUUlu9ZpZSgoYwNJNT6rM kQ9g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=Y5GrfvPT5RUc6kyx3MmYpmJhmU4WKakuy0x5mTcABxc=; b=t8lu+CwOWEP1IRGLzKKDx9mGjF+g98YSwR30d7BUu5JbglIE6DajabM8ErVzDB/4X0 H+cAS4DEqj7ByJtMLUFhBw0WfzTADyY4vyLmQd180mZ8YD2GxtVw5o8f4W7Lffr9biSv dtzcJJG1YQGR7eRhHxgSBRLvEbZOegitBw2pphGbydXVj81OtGf/2HuB0ew6nMXZrhts +yi5TgpDVCFXBblkVSXh30DU6UQint0qisVffZzliCJiO34h8OJwKmcr/8UT9oFPTFps FNtKqwpupws2QMqw2BoJwLtCB05ifbVtRjAInBNLeNSN4VeEY5QjZsZmwc4WOV1NqT4x CmrA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id c15si8872753edf.17.2020.11.24.01.44.24; Tue, 24 Nov 2020 01:44:47 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731608AbgKXJkW (ORCPT + 99 others); Tue, 24 Nov 2020 04:40:22 -0500 Received: from mxout70.expurgate.net ([91.198.224.70]:10042 "EHLO mxout70.expurgate.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731403AbgKXJkT (ORCPT ); Tue, 24 Nov 2020 04:40:19 -0500 Received: from [127.0.0.1] (helo=localhost) by relay.expurgate.net with smtp (Exim 4.92) (envelope-from ) id 1khUo1-000QqD-VQ; Tue, 24 Nov 2020 10:40:14 +0100 Received: from [195.243.126.94] (helo=securemail.tdt.de) by relay.expurgate.net with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1khUo1-000EIp-Am; Tue, 24 Nov 2020 10:40:13 +0100 Received: from securemail.tdt.de (localhost [127.0.0.1]) by securemail.tdt.de (Postfix) with ESMTP id 11EC2240041; Tue, 24 Nov 2020 10:40:13 +0100 (CET) Received: from mail.dev.tdt.de (unknown [10.2.4.42]) by securemail.tdt.de (Postfix) with ESMTP id 88407240040; Tue, 24 Nov 2020 10:40:12 +0100 (CET) Received: from mschiller01.dev.tdt.de (unknown [10.2.3.20]) by mail.dev.tdt.de (Postfix) with ESMTPSA id 5960420115; Tue, 24 Nov 2020 10:40:12 +0100 (CET) From: Martin Schiller To: andrew.hendry@gmail.com, davem@davemloft.net, kuba@kernel.org, xie.he.0141@gmail.com Cc: linux-x25@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Martin Schiller Subject: [PATCH net-next v6 4/5] net/x25: fix restart request/confirm handling Date: Tue, 24 Nov 2020 10:39:37 +0100 Message-ID: <20201124093938.22012-5-ms@dev.tdt.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201124093938.22012-1-ms@dev.tdt.de> References: <20201124093938.22012-1-ms@dev.tdt.de> MIME-Version: 1.0 X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mail.dev.tdt.de Content-Transfer-Encoding: quoted-printable X-purgate: clean X-purgate-type: clean X-purgate-ID: 151534::1606210813-00016B9D-31E1F638/0/0 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org We have to take the actual link state into account to handle restart requests/confirms well. Signed-off-by: Martin Schiller --- net/x25/x25_link.c | 41 +++++++++++++++++++++++++++++++++-------- 1 file changed, 33 insertions(+), 8 deletions(-) diff --git a/net/x25/x25_link.c b/net/x25/x25_link.c index 11e868aa625d..f92073f3cb11 100644 --- a/net/x25/x25_link.c +++ b/net/x25/x25_link.c @@ -74,16 +74,43 @@ void x25_link_control(struct sk_buff *skb, struct x25= _neigh *nb, =20 switch (frametype) { case X25_RESTART_REQUEST: - confirm =3D !x25_t20timer_pending(nb); - x25_stop_t20timer(nb); - nb->state =3D X25_LINK_STATE_3; - if (confirm) + switch (nb->state) { + case X25_LINK_STATE_2: + confirm =3D !x25_t20timer_pending(nb); + x25_stop_t20timer(nb); + nb->state =3D X25_LINK_STATE_3; + if (confirm) + x25_transmit_restart_confirmation(nb); + break; + case X25_LINK_STATE_3: + /* clear existing virtual calls */ + x25_kill_by_neigh(nb); + x25_transmit_restart_confirmation(nb); + break; + } break; =20 case X25_RESTART_CONFIRMATION: - x25_stop_t20timer(nb); - nb->state =3D X25_LINK_STATE_3; + switch (nb->state) { + case X25_LINK_STATE_2: + if (x25_t20timer_pending(nb)) { + x25_stop_t20timer(nb); + nb->state =3D X25_LINK_STATE_3; + } else { + x25_transmit_restart_request(nb); + x25_start_t20timer(nb); + } + break; + case X25_LINK_STATE_3: + /* clear existing virtual calls */ + x25_kill_by_neigh(nb); + + x25_transmit_restart_request(nb); + nb->state =3D X25_LINK_STATE_2; + x25_start_t20timer(nb); + break; + } break; =20 case X25_DIAGNOSTIC: @@ -214,8 +241,6 @@ void x25_link_established(struct x25_neigh *nb) { switch (nb->state) { case X25_LINK_STATE_0: - nb->state =3D X25_LINK_STATE_2; - break; case X25_LINK_STATE_1: x25_transmit_restart_request(nb); nb->state =3D X25_LINK_STATE_2; --=20 2.20.1