From patchwork Fri Mar 3 11:05:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kristof Provost X-Patchwork-Id: 3103 Return-Path: Delivered-To: patchwork@openvpn.net Received: by 2002:a05:7300:2310:b0:9f:bfa4:120f with SMTP id r16csp408738dye; Fri, 3 Mar 2023 03:11:24 -0800 (PST) X-Google-Smtp-Source: AK7set8YujRFs0h34kIj0xArY08aOzbq8/kcvBx1FgiAuFYKLuVfFqWKWkYNivwxeAXa6heHxJJ5 X-Received: by 2002:a05:6a20:394b:b0:b8:c6ec:a269 with SMTP id r11-20020a056a20394b00b000b8c6eca269mr2122467pzg.16.1677841884228; Fri, 03 Mar 2023 03:11:24 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677841884; cv=none; d=google.com; s=arc-20160816; b=FfzfxzWA34+C0HnFaPRZ7QM0BromvwHPwz+UdF+1iC5L2egrNRwAr9xxEkyCxCWUZE Y05vroPwpvbWmzDtWuWx4hoIzMO1lveTex2E8RTL+usg4s1D/Z8OtAHXkGj374iTYZNx JDaFoE8HLreChT0mBqJDKrLzSEUHLtk+MAjwTDBjlSJn7dNpsxowev6Pzgmroah1nZlR WgrasBqRkQJaosYpI7uDwD4fHb5Y/5IpZuFG3PjSYspVqX3Zq7yYQ/q2qXvV61fhlFc7 XRjQT41sS+7YstuXcHot73NqAWnLfQLOakoz2YqQqKRNwLWb1L71QIYykqonywaBuiZ3 bA0Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:content-transfer-encoding:reply-to:from:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:message-id:date:to:dkim-signature :dkim-signature:dkim-signature; bh=FcTt2P33Q4bI6VTaaMriNJlVR0G68sGG87B5IGEA6cs=; b=gJQUWjwQBSMY685HWgp3sdXgI1U3C1antwxhktPULj9QK6UjyWq0XDF9c+xrwR/pJ+ zH0bC/n9gnjbWS/SmNMYDKyWw4bN0a46usqSCocD1Qlk0gfLqxka/taGZDkwKU+QIIkv DIClO+93w0dLvT8qYilxiwIFY5d6Wt8Z72QdY2PbQxuZAJ9dVV6X6BDZ7qQ8OSfPjQed y6U1yjBjVisyj0SdRMXqpRfBBOdPKW9xedpRkaO0P6N1EDOQ3d2vLeTHAKrajz6/6Wxc OfTAzI20lZxpjo35tgRuB8KPxG2K93lW1PDoJf691iNADeywffHFa2iqPSS4OHwMpcRH H+Xg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b=d6hL206H; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=AT75uNLo; dkim=neutral (body hash did not verify) header.i=@netgate.com header.s=google header.b=ll3RiNSz; spf=pass (google.com: domain of openvpn-devel-bounces@lists.sourceforge.net designates 216.105.38.7 as permitted sender) smtp.mailfrom=openvpn-devel-bounces@lists.sourceforge.net; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=sourceforge.net Received: from lists.sourceforge.net (lists.sourceforge.net. [216.105.38.7]) by mx.google.com with ESMTPS id p7-20020a625b07000000b005afdbef35d3si2040835pfb.56.2023.03.03.03.11.23 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 03 Mar 2023 03:11:24 -0800 (PST) Received-SPF: pass (google.com: domain of openvpn-devel-bounces@lists.sourceforge.net designates 216.105.38.7 as permitted sender) client-ip=216.105.38.7; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b=d6hL206H; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=AT75uNLo; dkim=neutral (body hash did not verify) header.i=@netgate.com header.s=google header.b=ll3RiNSz; spf=pass (google.com: domain of openvpn-devel-bounces@lists.sourceforge.net designates 216.105.38.7 as permitted sender) smtp.mailfrom=openvpn-devel-bounces@lists.sourceforge.net; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=sourceforge.net Received: from [127.0.0.1] (helo=sfs-ml-4.v29.lw.sourceforge.com) by sfs-ml-4.v29.lw.sourceforge.com with esmtp (Exim 4.95) (envelope-from ) id 1pY3JS-0001ZL-Dg; Fri, 03 Mar 2023 11:10:58 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-4.v29.lw.sourceforge.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1pY3JQ-0001ZE-HH for openvpn-devel@lists.sourceforge.net; Fri, 03 Mar 2023 11:10:56 +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: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:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=IjqGoAuZZ1JwswkWe2RRIGLZWQf4vQ5x3FCAgjJw91M=; b=d6hL206HgC8O7Zx7ihvnsFlGHO AGq8xSKi0PdNsb4FZMcIvTh9Uw9cYiT+6/G2icGVYrgyicTp2bIDzUgN9j2GiUBSCLe4jMzFpo7ne NKDC8haOt+BQpFic4bO4JtIfnxbl0RpVVAbkZKRbPkkb8K8dxhN/u8jPJW25yExbYueg=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=Content-Transfer-Encoding:MIME-Version: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:In-Reply-To: References:List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post: List-Owner:List-Archive; bh=IjqGoAuZZ1JwswkWe2RRIGLZWQf4vQ5x3FCAgjJw91M=; b=A T75uNLojUuf32F/vNzJcyB/3KAVBaI3GKvJV1D9bYPD0c1uoYVPneo/iIdbVBW1C5xj+9bohKA2rE vIivC6vvKxCLshIm9JLufnrvkiDB7FPKoI9sgUZlITqnobURxas9xg1VLlZkO308Un6C00h8Gpzq0 UuuPEKcn+tG3BaEM=; Received: from mail-lj1-f170.google.com ([209.85.208.170]) by sfi-mx-1.v28.lw.sourceforge.com with esmtps (TLS1.2:ECDHE-RSA-AES128-GCM-SHA256:128) (Exim 4.95) id 1pY3JM-00FOXC-Pc for openvpn-devel@lists.sourceforge.net; Fri, 03 Mar 2023 11:10:56 +0000 Received: by mail-lj1-f170.google.com with SMTP id h3so1898274lja.12 for ; Fri, 03 Mar 2023 03:10:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=netgate.com; s=google; t=1677841845; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=IjqGoAuZZ1JwswkWe2RRIGLZWQf4vQ5x3FCAgjJw91M=; b=ll3RiNSzoikASA6zt80UPwcNJ9K+lJ4IRjaqhxB26emreKAYRgK0t6iSTmxW+6cMCq YMMTMn5YePaXT0PNwwWClSGlfj+3MAWqII18sXadH/xbIUk58RslI/NEyLH33Tia6702 UXDnTL/KYPTp6WVVK7L1i0EUTNxiEN8nBrSdk= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1677841845; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=IjqGoAuZZ1JwswkWe2RRIGLZWQf4vQ5x3FCAgjJw91M=; b=m3JtK6dkza/TtP+KVk1qtu4wS3c8fn7tw2cs8Qhal2rntUb0/cPwDHmKvABkWrXEUD MNmCpMBsbNQgAZnUiIE7fd9yLHyd6MMyiZLjBSQQW2zbrt09X86r+20+GmX9nZp1H/M/ gQng6x3CWWJGobBCyaponettu7/0cRIMZ01jU3Ma1Jy20wCEIN03QUFk4PBT1+cZ4pRz 97BCbsgKt05hZTv9GREGwQjzrVZCr8GhyIslyGKHcmgfrbZRbi09ze3rLwWKSLIGXBFY O5H+sE6QnZrgOJSuqUiYZXtvwX4MH+pLhOaY8qHR/I8nQblG3PsG6ZmAPXxp7GurFwxU UyVA== X-Gm-Message-State: AO0yUKWecPYO0nHvYNF4cnUcqLxR7e9eh9FjLzXBgmkTjsI70sj6XCOu ZP/TJaqRYuy1OMHh3FB/sqGfZBZJ3y5ijBlYBgE= X-Received: by 2002:a05:600c:470c:b0:3ea:f710:bdad with SMTP id v12-20020a05600c470c00b003eaf710bdadmr1234659wmo.29.1677841512184; Fri, 03 Mar 2023 03:05:12 -0800 (PST) Received: from nut.jupiter.sigsegv.be (ptr-8rfalzsse26o3oo9imw.18120a2.ip6.access.telenet.be. [2a02:1811:2402:bf00:f602:70ff:feae:6e98]) by smtp.googlemail.com with ESMTPSA id q14-20020a05600c46ce00b003daffc2ecdesm6028930wmo.13.2023.03.03.03.05.11 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Mar 2023 03:05:11 -0800 (PST) To: openvpn-devel Date: Fri, 3 Mar 2023 12:05:11 +0100 Message-Id: <20230303110511.9569-1-kprovost@netgate.com> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 X-Spam-Score: -0.2 (/) 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 FreeBSD's if_ovpn will never emit this as a peer deletion reason (because it doesn't support TCP), but this allows us to align the defines between Linux and FreeBSD, and remove a Linux-specific case f [...] Content analysis details: (-0.2 points, 6.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 URIBL_BLOCKED ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [URIs: netgate.com] -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [209.85.208.170 listed in wl.mailspike.net] -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [209.85.208.170 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an 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 X-Headers-End: 1pY3JM-00FOXC-Pc Subject: [Openvpn-devel] [PATCH] dco: define OVPN_DEL_PEER_REASON_TRANSPORT_DISCONNECT on FreeBSD 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 Reply-To: Kristof Provost Errors-To: openvpn-devel-bounces@lists.sourceforge.net X-getmail-retrieved-from-mailbox: Inbox X-GMAIL-THRID: =?utf-8?q?1759344731747477529?= X-GMAIL-MSGID: =?utf-8?q?1759344731747477529?= From: Kristof Provost FreeBSD's if_ovpn will never emit this as a peer deletion reason (because it doesn't support TCP), but this allows us to align the defines between Linux and FreeBSD, and remove a Linux-specific case from process_incoming_del_peer(). Acked-by: Antonio Quartulli Signed-off-by: Kristof Provost --- src/openvpn/dco_freebsd.h | 1 + src/openvpn/multi.c | 3 --- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/openvpn/dco_freebsd.h b/src/openvpn/dco_freebsd.h index 2e35f3ac..970beca0 100644 --- a/src/openvpn/dco_freebsd.h +++ b/src/openvpn/dco_freebsd.h @@ -41,6 +41,7 @@ enum ovpn_del_reason_t { OVPN_DEL_PEER_REASON_EXPIRED, OVPN_DEL_PEER_REASON_TRANSPORT_ERROR, OVPN_DEL_PEER_REASON_USERSPACE, + OVPN_DEL_PEER_REASON_TRANSPORT_DISCONNECT, }; typedef struct dco_context { diff --git a/src/openvpn/multi.c b/src/openvpn/multi.c index f2559016..99123c39 100644 --- a/src/openvpn/multi.c +++ b/src/openvpn/multi.c @@ -3244,12 +3244,9 @@ process_incoming_del_peer(struct multi_context *m, struct multi_instance *mi, reason = "ovpn-dco: transport error"; break; -#ifdef TARGET_LINUX - /* FIXME: this is linux-only today and breaks FreeBSD compilation */ case OVPN_DEL_PEER_REASON_TRANSPORT_DISCONNECT: reason = "ovpn-dco: transport disconnected"; break; -#endif case OVPN_DEL_PEER_REASON_USERSPACE: /* We assume that is ourselves. Unfortunately, sometimes these