configure: enable DCO by default on FreeBSD/Linux

Automatically disabled when
- iproute2 is enabled
  (Don't want to force people specifying --disable-dco explicitely)
- libnv is missing on FreeBSD
  (FreeBSD version too old anyway)

Will still error out if libnl-genl is missing on Linux to
make people aware of new dependency.

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
v5:
 - v4 was missing the changes of v3. v5 combines the changes from v3 and v4
 - fix build failure GHA/ubuntu1804/mbedtls
 - fix build failure GHA/ubuntu2204/libressl

Signed-off-by: Frank Lichtenheld <frank@lichtenheld.com>
Acked-by: Selva Nair <selva.nair@gmail.com>
Acked-by: Antonio Quartulli <a@unstable.cc>
Message-Id: <20230215162654.52137-1-frank@lichtenheld.com>
URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg26272.html
Signed-off-by: Gert Doering <gert@greenie.muc.de>

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 699964fd0182d69cc0df9b5d644a2edc15d2cb05..162dd8ce8f1c4e623e0b54b8d925d7a82a57f8ee 100644 (file)
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -265,20 +265,27 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-18.04, ubuntu-20.04, ubuntu-22.04]
+        os: [ubuntu-20.04, ubuntu-22.04]
         sslpkg: [libmbedtls-dev]
         ssllib: [mbedtls]
         libname: [mbed TLS]
 
         include:
+          - os: ubuntu-18.04
+            sslpkg: "libmbedtls-dev"
+            ssllib: mbedtls
+            libname: mbed TLS
+            extraconf: "--disable-dco"
           - os: ubuntu-18.04
             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 +319,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 +354,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
@@ -514,7 +514,7 @@ jobs:
 
     steps:
       - name: Install dependencies
-        run: sudo apt update && sudo apt install -y liblzo2-dev libpam0g-dev liblz4-dev linux-libc-dev man2html clang libcmocka-dev python3-docutils libtool automake autoconf pkg-config libcap-ng-dev
+        run: sudo apt update && sudo apt install -y liblzo2-dev libpam0g-dev liblz4-dev linux-libc-dev man2html clang libcmocka-dev python3-docutils libtool automake autoconf pkg-config libcap-ng-dev libnl-genl-3-dev
       - name: "libressl: checkout"
         uses: actions/checkout@v3
         with:

diff --git a/configure.ac b/configure.ac
index 66ba6f38d8714d8eccb9b9a480fb1c633e8460d1..c44d38568d8d7a4e19684676d6d397fcb5175f82 100644 (file)
--- 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], [disable data channel offload support using the ovpn-dco kernel module @<:@default=yes@:>@ on Linux/FreeBSD, can't disable on Windows])],
        ,
-       [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,59 @@ PKG_CHECK_MODULES(
 )
 
 
-if test "$enable_dco" = "yes"; then
-dnl
-dnl Include generic netlink library used to talk to ovpn-dco
-dnl
+if test "$enable_dco" != "no"; then
+       enable_dco_arg="$enable_dco"
+       if test "${enable_iproute2}" = "yes"; then
+               AC_MSG_WARN([DCO cannot be enabled when using iproute2])
+               enable_dco="no"
+       fi
        case "$host" in
                *-*-linux*)
-                       PKG_CHECK_MODULES([LIBNL_GENL],
+                       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
+                               dnl
+                               dnl Include generic netlink library used to talk to ovpn-dco
+                               dnl
+                               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])]
-                       )
-
-                       CFLAGS="${CFLAGS} ${LIBNL_GENL_CFLAGS}"
-                       LIBS="${LIBS} ${LIBNL_GENL_LIBS}"
+                                         [
+                                          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 for DCO])
+                                         ]
+                               )
+                               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])
+                               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])