From patchwork Fri Feb 3 16:55:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frank Lichtenheld X-Patchwork-Id: 3039 Return-Path: Delivered-To: patchwork@openvpn.net Received: by 2002:a05:7300:c95:b0:82:e4b3:40a0 with SMTP id p21csp1279804dyk; Fri, 3 Feb 2023 08:56:42 -0800 (PST) X-Google-Smtp-Source: AK7set/Jx2nJn6IWU5HsnKvsNJTJm2qhwVbEGdjmCXnnhgxFVMELw0mvnn5O6NXozZ8s0MIR7I/c X-Received: by 2002:a17:90b:38cc:b0:22c:4efa:3412 with SMTP id nn12-20020a17090b38cc00b0022c4efa3412mr11502442pjb.24.1675443402102; Fri, 03 Feb 2023 08:56:42 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675443402; cv=none; d=google.com; s=arc-20160816; b=bf8oStoREEwBnnvQhvQr9k6oksC812wBWhZx++uIGkX6qBhK3NqW7o+I52a5R5eoNV XM+2a3GAAFZ3zHpQ81X/OUkJ1dl9H4PClDSAOf2qL/ugdNu7yjBuR8l3pkCb6opqrmnC ofzKD69blChKpyYIMuPPx2ovYraAp9GKPic2yVRN6UkS3hd0jHDdCg0kGysz+QiJ4qhh rv2e9wdzOjdeO9aJE/9MJajlL8hqp/HllslraidjufHfQND/WV1JZbcoGeC+0DcZ9RGv xoOUwtuoU3srboeixSW9mTsypUhFWC5zQHW9WwgIxuSA5I4ysE3rox2Hw88mqf22NNNg OV0w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:content-transfer-encoding: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; bh=XeaE3uuvz7B6kU+PvsaJbQyCjKSMn76jRxw66y2OYgE=; b=H7ZtmiSb5VlzljFaJMpVrEd29+/EfT0aSJy80U7o76V8ECWmIK4FZQNYs8g69g6uPy VTLm/z1XoxoMKou/lLWyCiinLXlhFc296txLkLBYkeDXPtQpKR0KDT307zabAnQHXTxa e77ibzdoLvwmZbeCgNciQXP01E3VYkXbCbi+oNSEEbBZPmMq0Htx6OUobA4DPVXu5zz3 BVfLWjYEMbJ/sF/fof1tqAhJS7flDBI+qoGJwxMmekDGWjA8Hbs9/jtjMXXjRmgDYgpN ICdrHMKdBwjDH9K4EH2s1Q4gXXUEY+veTg4nWjQbSuDaaUcSv2pBkHS8O1keR/slfIV7 oQPQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b=mwppjv65; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=nS9YP7r7; 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 c18-20020a17090ab29200b0022c1c376f57si3286432pjr.33.2023.02.03.08.56.41 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 03 Feb 2023 08:56:42 -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=mwppjv65; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=nS9YP7r7; 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 1pNzLs-0001pB-B5; Fri, 03 Feb 2023 16:55: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 1pNzLp-0001p5-JU for openvpn-devel@lists.sourceforge.net; Fri, 03 Feb 2023 16:55:48 +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=jFvqdrOLfLNUvCQZ0uVosT7mqO3BvwFodvow1KTbakk=; b=mwppjv65IRSYbGdeDYVtouWDS8 dc6SuvlHDrJDW75gonIk+GJVb43AI7tvRlK4pDFvC7rI1oYL90OmvDwduQd4UBghvUGndV8/8nYaW dMnGnjK/ieITYlWdOk6wOI41rKZDNkHboaDopjKYOsCjbsLF5v6ju4gt0btmtiNbv1xA=; 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=jFvqdrOLfLNUvCQZ0uVosT7mqO3BvwFodvow1KTbakk=; b=n S9YP7r7WcU3v8FI40c57YY7yUImnm49wQmNlapV+i9oaunOUUUayTFopJoZKXXXwu0Wj9me7PgPqm y4MEPg3s/ef7ZN4eDNKE8SsawiMOB71r4cGvuqBBlGSiG8kh79rgr5D+bTCAQEg8VIpE2BvRQJPJh LgPnQuv7qu3F+tgw=; Received: from mout-p-201.mailbox.org ([80.241.56.171]) by sfi-mx-2.v28.lw.sourceforge.com with esmtps (TLS1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.95) id 1pNzLh-0005nP-Jp for openvpn-devel@lists.sourceforge.net; Fri, 03 Feb 2023 16:55:46 +0000 Received: from smtp1.mailbox.org (smtp1.mailbox.org [IPv6:2001:67c:2050:b231:465::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-201.mailbox.org (Postfix) with ESMTPS id 4P7hc262DQz9snd for ; Fri, 3 Feb 2023 17:55:30 +0100 (CET) From: Frank Lichtenheld To: openvpn-devel@lists.sourceforge.net Date: Fri, 3 Feb 2023 17:55:29 +0100 Message-Id: <20230203165529.125771-1-frank@lichtenheld.com> MIME-Version: 1.0 X-Rspamd-Queue-Id: 4P7hc262DQz9snd X-Spam-Score: -0.7 (/) 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: It is time. Automatically disabled when - iproute2 is enabled - libnl-genl is missing on Linux - libnv is missing on FreeBSD Signed-off-by: Frank Lichtenheld --- configure.ac | 79 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 62 insertions(+), 17 deletions(-) Content analysis details: (-0.7 points, 6.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at https://www.dnswl.org/, low trust [80.241.56.171 listed in list.dnswl.org] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 SPF_NONE SPF: sender does not publish an SPF Record X-Headers-End: 1pNzLh-0005nP-Jp Subject: [Openvpn-devel] [PATCH] configure: enable DCO by default on FreeBSD/Linux 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: , Errors-To: openvpn-devel-bounces@lists.sourceforge.net X-getmail-retrieved-from-mailbox: Inbox X-GMAIL-THRID: =?utf-8?q?1756829740649023698?= X-GMAIL-MSGID: =?utf-8?q?1756829740649023698?= It is time. Automatically disabled when - iproute2 is enabled - libnl-genl is missing on Linux - libnv is missing on FreeBSD Signed-off-by: Frank Lichtenheld --- configure.ac | 79 +++++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 62 insertions(+), 17 deletions(-) diff --git a/configure.ac b/configure.ac index 91500087..808b9c06 100644 --- a/configure.ac +++ b/configure.ac @@ -144,14 +144,27 @@ AC_ARG_ENABLE( AC_ARG_ENABLE( [dco], - [AS_HELP_STRING([--enable-dco], [enable data channel offload support using the ovpn-dco kernel module (always enabled on Windows) @<:@default=no@:>@])], + [AS_HELP_STRING([--disable-dco], [enable data channel offload support using the ovpn-dco kernel module (always enabled on Windows) @<:@default=yes@:>@])], , - [enable_dco="no"] + [ + case "$host" in + *-*-linux*) + enable_dco="auto" + ;; + *-*-freebsd*) + enable_dco="auto" + ;; + *) + # note that this does not disable it for Windows + enable_dco="no" + ;; + esac + ] ) AC_ARG_ENABLE( [iproute2], - [AS_HELP_STRING([--enable-iproute2], [enable support for iproute2 @<:@default=no@:>@])], + [AS_HELP_STRING([--enable-iproute2], [enable support for iproute2 (disables DCO) @<:@default=no@:>@])], , [enable_iproute2="no"] ) @@ -534,7 +547,7 @@ AC_CHECK_DECLS( , [[${SOCKET_INCLUDES}]] ) -AC_CHECKING([anonymous union support]) +AC_MSG_CHECKING([anonymous union support]) AC_COMPILE_IFELSE( [AC_LANG_PROGRAM( [[ @@ -769,28 +782,60 @@ PKG_CHECK_MODULES( ) -if test "$enable_dco" = "yes"; then +if test "$enable_dco" != "no"; then + enable_dco_arg="$enable_dco" + if test "${enable_iproute2}" = "yes"; then + AC_MSG_WARN([iproute2 support cannot be enabled when using DCO]) + enable_dco="no" + fi + case "$host" in + *-*-linux*) dnl dnl Include generic netlink library used to talk to ovpn-dco dnl - case "$host" in - *-*-linux*) PKG_CHECK_MODULES([LIBNL_GENL], [libnl-genl-3.0 >= 3.4.0], [have_libnl="yes"], - [AC_MSG_ERROR([libnl-genl-3.0 package not found or too old. Is the development package and pkg-config installed? Must be version 3.4.0 or newer])] + [ + AC_MSG_WARN([libnl-genl-3.0 package not found or too old. Is the development package and pkg-config installed? Must be version 3.4.0 or newer for DCO]) + enable_dco="no" + ] ) - - CFLAGS="${CFLAGS} ${LIBNL_GENL_CFLAGS}" - LIBS="${LIBS} ${LIBNL_GENL_LIBS}" - - AC_DEFINE(ENABLE_DCO, 1, [Enable shared data channel offload]) - AC_MSG_NOTICE([Enabled ovpn-dco support for Linux]) + if test "$enable_dco" = "no"; then + if test "$enable_dco_arg" = "auto"; then + AC_MSG_WARN([DCO support disabled]) + else + AC_MSG_ERROR([DCO support can't be enabled]) + fi + else + CFLAGS="${CFLAGS} ${LIBNL_GENL_CFLAGS}" + LIBS="${LIBS} ${LIBNL_GENL_LIBS}" + + AC_DEFINE(ENABLE_DCO, 1, [Enable shared data channel offload]) + AC_MSG_NOTICE([Enabled ovpn-dco support for Linux]) + fi ;; *-*-freebsd*) - LIBS="${LIBS} -lnv" - AC_DEFINE(ENABLE_DCO, 1, [Enable data channel offload for FreeBSD]) - AC_MSG_NOTICE([Enabled ovpn-dco support for FreeBSD]) + AC_CHECK_LIB( + [nv], + [nvlist_create], + [ + LIBS="${LIBS} -lnv" + AC_DEFINE(ENABLE_DCO, 1, [Enable data channel offload for FreeBSD]) + AC_MSG_NOTICE([Enabled ovpn-dco support for FreeBSD]) + ], + [ + enable_dco="no" + AC_MSG_WARN([Name/Value pair library not found.]) + ] + ) + if test "$enable_dco" = "no"; then + if test "$enable_dco_arg" = "auto"; then + AC_MSG_WARN([DCO support disabled]) + else + AC_MSG_ERROR([DCO support can't be enabled]) + fi + fi ;; *-mingw*) AC_MSG_NOTICE([NOTE: --enable-dco ignored on Windows because it's always enabled])