projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into 1.1
[tinc]
/
src
/
tincd.c
diff --git
a/src/tincd.c
b/src/tincd.c
index
2044310
..
ac0cbc6
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
/*
tincd.c -- the main file for tincd
Copyright (C) 1998-2005 Ivo Timmermans
- 2000-200
7
Guus Sliepen <guus@tinc-vpn.org>
+ 2000-200
9
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
@@
-31,18
+31,13
@@
#include <sys/mman.h>
#endif
#include <sys/mman.h>
#endif
-#include <openssl/rand.h>
-#include <openssl/rsa.h>
-#include <openssl/pem.h>
-#include <openssl/evp.h>
-#include <openssl/engine.h>
-
#include LZO1X_H
#include <getopt.h>
#include "conf.h"
#include "control.h"
#include LZO1X_H
#include <getopt.h>
#include "conf.h"
#include "control.h"
+#include "crypto.h"
#include "device.h"
#include "logger.h"
#include "net.h"
#include "device.h"
#include "logger.h"
#include "net.h"
@@
-191,7
+186,7
@@
static void make_names(void)
#ifdef HAVE_MINGW
HKEY key;
char installdir[1024] = "";
#ifdef HAVE_MINGW
HKEY key;
char installdir[1024] = "";
- long len = sizeof
(installdir)
;
+ long len = sizeof
installdir
;
#endif
if(netname)
#endif
if(netname)
@@
-234,6
+229,14
@@
static void make_names(void)
}
}
}
}
+static void free_names() {
+ if (identname) free(identname);
+ if (netname) free(netname);
+ if (controlsocketname) free(controlsocketname);
+ 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];
@@
-250,7
+253,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
7
Ivo Timmermans, Guus Sliepen and others.\n"
+ printf(_("Copyright (C) 1998-200
9
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"
@@
-295,12
+298,7
@@
int main(int argc, char **argv)
/* Slllluuuuuuurrrrp! */
srand(time(NULL));
/* Slllluuuuuuurrrrp! */
srand(time(NULL));
- RAND_load_file("/dev/urandom", 1024);
-
- ENGINE_load_builtin_engines();
- ENGINE_register_all_complete();
-
- OpenSSL_add_all_algorithms();
+ crypto_init();
if(!read_server_config())
return 1;
if(!read_server_config())
return 1;
@@
-341,11
+339,11
@@
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"));
end:
logger(LOG_NOTICE, _("Terminating"));
@@
-353,7
+351,7
@@
end:
exit_control();
#endif
exit_control();
#endif
-
EVP_cleanup
();
-
+
crypto_exit
();
+
return status;
}
return status;
}