From patchwork Thu Mar 9 12:23:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kristof Provost X-Patchwork-Id: 3116 Return-Path: Delivered-To: patchwork@openvpn.net Received: by 2002:a05:7300:2310:b0:9f:bfa4:120f with SMTP id r16csp318260dye; Thu, 9 Mar 2023 04:24:07 -0800 (PST) X-Google-Smtp-Source: AK7set921Ok8dWJTydHAD5BCXjGqIjpyIq1WXfpL0Fi2anPPGWMSxyKIedKS9vnzPCErF9ZD0bMw X-Received: by 2002:a17:902:b60f:b0:197:9184:34c6 with SMTP id b15-20020a170902b60f00b00197918434c6mr19681800pls.55.1678364646993; Thu, 09 Mar 2023 04:24:06 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678364646; cv=none; d=google.com; s=arc-20160816; b=USLrPxC3uRSf6RLC08cqDnoOwbaqvSD2rhKUo8NJy1hGC9T/YRk8GjcRurYEdqVNX2 qvq28kdQjUU6IR8aKdKXRORImxqQiwQ183QNuM14NRqAXqvXlVX/iU24fX1rjiVj7f5X hqyQrEHA5BRMGzqp9FeAMEyfVBJyzVIBYpji+5tY4Smj0eI/0EZCDtNzD9uajdL1d/cR SesnAjCX3iLlLqbAQYNsTj7932MNADpOosiClxq7r1jPDa0xjVv4lLlBvFAnmacS3gCq 1E4y6ALOkfXNSz9cU5EX6mabnMzNU0xaIDXXA5mWsH3FkkUeooVYB5StMyDqViEbjxWk KvHw== 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=R7eF70vUkQntC2KHjJmwdGlqw3FpmsswZXmsTTXx0/c=; b=RsBbCdtTcgYR72X3RqP9JgMkPx6M3WQl/0RZARwfnhEXcR2BEQAX8ZdoBjj+4LRW/e rx5/Yg2Ped1muGXbFJYz8/elIUXVLN+OT1Gk4L+rTuTKgqmgIMIzyNhfqg1ZzAqMXUfv FgXCen1LWtffizrHck1lParbNwdC6p46To9aaZc/kKnju131VC3TkqIf1rWXhNZcnQcU UrurjPHh2gPDGpGPcXcoJ28VEWK7gffCrwyEhP2ruOYHEvOsOEwsBvbjC9/QgV2X+yCy liGj0Fp0cQX63DGdioija4sZWG4iipUZDvcJcY0Q/53k8FXL4SWlSlWmj+y2VOVHXDQP 4SDg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b=eT0JfJnM; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=KYSEskOI; dkim=neutral (body hash did not verify) header.i=@netgate.com header.s=google header.b=U7rW+OlC; 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 d7-20020a170902cec700b0019e6763b110si19557221plg.232.2023.03.09.04.24.06 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 09 Mar 2023 04:24:06 -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=eT0JfJnM; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=KYSEskOI; dkim=neutral (body hash did not verify) header.i=@netgate.com header.s=google header.b=U7rW+OlC; 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 1paFJF-0007xD-KJ; Thu, 09 Mar 2023 12:23:50 +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 1paFJE-0007x6-4M for openvpn-devel@lists.sourceforge.net; Thu, 09 Mar 2023 12:23:49 +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=EZvuxHyAUwPIaFtYyq+IMhMg4+lYGmeHvTLRi1JmEso=; b=eT0JfJnMwQ8p+vg+6JTyDxIxuv QhqLYr4iQS2YrZK8TAMxbr+DxuSd8J3ERTkr3CrpVqwYtEwzjMsrvz1ibTfKYtP0AvxjqzVt5a9+K pjIOesB5joVgD6OdIb2IsQQebM3qZk6GqK5kiUp5OT9JqH1Oeq0vz2r2nU77C9/Rm3bs=; 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=EZvuxHyAUwPIaFtYyq+IMhMg4+lYGmeHvTLRi1JmEso=; b=K YSEskOIED4o9UyCf/ypMXq0/Z5L0OEpeJOn9c3wKz5D2b/WymUmxaD6qxNavThlf16MHT0HOavymQ Rimeb2oSifumEiAKm72nAADKFfKDurZK2d1/ELaih3/XGi+o4Z9sETiq9rArqfB+aHPUKr7MVIRTX oeIjkClcTOo+BBYU=; Received: from mail-ed1-f47.google.com ([209.85.208.47]) by sfi-mx-2.v28.lw.sourceforge.com with esmtps (TLS1.2:ECDHE-RSA-AES128-GCM-SHA256:128) (Exim 4.95) id 1paFJ7-00063Y-Ob for openvpn-devel@lists.sourceforge.net; Thu, 09 Mar 2023 12:23:49 +0000 Received: by mail-ed1-f47.google.com with SMTP id cw28so6221694edb.5 for ; Thu, 09 Mar 2023 04:23:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=netgate.com; s=google; t=1678364614; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=EZvuxHyAUwPIaFtYyq+IMhMg4+lYGmeHvTLRi1JmEso=; b=U7rW+OlC9rPiYM+HXlNN/9eRprsOs+1pfWChddVJXoxTJkGjNkvEH6raMKf6blPEqp jDAQhbvHs9YGeYx44AoaCao3bXWAkLIKlOFWelH0Kcis960C28q3aouiE5IOoFVjDkRX wPr1AXQLiD5OiSCijOvqBrR47Gkc4vsxOxGmU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678364614; 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=EZvuxHyAUwPIaFtYyq+IMhMg4+lYGmeHvTLRi1JmEso=; b=sQ9u45a0hnMjeEsMlFqpHjIyD7EvCtQzpba3usMtRrP+lF4RV7IfQLYuHfXK1EMZGA ln8KLaTBaiVceL4QnqKjZ3eraH3GcFh82jWmOLZ0JRs4VxR4e6YCWcTYhtl/B/VfXcmI +Cxn5ddDHqOoq4lYm5Ncrist2+U5tB4jIRctIAoTbYaF9685FHCk0tevR0JKwRKGmGNU HInHMWSkAkixVs72/STusFUpzBGULe5VfNUg7nyN+m4sQHSZs9K08muLw29vIPKbsCCB Y1Qk21/ujkOQ6m8QjqG4C1S24CQ07aAgvNwKqKFG40UoqvVuaKTmmVPCxYEGjb79hpkr 2kXQ== X-Gm-Message-State: AO0yUKWHWkz97MKDxhz5AuRwPn18/brYgNGggGgdLzbB37G7oERRxWU0 CBfkw83nQ/q5MmcRwa5YPBAYdYB5imGLIm4k3FrYGw== X-Received: by 2002:a05:6402:5154:b0:4af:5aa1:6646 with SMTP id n20-20020a056402515400b004af5aa16646mr18181369edd.14.1678364614016; Thu, 09 Mar 2023 04:23:34 -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 k7-20020a170906578700b008b904cb2bcdsm8924405ejq.11.2023.03.09.04.23.33 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Mar 2023 04:23:33 -0800 (PST) To: openvpn-devel Date: Thu, 9 Mar 2023 13:23:32 +0100 Message-Id: <20230309122332.92490-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 Implement dco_version_string() for FreeBSD. Unlike Linux and Windows the DCO driver is built into the operating system itself, so we log the OS version as a proxy for the DCO version. --- src/openvpn/ [...] 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.208.47 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.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [209.85.208.47 listed in wl.mailspike.net] -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid X-Headers-End: 1paFJ7-00063Y-Ob Subject: [Openvpn-devel] [PATCH] dco: print FreeBSD version 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?1759892888212564703?= X-GMAIL-MSGID: =?utf-8?q?1759892888212564703?= From: Kristof Provost Implement dco_version_string() for FreeBSD. Unlike Linux and Windows the DCO driver is built into the operating system itself, so we log the OS version as a proxy for the DCO version. Acked-by: Gert Doering --- src/openvpn/dco_freebsd.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/openvpn/dco_freebsd.c b/src/openvpn/dco_freebsd.c index 2b94b2a2..5238ebdd 100644 --- a/src/openvpn/dco_freebsd.c +++ b/src/openvpn/dco_freebsd.c @@ -31,6 +31,8 @@ #include #include #include +#include + #include #include "dco_freebsd.h" @@ -627,7 +629,15 @@ out: const char * dco_version_string(struct gc_arena *gc) { - return "v0"; + struct utsname* uts; + ALLOC_OBJ_GC(uts, struct utsname, gc); + + if (uname(uts) != 0) + { + return "N/A"; + } + + return uts->version; } void