projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://tinc-vpn.org/tinc into 1.1
[tinc]
/
src
/
tincd.c
diff --git
a/src/tincd.c
b/src/tincd.c
index
c4750da
..
1008f88
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-201
0
Guus Sliepen <guus@tinc-vpn.org>
+ 2000-201
2
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>
@@
-67,16
+67,16
@@
char *program_name = NULL;
/* If nonzero, display usage information and exit. */
char *program_name = NULL;
/* If nonzero, display usage information and exit. */
-bool show_help = false;
+
static
bool show_help = false;
/* If nonzero, print the version on standard output and exit. */
/* If nonzero, print the version on standard output and exit. */
-bool show_version = false;
+
static
bool show_version = false;
/* If nonzero, use null ciphers and skip all key exchanges. */
bool bypass_security = false;
/* If nonzero, disable swapping for this process. */
/* If nonzero, use null ciphers and skip all key exchanges. */
bool bypass_security = false;
/* If nonzero, disable swapping for this process. */
-bool do_mlock = false;
+
static
bool do_mlock = false;
/* If nonzero, chroot to netdir after startup. */
static bool do_chroot = false;
/* If nonzero, chroot to netdir after startup. */
static bool do_chroot = false;
@@
-89,10
+89,10
@@
bool use_logfile = false;
char *identname = NULL; /* program name for syslog */
char *logfilename = NULL; /* log file location */
char *identname = NULL; /* program name for syslog */
char *logfilename = NULL; /* log file location */
-char *
controlcooki
ename = NULL;
+char *
pidfil
ename = NULL;
char **g_argv; /* a copy of the cmdline arguments */
char **g_argv; /* a copy of the cmdline arguments */
-static int status;
+static int status
= 1
;
static struct option const long_options[] = {
{"config", required_argument, NULL, 'c'},
static struct option const long_options[] = {
{"config", required_argument, NULL, 'c'},
@@
-106,7
+106,8
@@
static struct option const long_options[] = {
{"chroot", no_argument, NULL, 'R'},
{"user", required_argument, NULL, 'U'},
{"logfile", optional_argument, NULL, 4},
{"chroot", no_argument, NULL, 'R'},
{"user", required_argument, NULL, 'U'},
{"logfile", optional_argument, NULL, 4},
- {"controlcookie", required_argument, NULL, 5},
+ {"pidfile", required_argument, NULL, 5},
+ {"option", required_argument, NULL, 'o'},
{NULL, 0, NULL, 0}
};
{NULL, 0, NULL, 0}
};
@@
-128,9
+129,9
@@
static void usage(bool status) {
" -n, --net=NETNAME Connect to net NETNAME.\n"
" -L, --mlock Lock tinc into main memory.\n"
" --logfile[=FILENAME] Write log entries to a logfile.\n"
" -n, --net=NETNAME Connect to net NETNAME.\n"
" -L, --mlock Lock tinc into main memory.\n"
" --logfile[=FILENAME] Write log entries to a logfile.\n"
- " --
controlcookie=FILENAME Write
control socket cookie to FILENAME.\n"
+ " --
pidfile=FILENAME Write PID and
control socket cookie to FILENAME.\n"
" --bypass-security Disables meta protocol security, for debugging.\n"
" --bypass-security Disables meta protocol security, for debugging.\n"
- " -o
[HOST.]KEY=VALUE
Set global/host configuration value.\n"
+ " -o
, --option[HOST.]KEY=VALUE
Set global/host configuration value.\n"
" -R, --chroot chroot to NET dir at startup.\n"
" -U, --user=USER setuid to given USER at startup.\n" " --help Display this help and exit.\n"
" --version Output version information and exit.\n\n");
" -R, --chroot chroot to NET dir at startup.\n"
" -U, --user=USER setuid to given USER at startup.\n" " --help Display this help and exit.\n"
" --version Output version information and exit.\n\n");
@@
-161,7
+162,7
@@
static bool parse_options(int argc, char **argv) {
case 'L': /* no detach */
#ifndef HAVE_MLOCKALL
case 'L': /* no detach */
#ifndef HAVE_MLOCKALL
- logger(LOG_ERR, "%s not supported on this platform", "mlockall()");
+ logger(
DEBUG_ALWAYS,
LOG_ERR, "%s not supported on this platform", "mlockall()");
return false;
#else
do_mlock = true;
return false;
#else
do_mlock = true;
@@
-215,7
+216,7
@@
static bool parse_options(int argc, char **argv) {
break;
case 5: /* open control socket here */
break;
case 5: /* open control socket here */
-
controlcooki
ename = xstrdup(optarg);
+
pidfil
ename = xstrdup(optarg);
break;
case '?':
break;
case '?':
@@
-256,8
+257,8
@@
static void make_names(void) {
else
xasprintf(&confbase, "%s", installdir);
}
else
xasprintf(&confbase, "%s", installdir);
}
- if(!
controlcooki
ename)
- xasprintf(&
controlcookiename, "%s/cookie
", confbase);
+ if(!
pidfil
ename)
+ xasprintf(&
pidfilename, "%s/pid
", confbase);
}
RegCloseKey(key);
if(*installdir)
}
RegCloseKey(key);
if(*installdir)
@@
-268,36
+269,36
@@
static void make_names(void) {
if(!logfilename)
xasprintf(&logfilename, LOCALSTATEDIR "/log/%s.log", identname);
if(!logfilename)
xasprintf(&logfilename, LOCALSTATEDIR "/log/%s.log", identname);
- if(!
controlcooki
ename)
- xasprintf(&
controlcookiename, LOCALSTATEDIR "/run/%s.cookie
", identname);
+ if(!
pidfil
ename)
+ xasprintf(&
pidfilename, LOCALSTATEDIR "/run/%s.pid
", identname);
if(netname) {
if(!confbase)
xasprintf(&confbase, CONFDIR "/tinc/%s", netname);
else
if(netname) {
if(!confbase)
xasprintf(&confbase, CONFDIR "/tinc/%s", netname);
else
- logger(LOG_INFO, "Both netname and configuration directory given, using the latter...");
+ logger(
DEBUG_ALWAYS,
LOG_INFO, "Both netname and configuration directory given, using the latter...");
} else {
if(!confbase)
xasprintf(&confbase, CONFDIR "/tinc");
}
}
} else {
if(!confbase)
xasprintf(&confbase, CONFDIR "/tinc");
}
}
-static void free_names() {
+static void free_names(
void
) {
if (identname) free(identname);
if (netname) free(netname);
if (identname) free(identname);
if (netname) free(netname);
- if (
controlcookiename) free(controlcooki
ename);
+ if (
pidfilename) free(pidfil
ename);
if (logfilename) free(logfilename);
if (confbase) free(confbase);
}
if (logfilename) free(logfilename);
if (confbase) free(confbase);
}
-static bool drop_privs() {
+static bool drop_privs(
void
) {
#ifdef HAVE_MINGW
if (switchuser) {
#ifdef HAVE_MINGW
if (switchuser) {
- logger(LOG_ERR, "%s not supported on this platform", "-U");
+ logger(
DEBUG_ALWAYS,
LOG_ERR, "%s not supported on this platform", "-U");
return false;
}
if (do_chroot) {
return false;
}
if (do_chroot) {
- logger(LOG_ERR, "%s not supported on this platform", "-R");
+ logger(
DEBUG_ALWAYS,
LOG_ERR, "%s not supported on this platform", "-R");
return false;
}
#else
return false;
}
#else
@@
-305,13
+306,13
@@
static bool drop_privs() {
if (switchuser) {
struct passwd *pw = getpwnam(switchuser);
if (!pw) {
if (switchuser) {
struct passwd *pw = getpwnam(switchuser);
if (!pw) {
- logger(LOG_ERR, "unknown user `%s'", switchuser);
+ logger(
DEBUG_ALWAYS,
LOG_ERR, "unknown user `%s'", switchuser);
return false;
}
uid = pw->pw_uid;
if (initgroups(switchuser, pw->pw_gid) != 0 ||
setgid(pw->pw_gid) != 0) {
return false;
}
uid = pw->pw_uid;
if (initgroups(switchuser, pw->pw_gid) != 0 ||
setgid(pw->pw_gid) != 0) {
- logger(LOG_ERR, "System call `%s' failed: %s",
+ logger(
DEBUG_ALWAYS,
LOG_ERR, "System call `%s' failed: %s",
"initgroups", strerror(errno));
return false;
}
"initgroups", strerror(errno));
return false;
}
@@
-321,7
+322,7
@@
static bool drop_privs() {
if (do_chroot) {
tzset(); /* for proper timestamps in logs */
if (chroot(confbase) != 0 || chdir("/") != 0) {
if (do_chroot) {
tzset(); /* for proper timestamps in logs */
if (chroot(confbase) != 0 || chdir("/") != 0) {
- logger(LOG_ERR, "System call `%s' failed: %s",
+ logger(
DEBUG_ALWAYS,
LOG_ERR, "System call `%s' failed: %s",
"chroot", strerror(errno));
return false;
}
"chroot", strerror(errno));
return false;
}
@@
-330,7
+331,7
@@
static bool drop_privs() {
}
if (switchuser)
if (setuid(uid) != 0) {
}
if (switchuser)
if (setuid(uid) != 0) {
- logger(LOG_ERR, "System call `%s' failed: %s",
+ logger(
DEBUG_ALWAYS,
LOG_ERR, "System call `%s' failed: %s",
"setuid", strerror(errno));
return false;
}
"setuid", strerror(errno));
return false;
}
@@
-339,12
+340,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) {
@@
-356,9
+357,9
@@
int main(int argc, char **argv) {
make_names();
if(show_version) {
make_names();
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("%s version %s (built %s %s, protocol %d
.%d
)\n", PACKAGE,
+ VERSION, __DATE__, __TIME__, PROT_
MAJOR, PROT_MINOR
);
+ printf("Copyright (C) 1998-201
2
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"
@@
-374,7
+375,7
@@
int main(int argc, char **argv) {
#ifdef HAVE_MINGW
if(WSAStartup(MAKEWORD(2, 2), &wsa_state)) {
#ifdef HAVE_MINGW
if(WSAStartup(MAKEWORD(2, 2), &wsa_state)) {
- logger(LOG_ERR, "System call `%s' failed: %s", "WSAStartup", winerror(GetLastError()));
+ logger(
DEBUG_ALWAYS,
LOG_ERR, "System call `%s' failed: %s", "WSAStartup", winerror(GetLastError()));
return 1;
}
#endif
return 1;
}
#endif
@@
-382,7
+383,7
@@
int main(int argc, char **argv) {
openlogger("tinc", use_logfile?LOGMODE_FILE:LOGMODE_STDERR);
if(!event_init()) {
openlogger("tinc", use_logfile?LOGMODE_FILE:LOGMODE_STDERR);
if(!event_init()) {
- logger(LOG_ERR, "Error initializing libevent!");
+ logger(
DEBUG_ALWAYS,
LOG_ERR, "Error initializing libevent!");
return 1;
}
return 1;
}
@@
-400,7
+401,7
@@
int main(int argc, char **argv) {
#ifdef HAVE_LZO
if(lzo_init() != LZO_E_OK) {
#ifdef HAVE_LZO
if(lzo_init() != LZO_E_OK) {
- logger(LOG_ERR, "Error initializing LZO compressor!");
+ logger(
DEBUG_ALWAYS,
LOG_ERR, "Error initializing LZO compressor!");
return 1;
}
#endif
return 1;
}
#endif
@@
-416,6
+417,7
@@
int main2(int argc, char **argv) {
InitializeCriticalSection(&mutex);
EnterCriticalSection(&mutex);
#endif
InitializeCriticalSection(&mutex);
EnterCriticalSection(&mutex);
#endif
+ char *priority = NULL;
if(!detach())
return 1;
if(!detach())
return 1;
@@
-425,7
+427,7
@@
int main2(int argc, char **argv) {
* This has to be done after daemon()/fork() so it works for child.
* No need to do that in parent as it's very short-lived. */
if(do_mlock && mlockall(MCL_CURRENT | MCL_FUTURE) != 0) {
* This has to be done after daemon()/fork() so it works for child.
* No need to do that in parent as it's very short-lived. */
if(do_mlock && mlockall(MCL_CURRENT | MCL_FUTURE) != 0) {
- logger(LOG_ERR, "System call `%s' failed: %s", "mlockall",
+ logger(
DEBUG_ALWAYS,
LOG_ERR, "System call `%s' failed: %s", "mlockall",
strerror(errno));
return 1;
}
strerror(errno));
return 1;
}
@@
-434,10
+436,10
@@
int main2(int argc, char **argv) {
/* Setup sockets and open device. */
if(!setup_network())
/* Setup sockets and open device. */
if(!setup_network())
- goto end;
+ goto end
_nonet
;
if(!init_control())
if(!init_control())
-
return 1
;
+
goto end_nonet
;
/* Initiate all outgoing connections. */
/* Initiate all outgoing connections. */
@@
-445,29
+447,27
@@
int main2(int argc, char **argv) {
/* Change process priority */
/* Change process priority */
- char *priority = 0;
-
if(get_config_string(lookup_config(config_tree, "ProcessPriority"), &priority)) {
if(!strcasecmp(priority, "Normal")) {
if (setpriority(NORMAL_PRIORITY_CLASS) != 0) {
if(get_config_string(lookup_config(config_tree, "ProcessPriority"), &priority)) {
if(!strcasecmp(priority, "Normal")) {
if (setpriority(NORMAL_PRIORITY_CLASS) != 0) {
- logger(LOG_ERR, "System call `%s' failed: %s",
+ logger(
DEBUG_ALWAYS,
LOG_ERR, "System call `%s' failed: %s",
"setpriority", strerror(errno));
goto end;
}
} else if(!strcasecmp(priority, "Low")) {
if (setpriority(BELOW_NORMAL_PRIORITY_CLASS) != 0) {
"setpriority", strerror(errno));
goto end;
}
} else if(!strcasecmp(priority, "Low")) {
if (setpriority(BELOW_NORMAL_PRIORITY_CLASS) != 0) {
- logger(LOG_ERR, "System call `%s' failed: %s",
+ logger(
DEBUG_ALWAYS,
LOG_ERR, "System call `%s' failed: %s",
"setpriority", strerror(errno));
goto end;
}
} else if(!strcasecmp(priority, "High")) {
if (setpriority(HIGH_PRIORITY_CLASS) != 0) {
"setpriority", strerror(errno));
goto end;
}
} else if(!strcasecmp(priority, "High")) {
if (setpriority(HIGH_PRIORITY_CLASS) != 0) {
- logger(LOG_ERR, "System call `%s' failed: %s",
+ logger(
DEBUG_ALWAYS,
LOG_ERR, "System call `%s' failed: %s",
"setpriority", strerror(errno));
goto end;
}
} else {
"setpriority", strerror(errno));
goto end;
}
} else {
- logger(LOG_ERR, "Invalid priority `%s`!", priority);
+ logger(
DEBUG_ALWAYS,
LOG_ERR, "Invalid priority `%s`!", priority);
goto end;
}
}
goto end;
}
}
@@
-482,19
+482,23
@@
int main2(int argc, char **argv) {
/* Shutdown properly. */
/* Shutdown properly. */
- if
debug(
CONNECTIONS)
- d
ump_device
_stats();
+ if
(debug_level >= DEBUG_
CONNECTIONS)
+ d
evops.dump
_stats();
close_network_connections();
end:
close_network_connections();
end:
- logger(LOG_NOTICE, "Terminating");
-
exit_control();
exit_control();
+end_nonet:
+ logger(DEBUG_ALWAYS, LOG_NOTICE, "Terminating");
+
+ free(priority);
+
crypto_exit();
exit_configuration(&config_tree);
crypto_exit();
exit_configuration(&config_tree);
+ free(cmdline_conf);
free_names();
return status;
free_names();
return status;