projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update Dutch translation.
[tinc]
/
src
/
tincd.c
diff --git
a/src/tincd.c
b/src/tincd.c
index
9e0ad4a
..
ed96762
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
3 Ivo Timmermans <ivo@o2w.nl>
- 2000-200
3 Guus Sliepen <guus@sliepen.eu
.org>
+ Copyright (C) 1998-200
5 Ivo Timmermans
+ 2000-200
7 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
@@
-17,7
+17,7
@@
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- $Id
: tincd.c,v 1.10.4.86 2003/08/17 09:03:30 guus Exp
$
+ $Id$
*/
#include "system.h"
*/
#include "system.h"
@@
-35,10
+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 "conf.h"
#include "device.h"
#include "conf.h"
#include "device.h"
@@
-119,7
+121,7
@@
static void usage(bool status)
" --pidfile=FILENAME Write PID to FILENAME.\n"
" --help Display this help and exit.\n"
" --version Output version information and exit.\n\n"));
" --pidfile=FILENAME Write PID to FILENAME.\n"
" --help Display this help and exit.\n"
" --version Output version information and exit.\n\n"));
- printf(_("Report bugs to tinc@
nl.linux
.org.\n"));
+ printf(_("Report bugs to tinc@
tinc-vpn
.org.\n"));
}
}
}
}
@@
-291,7
+293,7
@@
static bool keygen(int bits)
char *filename;
fprintf(stderr, _("Generating %d bits keys:\n"), bits);
char *filename;
fprintf(stderr, _("Generating %d bits keys:\n"), bits);
- rsa_key = RSA_generate_key(bits, 0x
FFFF
, indicator, NULL);
+ rsa_key = RSA_generate_key(bits, 0x
10001
, indicator, NULL);
if(!rsa_key) {
fprintf(stderr, _("Error during key generation!\n"));
if(!rsa_key) {
fprintf(stderr, _("Error during key generation!\n"));
@@
-406,7
+408,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
3
Ivo Timmermans, Guus Sliepen and others.\n"
+ printf(_("Copyright (C) 1998-200
7
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"
@@
-447,6
+449,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) {
@@
-482,17
+487,10
@@
int main2(int argc, char **argv)
return 1;
return 1;
- /* Setup sockets and open device.
If it doesn't work, don't give up but try again.
*/
+ /* Setup sockets and open device. */
- while(!setup_network_connections()) {
- if(do_detach) {
- logger(LOG_NOTICE, _("Restarting in %d seconds!"), maxtimeout);
- sleep(maxtimeout);
- } else {
- logger(LOG_ERR, _("Not restarting."));
- return 1;
- }
- }
+ if(!setup_network_connections())
+ goto end;
/* Start main loop. It only exits when tinc is killed. */
/* Start main loop. It only exits when tinc is killed. */
@@
-505,6
+503,14
@@
int main2(int argc, char **argv)
ifdebug(CONNECTIONS)
dump_device_stats();
ifdebug(CONNECTIONS)
dump_device_stats();
+end:
logger(LOG_NOTICE, _("Terminating"));
logger(LOG_NOTICE, _("Terminating"));
+
+#ifndef HAVE_MINGW
+ remove_pid(pidfilename);
+#endif
+
+ EVP_cleanup();
+
return status;
}
return status;
}