From patchwork Fri Apr 29 07:02:33 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kristof Provost via Openvpn-devel X-Patchwork-Id: 2422 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director13.mail.ord1d.rsapps.net ([172.30.191.6]) by backend41.mail.ord1d.rsapps.net with LMTP id kO0RKngabGLCSQAAqwncew (envelope-from ) for ; Fri, 29 Apr 2022 13:03:52 -0400 Received: from proxy3.mail.ord1d.rsapps.net ([172.30.191.6]) by director13.mail.ord1d.rsapps.net with LMTP id UKC7CHkabGIADgAA91zNiA (envelope-from ) for ; Fri, 29 Apr 2022 13:03:53 -0400 Received: from smtp13.gate.ord1d ([172.30.191.6]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy3.mail.ord1d.rsapps.net with LMTPS id UJySCHkabGJXbgAA7WKfLA (envelope-from ) for ; Fri, 29 Apr 2022 13:03:53 -0400 X-Spam-Threshold: 95 X-Spam-Score: 0 X-Spam-Flag: NO X-Virus-Scanned: OK X-Orig-To: openvpnslackdevel@openvpn.net X-Originating-Ip: [216.105.38.7] Authentication-Results: smtp13.gate.ord1d.rsapps.net; iprev=pass policy.iprev="216.105.38.7"; spf=pass smtp.mailfrom="openvpn-devel-bounces@lists.sourceforge.net" smtp.helo="lists.sourceforge.net"; dkim=fail (signature verification failed) header.d=sourceforge.net; dkim=fail (signature verification failed) header.d=sf.net; dkim=fail (signature verification failed) header.d=netgate.com; dmarc=pass (p=none; dis=none) header.from=lists.sourceforge.net X-Suspicious-Flag: YES X-Classification-ID: 585d9098-c7de-11ec-aa57-525400b197d9-1-1 Received: from [216.105.38.7] ([216.105.38.7:37194] helo=lists.sourceforge.net) by smtp13.gate.ord1d.rsapps.net (envelope-from ) (ecelerity 4.2.38.62370 r(:)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id B6/8F-20852-87A1C626; Fri, 29 Apr 2022 13:03:52 -0400 Received: from [127.0.0.1] (helo=sfs-ml-1.v29.lw.sourceforge.com) by sfs-ml-1.v29.lw.sourceforge.com with esmtp (Exim 4.94.2) (envelope-from ) id 1nkU1C-00030F-2r; Fri, 29 Apr 2022 17:02:58 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-1.v29.lw.sourceforge.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1nkU1A-000301-Vp for openvpn-devel@lists.sourceforge.net; Fri, 29 Apr 2022 17:02:57 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=Content-Transfer-Encoding:MIME-Version:References: In-Reply-To:Message-Id:Date:Subject:To:From:Sender:Reply-To:Cc:Content-Type: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=5fufqTCPGbFnOWC3Wd36iSxPeEPvJp05/ejzNNAN3ZQ=; b=T1xi9gHb9iILfYI6g7mM5wjqk5 r4ybn3ZFIc1ejm0yYikvNhWPqRyGvj7G/ovhUJhuk4tSOvXJ9kzRsI2X+dkQBhZvH4QE+c/zq7loo dOWVuF8Pfnp3VdVO3ac3T7kPqQIKR5imaVhaFNVzaPNiITFQp7MdawluETZZR6kB7uUU=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To:Message-Id: Date:Subject:To:From:Sender:Reply-To:Cc:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=5fufqTCPGbFnOWC3Wd36iSxPeEPvJp05/ejzNNAN3ZQ=; b=kHNutHA3xY0nit70Mn0BmR0TNH L92C98NhyyBMZITK3Do6U/aRCJYYdenL5+ziesfMS16BzjwbEUTjnmDTbshA2jzs5JroZ7NPKMJip PcskzWt+UnjFjNTSGV7vDOLuc49Kjwgc5Iy6Sj8EgIc/t+rxNtlybiBZuchqswRhlApg=; Received: from mail-wr1-f43.google.com ([209.85.221.43]) by sfi-mx-1.v28.lw.sourceforge.com with esmtps (TLS1.2:ECDHE-RSA-AES128-GCM-SHA256:128) (Exim 4.94.2) id 1nkU15-00DzV3-Lk for openvpn-devel@lists.sourceforge.net; Fri, 29 Apr 2022 17:02:56 +0000 Received: by mail-wr1-f43.google.com with SMTP id q23so11591555wra.1 for ; Fri, 29 Apr 2022 10:02:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=netgate.com; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=5fufqTCPGbFnOWC3Wd36iSxPeEPvJp05/ejzNNAN3ZQ=; b=qh6BIQ6FUMAFXVBfct/KXGufrVtykcZj3jqI9gWgyMwYNpVQCmSaCHheoDlEzsw57+ UdtIEG/lgmeRTVuOjdoOR9kD60/QVKZ97lWU9zobfr78PTtJQRgXXy6rzF9niNIPaHr0 OUy4E8EUoUPU2WtZmXQOvKqKxN30l370j1zd0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=5fufqTCPGbFnOWC3Wd36iSxPeEPvJp05/ejzNNAN3ZQ=; b=q/mCjt7D+JGMWThT9MZHjy+2Guuy6gluulK9W10hmUfWE39NYLjYkBLbr0zSSukVCX q3FImnB+jL47Rb0dwM7nKaZM3ENgXiB4XYtH4S/jEwpi3/1d1dY9xtZXpGOU1Jjb1i5i yAWOej5//Y2mdfupdta4jSg4zoJPKcZzIKSZJWfEofnBdjY2RRR38dtYSQw2V5YsG+KV QMjTsx6bekzrAx1PET2J6CWMWKy2fPPB6pEH1jV4Th2YOcv5BZ21THOvdT6yJOb1Aj3B mKaakRaQeJR+xFUhuJdHrO4W6uxmihm+qjHJwNR0+Ubjr7eDLzXLzR2izlfYaXrSpykJ zF7A== X-Gm-Message-State: AOAM5332vSL9EdWXJXAKuCJ1O8ieTeWUMwIW9Pq8x/Sr2XZ+ReemCxuY 8ulXBM63vb4U2Fu2p6xU1/sZ63WLl3YhOA== X-Google-Smtp-Source: ABdhPJxNgKdBa6oBeIt4z2NR0jO1oPXL0I2nP2upQWAkM72wac0S7kVIOv4JPLByJHndD5Ce4LePhg== X-Received: by 2002:a5d:4686:0:b0:20a:e8dc:fd99 with SMTP id u6-20020a5d4686000000b0020ae8dcfd99mr66989wrq.478.1651251764329; Fri, 29 Apr 2022 10:02:44 -0700 (PDT) Received: from nut.jupiter.sigsegv.be (94-225-84-42.access.telenet.be. [94.225.84.42]) by smtp.googlemail.com with ESMTPSA id c11-20020a05600c0a4b00b0037c91e085ddsm9508846wmq.40.2022.04.29.10.02.43 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Apr 2022 10:02:43 -0700 (PDT) To: openvpn-devel Date: Fri, 29 Apr 2022 19:02:33 +0200 Message-Id: <20220429170236.48239-2-kprovost@netgate.com> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220429170236.48239-1-kprovost@netgate.com> References: <20220429170236.48239-1-kprovost@netgate.com> MIME-Version: 1.0 X-Spam-Report: Spam detection software, running on the system "util-spamd-2.v13.lw.sourceforge.com", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: From: Kristof Provost Handle the DCO driver telling us that the peer went away, even if we're not running in multi-instance mode. Signed-off-by: Kristof Provost --- src/openvpn/forward.c | 6 ++++++ 1 file changed, 6 insertions(+) Content analysis details: (-0.2 points, 6.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [209.85.221.43 listed in list.dnswl.org] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [209.85.221.43 listed in wl.mailspike.net] X-Headers-End: 1nkU15-00DzV3-Lk Subject: [Openvpn-devel] [PATCH 1/4] Handle (DCO) timeouts in client mode X-BeenThere: openvpn-devel@lists.sourceforge.net X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Kristof Provost via Openvpn-devel From: Kristof Provost via Openvpn-devel Reply-To: Kristof Provost Errors-To: openvpn-devel-bounces@lists.sourceforge.net X-getmail-retrieved-from-mailbox: Inbox From: Kristof Provost Handle the DCO driver telling us that the peer went away, even if we're not running in multi-instance mode. Signed-off-by: Kristof Provost --- src/openvpn/forward.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/openvpn/forward.c b/src/openvpn/forward.c index 9ddea439..e4215b70 100644 --- a/src/openvpn/forward.c +++ b/src/openvpn/forward.c @@ -1111,6 +1111,12 @@ process_incoming_dco(struct context *c) dco_do_read(dco); + if (dco->dco_message_type == OVPN_CMD_DEL_PEER) + { + trigger_ping_timeout_signal(c); + return; + } + if (dco->dco_message_type != OVPN_CMD_PACKET) { msg(D_DCO_DEBUG, "%s: received message of type %u - ignoring", __func__,