X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Ftincd.c;h=9f83a3ca572b888b20fde0add470ceb913b94c6c;hb=e024b7a2c50e23311834e6d180e5acc72783b339;hp=84036ad4795a5c0f58673293f8dd9f221538a4ca;hpb=09b0b49b98cc16f6b281e4e635c2c70234e38865;p=tinc diff --git a/src/tincd.c b/src/tincd.c index 84036ad4..9f83a3ca 100644 --- 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-2013 Guus Sliepen + 2000-2014 Guus Sliepen 2008 Max Rijevski 2009 Michael Tokarev 2010 Julien Muchembled @@ -57,6 +57,7 @@ #include "protocol.h" #include "utils.h" #include "xalloc.h" +#include "version.h" /* If nonzero, display usage information and exit. */ static bool show_help = false; @@ -106,7 +107,6 @@ static struct option const long_options[] = { #ifdef HAVE_MINGW static struct WSAData wsa_state; -CRITICAL_SECTION mutex; int main2(int argc, char **argv); #endif @@ -320,8 +320,8 @@ int main(int argc, char **argv) { if(show_version) { printf("%s version %s (built %s %s, protocol %d.%d)\n", PACKAGE, - VERSION, __DATE__, __TIME__, PROT_MAJOR, PROT_MINOR); - printf("Copyright (C) 1998-2013 Ivo Timmermans, Guus Sliepen and others.\n" + BUILD_VERSION, BUILD_DATE, BUILD_TIME, PROT_MAJOR, PROT_MINOR); + printf("Copyright (C) 1998-2014 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" @@ -378,8 +378,6 @@ int main(int argc, char **argv) { } int main2(int argc, char **argv) { - InitializeCriticalSection(&mutex); - EnterCriticalSection(&mutex); #endif char *priority = NULL; @@ -440,9 +438,6 @@ int main2(int argc, char **argv) { /* Shutdown properly. */ - if(debug_level >= DEBUG_CONNECTIONS) - devops.dump_stats(); - end: close_network_connections();