projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Allow reading config files with CRLF endings on Unix systems.
[tinc]
/
src
/
tincd.c
diff --git
a/src/tincd.c
b/src/tincd.c
index
3c1a608
..
c4e8fad
100644
(file)
--- a/
src/tincd.c
+++ b/
src/tincd.c
@@
-1,7
+1,7
@@
/*
tincd.c -- the main file for tincd
/*
tincd.c -- the main file for tincd
- Copyright (C) 1998-200
4 Ivo Timmermans <ivo@tinc-vpn.org>
- 2000-200
4
Guus Sliepen <guus@tinc-vpn.org>
+ Copyright (C) 1998-200
5 Ivo Timmermans
+ 2000-200
8
Guus Sliepen <guus@tinc-vpn.org>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@
-35,11
+35,12
@@
#include <openssl/rsa.h>
#include <openssl/pem.h>
#include <openssl/evp.h>
#include <openssl/rsa.h>
#include <openssl/pem.h>
#include <openssl/evp.h>
+#include <openssl/engine.h>
-#include
<lzo1x.h>
+#include
LZO1X_H
#include <getopt.h>
#include <getopt.h>
-#include
<pidfile.h>
+#include
"pidfile.h"
#include "conf.h"
#include "device.h"
#include "conf.h"
#include "device.h"
@@
-391,6
+392,14
@@
static void make_names(void)
}
}
}
}
+static void free_names() {
+ if (identname) free(identname);
+ if (netname) free(netname);
+ if (pidfilename) free(pidfilename);
+ if (logfilename) free(logfilename);
+ if (confbase) free(confbase);
+}
+
int main(int argc, char **argv)
{
program_name = argv[0];
int main(int argc, char **argv)
{
program_name = argv[0];
@@
-407,7
+416,7
@@
int main(int argc, char **argv)
if(show_version) {
printf(_("%s version %s (built %s %s, protocol %d)\n"), PACKAGE,
VERSION, __DATE__, __TIME__, PROT_CURRENT);
if(show_version) {
printf(_("%s version %s (built %s %s, protocol %d)\n"), PACKAGE,
VERSION, __DATE__, __TIME__, PROT_CURRENT);
- printf(_("Copyright (C) 1998-200
4
Ivo Timmermans, Guus Sliepen and others.\n"
+ printf(_("Copyright (C) 1998-200
8
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"
"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"
@@
-448,6
+457,9
@@
int main(int argc, char **argv)
RAND_load_file("/dev/urandom", 1024);
RAND_load_file("/dev/urandom", 1024);
+ ENGINE_load_builtin_engines();
+ ENGINE_register_all_complete();
+
OpenSSL_add_all_algorithms();
if(generate_keys) {
OpenSSL_add_all_algorithms();
if(generate_keys) {
@@
-494,17
+506,26
@@
int main2(int argc, char **argv)
/* Shutdown properly. */
/* Shutdown properly. */
- close_network_connections();
-
ifdebug(CONNECTIONS)
dump_device_stats();
ifdebug(CONNECTIONS)
dump_device_stats();
+ close_network_connections();
+
end:
logger(LOG_NOTICE, _("Terminating"));
#ifndef HAVE_MINGW
remove_pid(pidfilename);
#endif
end:
logger(LOG_NOTICE, _("Terminating"));
#ifndef HAVE_MINGW
remove_pid(pidfilename);
#endif
+
+ EVP_cleanup();
+ ENGINE_cleanup();
+ CRYPTO_cleanup_all_ex_data();
+ ERR_remove_state(0);
+ ERR_free_strings();
+
+ exit_configuration(&config_tree);
+ free_names();
return status;
}
return status;
}