List supported features in tinc/tincd --version

diff --git a/m4/libgcrypt.m4 b/m4/libgcrypt.m4
index 01c7478fbccc6918f83e6edaabf199d20c56465b..42efd60f5436e6fff8859ce4b16bc7e77e40ef7c 100644 (file)
--- a/m4/libgcrypt.m4
+++ b/m4/libgcrypt.m4
@@ -30,4 +30,6 @@ AC_DEFUN([tinc_LIBGCRYPT],
     [LIBS="-lgcrypt $LIBS"],
     [AC_MSG_ERROR([libgcrypt libraries not found.])]
   )
+
+  AC_DEFINE(HAVE_LIBGCRYPT, 1, [enable libgcrypt support])
 ])

diff --git a/m4/openssl.m4 b/m4/openssl.m4
index 0ff939ba6513bd849b0358c62358522c7b987e26..01768ce43cfa1c6d96bc6f4c02473fdbc8a6a7bd 100644 (file)
--- a/m4/openssl.m4
+++ b/m4/openssl.m4
@@ -56,4 +56,6 @@ AC_DEFUN([tinc_OPENSSL],
 
   AC_CHECK_FUNCS([BN_GENCB_new ERR_remove_state RSA_set0_key], , , [#include <openssl/rsa.h>])
   AC_CHECK_FUNCS([HMAC_CTX_new], , , [#include <openssl/hmac.h>])
+
+  AC_DEFINE(HAVE_OPENSSL, 1, [enable OpenSSL support])
 ])

diff --git a/src/tincctl.c b/src/tincctl.c
index 8b49c4499b2c508ba04bc4595c377cfffe6a2bac..a6b400b905e0c523fc96e26d5457907cb8ae5776 100644 (file)
--- a/src/tincctl.c
+++ b/src/tincctl.c
@@ -93,6 +93,17 @@ static struct option const long_options[] = {
 static void version(void) {
        printf("%s version %s (built %s %s, protocol %d.%d)\n", PACKAGE,
               BUILD_VERSION, BUILD_DATE, BUILD_TIME, PROT_MAJOR, PROT_MINOR);
+       printf("Features:"
+#ifdef HAVE_READLINE
+              " readline"
+#endif
+#ifdef HAVE_CURSES
+              " curses"
+#endif
+#ifndef DISABLE_LEGACY
+              " legacy_protocol"
+#endif
+              "\n\n");
        printf("Copyright (C) 1998-2018 Ivo Timmermans, Guus Sliepen and others.\n"
               "See the AUTHORS file for a complete list.\n\n"
               "tinc comes with ABSOLUTELY NO WARRANTY.  This is free software,\n"

diff --git a/src/tincd.c b/src/tincd.c
index 3a3703ca57e82dff96844513eeb7cd7efc6b9e62..bb928b0dae0c4cd23b28cb487ec2a4d9f79993cf 100644 (file)
--- a/src/tincd.c
+++ b/src/tincd.c
@@ -382,6 +382,41 @@ int main(int argc, char **argv) {
        if(show_version) {
                printf("%s version %s (built %s %s, protocol %d.%d)\n", PACKAGE,
                       BUILD_VERSION, BUILD_DATE, BUILD_TIME, PROT_MAJOR, PROT_MINOR);
+               printf("Features:"
+#ifdef HAVE_OPENSSL
+                      " openssl"
+#endif
+#ifdef HAVE_LIBGCRYPT
+                      " libgcrypt"
+#endif
+#ifdef HAVE_LZO
+                      " comp_lzo"
+#endif
+#ifdef HAVE_ZLIB
+                      " comp_zlib"
+#endif
+#ifdef HAVE_LZ4
+                      " comp_lz4"
+#endif
+#ifndef DISABLE_LEGACY
+                      " legacy_protocol"
+#endif
+#ifdef ENABLE_JUMBOGRAMS
+                      " jumbograms"
+#endif
+#ifdef ENABLE_TUNEMU
+                      " tunemu"
+#endif
+#ifdef HAVE_MINIUPNPC
+                      " miniupnpc"
+#endif
+#ifdef ENABLE_UML
+                      " uml"
+#endif
+#ifdef ENABLE_VDE
+                      " vde"
+#endif
+                      "\n\n");
                printf("Copyright (C) 1998-2021 Ivo Timmermans, Guus Sliepen and others.\n"
                       "See the AUTHORS file for a complete list.\n\n"
                       "tinc comes with ABSOLUTELY NO WARRANTY.  This is free software,\n"