CI: Install and use OpenSSL 1.1 on CentOS 7.

[tinc] / src / tincd.c

diff --git a/src/tincd.c b/src/tincd.c
index dbf6bc8..bb928b0 100644 (file)
--- a/src/tincd.c
+++ b/src/tincd.c
@@ -1,7 +1,7 @@
 /*
     tincd.c -- the main file for tincd
     Copyright (C) 1998-2005 Ivo Timmermans
-                  2000-2018 Guus Sliepen <guus@tinc-vpn.org>
+                  2000-2021 Guus Sliepen <guus@tinc-vpn.org>
                   2008      Max Rijevski <maksuf@gmail.com>
                   2009      Michael Tokarev <mjt@tls.msk.ru>
                   2010      Julien Muchembled <jm@jmuchemb.eu>
@@ -37,6 +37,10 @@
 #include LZO1X_H
 #endif
 
+#ifdef LZ4_H
+#include LZ4_H
+#endif
+
 #ifndef HAVE_MINGW
 #include <pwd.h>
 #include <grp.h>
@@ -344,10 +348,15 @@ static bool drop_privs(void) {
 # define setpriority(level) !SetPriorityClass(GetCurrentProcess(), (level))
 
 static void stop_handler(void *data, int flags) {
+       (void)data;
+       (void)flags;
+
        event_exit();
 }
 
 static BOOL WINAPI console_ctrl_handler(DWORD type) {
+       (void)type;
+
        logger(DEBUG_ALWAYS, LOG_NOTICE, "Got console shutdown request");
 
        if(WSASetEvent(stop_io.event) == FALSE) {
@@ -373,7 +382,42 @@ 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("Copyright (C) 1998-2018 Ivo Timmermans, Guus Sliepen and others.\n"
+               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"
                       "and you are welcome to redistribute it under certain conditions;\n"
@@ -481,6 +525,8 @@ int main(int argc, char **argv) {
 }
 
 int main2(int argc, char **argv) {
+       (void)argc;
+       (void)argv;
 #endif
        char *priority = NULL;