From patchwork Thu Mar 9 00:52:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Antonio Quartulli X-Patchwork-Id: 3113 Return-Path: Delivered-To: patchwork@openvpn.net Received: by 2002:a05:7300:2310:b0:9f:bfa4:120f with SMTP id r16csp4327dye; Wed, 8 Mar 2023 16:53:06 -0800 (PST) X-Google-Smtp-Source: AK7set+9AhZ1iPEnNLhjNpi4gQYl9LSzhVpw+yX/ggYr3sbwkqE4tMtUIdlofYfLpsrheYFYauGO X-Received: by 2002:a05:6a20:bfd6:b0:d0:455f:4232 with SMTP id gs22-20020a056a20bfd600b000d0455f4232mr7345528pzb.12.1678323186607; Wed, 08 Mar 2023 16:53:06 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678323186; cv=none; d=google.com; s=arc-20160816; b=IIStDEfQ1IprVg7ISPT9Umh0dxiegNJ9ZqoFWf0mVKFQqsnVqokceFVFQdxtod/zWi KdUq3yjHP4/eoe07bOxDNZfkBk+96wsTvk8Dt8L1J0Kko2gVCBiT1lJ2ijXxpBT860f7 pb7SlmSvl6bAJr1Pu81bOVZW4FYe+SateAwhnjv++NqHgFRmKJa/zVn7AbVS8hJ3LRUO yHVmQm6udC1FQ1VDgdhbdJ9ygWeNBrZBAaRD14L8vfV5PXmcorsI/QgWCUbf/51ow0Oj sfsI8nYgVOUUG6VNWrgaQeylm2t9iACJb4Ji1dlivyF6pbNg6w/pJvqAFdVlSZIw+j2h wt9Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:content-transfer-encoding:cc:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :mime-version:message-id:date:to:from:dkim-signature:dkim-signature :dkim-signature; bh=hdyyaQtOjzBkSdbEWyASNaWP0HPr5YBByOKapHhyEkw=; b=lIDzc9NcA9eY7FFux3wftjsshoq918Dzp7CfxKJ9efY26QuuORzOJz+6dCMfCfTvbi HiglCPDFoQ/LHpt0/QUhHIGX8YEBJFQd4i6Sp1DITCsRKByiuztsPZ7OtMvUYlGW/69u cNvCAKKF5zMt1xukPqYwR/RISvB1FQb6UO2SGaqxfIfzIgZ6IGuFTXEzYMU80dCMnSVi TUeSvHlBhI2RqZmP58BA/4N/LF4Bx/V9q2afw2caUaNFA1W/cheSFzqMfdxQfdKH/ACU mlM6HDqTb2Ty0n5kiqiNLAXLCGXnBrEBoS8lt7rbJGJ5JmDhea3K6p8p8eu42FoGfjLX krww== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b=dQab++BU; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=NIDI4bZx; dkim=fail header.i=@unstable.cc header.s=20220809-q8oc header.b=a9FDTjIs; 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 Received: from lists.sourceforge.net (lists.sourceforge.net. [216.105.38.7]) by mx.google.com with ESMTPS id n11-20020a63a50b000000b004ff90ee4fd4si7034185pgf.847.2023.03.08.16.53.06 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 08 Mar 2023 16:53: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=dQab++BU; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=NIDI4bZx; dkim=fail header.i=@unstable.cc header.s=20220809-q8oc header.b=a9FDTjIs; 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 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 1pa4WL-0000QV-HM; Thu, 09 Mar 2023 00:52:38 +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 1pa4WJ-0000QO-4w for openvpn-devel@lists.sourceforge.net; Thu, 09 Mar 2023 00:52:36 +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:Cc:To:From:Sender:Reply-To: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=OOD2S4y9B1AAjaTwSiT+UOynaS0/K3QaQlQ68U6Rbdw=; b=dQab++BU/+3CFeK+AtZk0xY5rv H80yLjQs/HyQk+CCdIbMszayp9+BnLsOrDhnEqRkj8Qtox8ev7rgGjjIxo2jG2vPKxkIRxb4fHJS6 UkPPPJvQ3AtZPctpT6bkugZNCG1Y5oNO4lZfBG0sDjkv54GaQoYSnT5hyIn8Il6W9JjE=; 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:Cc:To:From :Sender:Reply-To: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=OOD2S4y9B1AAjaTwSiT+UOynaS0/K3QaQlQ68U6Rbdw=; b=N IDI4bZxSPI64Ic1Md7BbF/KFWAbAZN6t7exhElZJAbG5PzCkT+nE3BjAcqTrFKh8seOB3LJHW8SIm YVV7MKNq3aGWr7rfPWRJtB8zhZJ2wktgGjrL7zzHEeLFNaUKfCzVq294fJsQMEgHsJPLOeXHfjiXv wSYjzaOf14LJpeQg=; Received: from wilbur.contactoffice.com ([212.3.242.68]) by sfi-mx-1.v28.lw.sourceforge.com with esmtps (TLS1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.95) id 1pa4WI-001WbZ-42 for openvpn-devel@lists.sourceforge.net; Thu, 09 Mar 2023 00:52:34 +0000 Received: from smtpauth2.co-bxl (smtpauth2.co-bxl [10.2.0.24]) by wilbur.contactoffice.com (Postfix) with ESMTP id 93FAE8A8; Thu, 9 Mar 2023 01:52:27 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1678323147; s=20220809-q8oc; d=unstable.cc; i=a@unstable.cc; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version:Content-Transfer-Encoding; l=5172; bh=OOD2S4y9B1AAjaTwSiT+UOynaS0/K3QaQlQ68U6Rbdw=; b=a9FDTjIs1LyXqxEeiCdw360ZrERfOxXnbHF1vfYv8IybxM1hc+C30tccXtVRuppm 5KWc+LYCMXQM5OGiZiK6Cs3MY9S4xZB1UnsB9m0INyX7pm048pTZKzBTZPHJogSiZyP wWHdlWZnZ0qK+r8FBrXENPIAvNQd8WDlJStDnCI5Jr4awkvPtmADl5KFd2pc/DvnV0b gB2xnKmhoGSMwOXMSOYZ0pwc+E2qkXuNfq0kqX6dIGVLEejrl77wbN7Nh/LhSCFkdIN JgbNMscm7ex0AQqd2e30GWlvth80h5gMX7ldXS+OqBhrhxFWMc7TIkXDV4wuStCBJFM ba3aTujDsA== Received: by smtp.mailfence.com with ESMTPSA ; Thu, 9 Mar 2023 01:52:24 +0100 (CET) From: Antonio Quartulli To: openvpn-devel@lists.sourceforge.net Date: Thu, 9 Mar 2023 01:52:08 +0100 Message-Id: <20230309005208.29704-1-a@unstable.cc> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 X-Spam-Flag: NO X-Spam-Status: No, hits=-1.0 required=4.7 symbols=ALL_TRUSTED device=10.2.0.21 X-ContactOffice-Account: com:375058688 X-Spam-Score: -0.9 (/) 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: In order to provide better support in case of troubleshooting issues, it's important to know what exact DCO version is loaded on the user system. Therefore print the DCO version during bootup. For Windows and FreeBSD we currently implement a placeholder printing 'v0'. This should be improved with a follow-up patch. Content analysis details: (-0.9 points, 6.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at https://www.dnswl.org/, low trust [212.3.242.68 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_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: 1pa4WI-001WbZ-42 Subject: [Openvpn-devel] [PATCH] dco: print version to log if available 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: , Cc: Lev Stipakov , Antonio Quartulli Errors-To: openvpn-devel-bounces@lists.sourceforge.net X-getmail-retrieved-from-mailbox: Inbox X-GMAIL-THRID: =?utf-8?q?1759849413457537591?= X-GMAIL-MSGID: =?utf-8?q?1759849413457537591?= In order to provide better support in case of troubleshooting issues, it's important to know what exact DCO version is loaded on the user system. Therefore print the DCO version during bootup. For Windows and FreeBSD we currently implement a placeholder printing 'v0'. This should be improved with a follow-up patch. For Linux we directly fetch the module version from /sys and print something like: DCO version: 0.1.20230206-15-g580608ec7c59 Cc: Lev Stipakov Cc: Kristof Provost Change-Id: Ie1f6fa5d12a473d353d84fd119c2430b638e8bcd Signed-off-by: Antonio Quartulli --- src/openvpn/dco.h | 15 +++++++++++++++ src/openvpn/dco_freebsd.c | 6 ++++++ src/openvpn/dco_linux.c | 30 ++++++++++++++++++++++++++++++ src/openvpn/dco_win.c | 6 ++++++ src/openvpn/openvpn.c | 2 ++ src/openvpn/options.c | 11 +++++++++++ src/openvpn/options.h | 2 ++ 7 files changed, 72 insertions(+) diff --git a/src/openvpn/dco.h b/src/openvpn/dco.h index 2fe671bf..96d95c21 100644 --- a/src/openvpn/dco.h +++ b/src/openvpn/dco.h @@ -58,6 +58,15 @@ struct tuntap; */ bool dco_available(int msglevel); + +/** + * Return a human readable string representing the DCO version + * + * @param gc the garbage collector to use for any dynamic allocation + * @return a pointer to the string (allocated via gc) containing the string + */ +const char *dco_version_string(struct gc_arena *gc); + /** * Check whether the options struct has any option that is not supported by * our current dco implementation. If so print a warning at warning level @@ -250,6 +259,12 @@ dco_available(int msglevel) return false; } +static inline const char * +dco_version_string(struct gc_arena *gc) +{ + return "not-compiled"; +} + static inline bool dco_check_option(int msglevel, const struct options *o) { diff --git a/src/openvpn/dco_freebsd.c b/src/openvpn/dco_freebsd.c index 92de5f04..cbd2ce20 100644 --- a/src/openvpn/dco_freebsd.c +++ b/src/openvpn/dco_freebsd.c @@ -614,6 +614,12 @@ out: return available; } +const char * +dco_version_string(struct gc_arena *gc) +{ + return "v0"; +} + void dco_event_set(dco_context_t *dco, struct event_set *es, void *arg) { diff --git a/src/openvpn/dco_linux.c b/src/openvpn/dco_linux.c index 308abfc4..c9cd9df1 100644 --- a/src/openvpn/dco_linux.c +++ b/src/openvpn/dco_linux.c @@ -841,9 +841,39 @@ dco_available(int msglevel) "Note: Kernel support for ovpn-dco missing, disabling data channel offload."); return false; } + return true; } +const char +*dco_version_string(struct gc_arena *gc) +{ + struct buffer out = alloc_buf_gc(256, gc); + FILE *fp = fopen("/sys/module/ovpn_dco_v2/version", "r"); + if (!fp) + { + buf_printf(&out, "N/A"); + goto out; + } + + if (!fgets((char *)buf_bptr(&out), out.capacity - 1, fp)) + { + buf_printf(&out, "ERR"); + goto out; + } + + /* remove potential newline at the end of the string */ + char *str = (char *)buf_bptr(&out); + char *nl = strchr(str, '\n'); + if (nl) + { + *nl = '\0'; + } + +out: + return (char *)out.data; +} + void dco_event_set(dco_context_t *dco, struct event_set *es, void *arg) { diff --git a/src/openvpn/dco_win.c b/src/openvpn/dco_win.c index a805c2a0..26463b38 100644 --- a/src/openvpn/dco_win.c +++ b/src/openvpn/dco_win.c @@ -385,6 +385,12 @@ dco_available(int msglevel) return false; } +const char * +dco_version_string(struct gc_arena *gc) +{ + return "v0"; +} + int dco_do_read(dco_context_t *dco) { diff --git a/src/openvpn/openvpn.c b/src/openvpn/openvpn.c index cba58276..1aaddcdf 100644 --- a/src/openvpn/openvpn.c +++ b/src/openvpn/openvpn.c @@ -262,6 +262,8 @@ openvpn_main(int argc, char *argv[]) #endif show_library_versions(M_INFO); + show_dco_version(M_INFO); + /* misc stuff */ pre_setup(&c.options); diff --git a/src/openvpn/options.c b/src/openvpn/options.c index ce7bd0a7..8f0e2194 100644 --- a/src/openvpn/options.c +++ b/src/openvpn/options.c @@ -4816,6 +4816,16 @@ show_windows_version(const unsigned int flags) } #endif +void +show_dco_version(const unsigned int flags) +{ +#ifdef ENABLE_DCO + struct gc_arena gc = gc_new(); + msg(flags, "DCO version: %s", dco_version_string(&gc)); + gc_free(&gc); +#endif +} + void show_library_versions(const unsigned int flags) { @@ -4839,6 +4849,7 @@ usage_version(void) #ifdef _WIN32 show_windows_version( M_INFO|M_NOPREFIX ); #endif + show_dco_version(M_INFO | M_NOPREFIX); msg(M_INFO|M_NOPREFIX, "Originally developed by James Yonan"); msg(M_INFO|M_NOPREFIX, "Copyright (C) 2002-2023 OpenVPN Inc "); #ifndef ENABLE_SMALL diff --git a/src/openvpn/options.h b/src/openvpn/options.h index 7df717f7..2f25f5d0 100644 --- a/src/openvpn/options.h +++ b/src/openvpn/options.h @@ -796,6 +796,8 @@ void show_windows_version(const unsigned int flags); #endif +void show_dco_version(const unsigned int flags); + void init_options(struct options *o, const bool init_gc); void uninit_options(struct options *o);