From patchwork Wed Feb 15 15:04:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frank Lichtenheld X-Patchwork-Id: 3084 Return-Path: Delivered-To: patchwork@openvpn.net Received: by 2002:a05:7300:c95:b0:82:e4b3:40a0 with SMTP id p21csp370527dyk; Wed, 15 Feb 2023 07:05:36 -0800 (PST) X-Google-Smtp-Source: AK7set/rE2/wVJb2FjN6KLwbTwkPnwdXXAAk5WoRBcARV8i+/5fK0U5ChqF4V48mrPDD1NVOo5Fn X-Received: by 2002:a54:4190:0:b0:364:5a39:ec53 with SMTP id 16-20020a544190000000b003645a39ec53mr964085oiy.22.1676473536614; Wed, 15 Feb 2023 07:05:36 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676473536; cv=none; d=google.com; s=arc-20160816; b=IxwpHf5UXCw1ODUs/R1CCbQBG+Q21lbX1GIZo1wlxrNK4RDHqCZRRtIaV1RsoTDNtb K0fhOoV9+9sZEGrSX/lKy5npd4QCwZYKj17KmTUuh44iPrIuhNiwscjCbPB0ndO1awe7 NsWhsyn+Upd3t1ygTClKxGzuE/d3c8IHfnJ1g+ioMUzijoUyUR4lTbxN/Sl7fJ3xK0qt xH6JSUS0XjbN4urGo1OC09S/ja0efI5rbChEiQvTJtm6Xi0c8HrKwNm4AA77TfHs28VC 5Pim0M29fbn2dEI9sjYFv3+vTNCwrhriF2Pq/1I1XJK+1zGjiq9U6yOSye/T2lXK1Ut7 TesQ== 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:references:in-reply-to:message-id:date:to:from :dkim-signature:dkim-signature; bh=ELT1JIo0mDk+twVPNTmGpgcwlu2huZlalD9cR7d1J8o=; b=ynAwRFmYEB4omEZBuYOh7gp232kr0tRPtH9t1tCEC4ymkULAjzyp/QEJMSG/OpdvRl 0FlXCrh8awxr/rSimZnV0xRBxir6Cb3rLeCyG8IM+lmxlQ/mVwc6kXQqJR/0V2r8/tCW jPxD0SauIO2uoUnXakZTGoNG3vPi9N0ohsKup9vT7VRZn53GHUYvhPcwJSCwpECqlAC9 Pnjc1Ent1uISw+VfrQ5AcLY0iHjxLxaDm6KswhJLCRCLHozSqucHyXIDXuca40V5w9/u 0UNdgSUAa5LRIc4golzUtk8PhRp0iLUsmhoqfoZ6v16xP3waw0pQUdVYn8jiCOs3y/WM Vjnw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b="dgJP4/2p"; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=a6CA5xcy; 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 v205-20020acaded6000000b0035b8d2564casi17390919oig.68.2023.02.15.07.05.36 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 15 Feb 2023 07:05:36 -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="dgJP4/2p"; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=a6CA5xcy; 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-1.v29.lw.sourceforge.com) by sfs-ml-1.v29.lw.sourceforge.com with esmtp (Exim 4.95) (envelope-from ) id 1pSJLM-0004F9-K4; Wed, 15 Feb 2023 15:05:11 +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.95) (envelope-from ) id 1pSJLK-0004Eq-E1 for openvpn-devel@lists.sourceforge.net; Wed, 15 Feb 2023 15:05:09 +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=YdIzXEF2GvhsIIXOUV57CZCSpy5f2slezbdzWAmtrM0=; b=dgJP4/2pD41R/MlFV97ufSiiAi pwPbhCpieZmkqB/mLoxRMJViUM+OkPdwfrADKxH84pZNVvU5z29UQWjilgVbB6HItrLXbUrIPO3km bFOVJ/43sgX4viN9pV7SR0w5HUXLpTmy8k5FkqInIbUkyQkIHSBpLGPDQSEH4OeDv9yQ=; 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=YdIzXEF2GvhsIIXOUV57CZCSpy5f2slezbdzWAmtrM0=; b=a6CA5xcyj7+O/gqAk4OSajIN6E 05PPgBQjAdWQVzsebgCQ4Jea/bDeElxNAaPtSlxp9yXvjLMJrtSWlELe5ahV0+UuTohaPo21lAYX7 en3HLAFZQL85Daepph7FJ3a6T/cb9ZGVxbBr40J2IVWUCcyIaIS4fTDt0bUqPJZsZqyo=; Received: from mout-p-101.mailbox.org ([80.241.56.151]) by sfi-mx-2.v28.lw.sourceforge.com with esmtps (TLS1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.95) id 1pSJLG-0007Zm-Pw for openvpn-devel@lists.sourceforge.net; Wed, 15 Feb 2023 15:05:09 +0000 Received: from smtp2.mailbox.org (smtp2.mailbox.org [IPv6:2001:67c:2050:b231:465::2]) (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-101.mailbox.org (Postfix) with ESMTPS id 4PH1Zw3DXDz9sQb for ; Wed, 15 Feb 2023 16:04:56 +0100 (CET) From: Frank Lichtenheld To: openvpn-devel@lists.sourceforge.net Date: Wed, 15 Feb 2023 16:04:55 +0100 Message-Id: <20230215150455.45052-1-frank@lichtenheld.com> In-Reply-To: <20230207132026.41580-1-frank@lichtenheld.com> References: <20230207132026.41580-1-frank@lichtenheld.com> MIME-Version: 1.0 X-Rspamd-Queue-Id: 4PH1Zw3DXDz9sQb X-Spam-Score: -0.7 (/) X-Spam-Report: Spam detection software, running on the system "util-spamd-1.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: Automatically disabled when - iproute2 is enabled - libnl-genl is missing on Linux - libnv is missing on FreeBSD Signed-off-by: Frank Lichtenheld --- .github/workflows/build.yaml | 13 ++---- configure.ac | 79 ++++++++++++++++++++++++++++-------- 2 files changed, 66 insertions(+), 26 delet [...] 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.151 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: 1pSJLG-0007Zm-Pw Subject: [Openvpn-devel] [PATCH v4] 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?1757909915542975690?= Automatically disabled when - iproute2 is enabled - libnl-genl is missing on Linux - libnv is missing on FreeBSD Signed-off-by: Frank Lichtenheld --- .github/workflows/build.yaml | 13 ++---- configure.ac | 79 ++++++++++++++++++++++++++++-------- 2 files changed, 66 insertions(+), 26 deletions(-) v2: error out when libnl-genl is missing as discussed with ordex on IRC. v3: - improvements to the messages, suggested by Selva - further improvements to the default specification, trying to make it clear - if enabling iproute2, do not test for libnl-genl v4: add updates for GHA diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 699964fd..3265725f 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -275,10 +275,12 @@ jobs: sslpkg: "libssl1.0-dev" ssllib: openssl libname: OpenSSL 1.0.2 + extraconf: "--disable-dco" - os: ubuntu-18.04 sslpkg: "libssl-dev" libname: OpenSSL 1.1.1 ssllib: openssl + extraconf: "--disable-dco" - os: ubuntu-20.04 sslpkg: "libssl-dev" libname: OpenSSL 1.1.1 @@ -312,22 +314,15 @@ jobs: libname: OpenSSL 1.1.1 ssllib: openssl extraconf: "--disable-lzo --disable-lz4" - - os: ubuntu-20.04 - sslpkg: "libssl-dev" - libname: OpenSSL 1.1.1 - ssllib: openssl - extraconf: "--enable-dco" - nlpkg: "libnl-genl-3-dev" name: "gcc - ${{matrix.os}} - ${{matrix.libname}} ${{matrix.extraconf}}" env: SSLPKG: "${{matrix.sslpkg}}" - NLPKG: "${{matrix.nlpkg}}" runs-on: ${{matrix.os}} steps: - name: Install dependencies - run: sudo apt update && sudo apt install -y liblzo2-dev libpam0g-dev liblz4-dev libcap-ng-dev linux-libc-dev man2html libcmocka-dev python3-docutils libtool automake autoconf ${SSLPKG} ${NLPKG} + run: sudo apt update && sudo apt install -y liblzo2-dev libpam0g-dev liblz4-dev libcap-ng-dev libnl-genl-3-dev linux-libc-dev man2html libcmocka-dev python3-docutils libtool automake autoconf ${SSLPKG} - name: Checkout OpenVPN uses: actions/checkout@v3 - name: autoconf @@ -354,7 +349,7 @@ jobs: runs-on: ${{matrix.os}} steps: - name: Install dependencies - run: sudo apt update && sudo apt install -y liblzo2-dev libpam0g-dev liblz4-dev libcap-ng-dev linux-libc-dev man2html clang libcmocka-dev python3-docutils libtool automake autoconf libmbedtls-dev + run: sudo apt update && sudo apt install -y liblzo2-dev libpam0g-dev liblz4-dev libcap-ng-dev libnl-genl-3-dev linux-libc-dev man2html clang libcmocka-dev python3-docutils libtool automake autoconf libmbedtls-dev - name: Checkout OpenVPN uses: actions/checkout@v3 - name: autoconf diff --git a/configure.ac b/configure.ac index 66ba6f38..5a9a55d9 100644 --- a/configure.ac +++ b/configure.ac @@ -157,14 +157,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"] ) @@ -549,7 +562,7 @@ AC_CHECK_DECLS( , [[${SOCKET_INCLUDES}]] ) -AC_CHECKING([anonymous union support]) +AC_MSG_CHECKING([anonymous union support]) AC_COMPILE_IFELSE( [AC_LANG_PROGRAM( [[ @@ -784,28 +797,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])