projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove a few unnecessary #includes.
[tinc]
/
src
/
tincd.c
diff --git
a/src/tincd.c
b/src/tincd.c
index
89e0c93
..
b3d911b
100644
(file)
--- a/
src/tincd.c
+++ b/
src/tincd.c
@@
-1,10
+1,11
@@
/*
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-201
0
Guus Sliepen <guus@tinc-vpn.org>
+ 2000-201
1
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>
2008 Max Rijevski <maksuf@gmail.com>
2009 Michael Tokarev <mjt@tls.msk.ru>
2010 Julien Muchembled <jm@jmuchemb.eu>
+ 2010 Timothy Redaelli <timothy@redaelli.eu>
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
@@
-202,6
+203,8
@@
static bool parse_options(int argc, char **argv) {
kill_tincd = SIGINT;
else if(!strcasecmp(optarg, "ALRM"))
kill_tincd = SIGALRM;
kill_tincd = SIGINT;
else if(!strcasecmp(optarg, "ALRM"))
kill_tincd = SIGALRM;
+ else if(!strcasecmp(optarg, "ABRT"))
+ kill_tincd = SIGABRT;
else {
kill_tincd = atoi(optarg);
else {
kill_tincd = atoi(optarg);
@@
-220,7
+223,9
@@
static bool parse_options(int argc, char **argv) {
break;
case 'n': /* net name given */
break;
case 'n': /* net name given */
- netname = xstrdup(optarg);
+ /* netname "." is special: a "top-level name" */
+ netname = strcmp(optarg, ".") != 0 ?
+ xstrdup(optarg) : NULL;
break;
case 'o': /* option */
break;
case 'o': /* option */
@@
-364,6
+369,7
@@
static bool keygen(int bits) {
fchmod(fileno(f), 0600);
#endif
fchmod(fileno(f), 0600);
#endif
+ fputc('\n', f);
PEM_write_RSAPrivateKey(f, rsa_key, NULL, NULL, 0, NULL, NULL);
fclose(f);
free(filename);
PEM_write_RSAPrivateKey(f, rsa_key, NULL, NULL, 0, NULL, NULL);
fclose(f);
free(filename);
@@
-381,6
+387,7
@@
static bool keygen(int bits) {
if(disable_old_keys(f))
fprintf(stderr, "Warning: old key(s) found and disabled.\n");
if(disable_old_keys(f))
fprintf(stderr, "Warning: old key(s) found and disabled.\n");
+ fputc('\n', f);
PEM_write_RSAPublicKey(f, rsa_key);
fclose(f);
free(filename);
PEM_write_RSAPublicKey(f, rsa_key);
fclose(f);
free(filename);
@@
-497,12
+504,12
@@
static bool drop_privs() {
}
#ifdef HAVE_MINGW
}
#ifdef HAVE_MINGW
-# define setpriority(level)
SetPriorityClass(GetCurrentProcess(), level
)
+# define setpriority(level)
!SetPriorityClass(GetCurrentProcess(), (level)
)
#else
# define NORMAL_PRIORITY_CLASS 0
# define BELOW_NORMAL_PRIORITY_CLASS 10
# define HIGH_PRIORITY_CLASS -10
#else
# define NORMAL_PRIORITY_CLASS 0
# define BELOW_NORMAL_PRIORITY_CLASS 10
# define HIGH_PRIORITY_CLASS -10
-# define setpriority(level)
nice(level
)
+# define setpriority(level)
(setpriority(PRIO_PROCESS, 0, (level))
)
#endif
int main(int argc, char **argv) {
#endif
int main(int argc, char **argv) {
@@
-516,7
+523,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-201
0
Ivo Timmermans, Guus Sliepen and others.\n"
+ printf("Copyright (C) 1998-201
1
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"