projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Ensure all SPTPS functions are prefixed with sptps_.
[tinc]
/
src
/
tincd.c
diff --git
a/src/tincd.c
b/src/tincd.c
index
23845ff
..
7970bcc
100644
(file)
--- a/
src/tincd.c
+++ b/
src/tincd.c
@@
-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");
@@
-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,8
+269,8
@@
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)
if(netname) {
if(!confbase)
@@
-285,7
+286,7
@@
static void make_names(void) {
static void free_names(void) {
if (identname) free(identname);
if (netname) free(netname);
static void free_names(void) {
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);
}
@@
-356,8
+357,8
@@
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("%s version %s (built %s %s, protocol %d
.%d
)\n", PACKAGE,
+ VERSION, __DATE__, __TIME__, PROT_
MAJOR, PROT_MINOR
);
printf("Copyright (C) 1998-2011 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"
printf("Copyright (C) 1998-2011 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"
@@
-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;
@@
-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,8
+447,6
@@
int main2(int argc, char **argv) {
/* Change process priority */
/* Change process priority */
- char *priority = NULL;
-
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) {
@@
-483,18
+483,22
@@
int main2(int argc, char **argv) {
/* Shutdown properly. */
ifdebug(CONNECTIONS)
/* Shutdown properly. */
ifdebug(CONNECTIONS)
- d
ump_device
_stats();
+ d
evops.dump
_stats();
close_network_connections();
end:
close_network_connections();
end:
+ exit_control();
+
+end_nonet:
logger(LOG_NOTICE, "Terminating");
logger(LOG_NOTICE, "Terminating");
-
exit_control(
);
+
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;