X-Git-Url: https://www.tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Ftincd.c;h=8401b2090a3ef3975501545383f56a46bd94f164;hb=9708bbfa8e3094de8932a30b1d24c661558d8a03;hp=23845fff1f2942ada86b7e229c96ab307adf2347;hpb=79e9a4f743b7b59fed968575f6b36171cf4a0063;p=tinc

diff --git a/src/tincd.c b/src/tincd.c
index 23845fff..8401b209 100644
--- 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 *controlcookiename = NULL;
+char *pidfilename = NULL;
 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'},
@@ -106,7 +106,7 @@ static struct option const long_options[] = {
 	{"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},
 	{NULL, 0, NULL, 0}
 };
 
@@ -122,18 +122,18 @@ static void usage(bool status) {
 				program_name);
 	else {
 		printf("Usage: %s [option]...\n\n", program_name);
-		printf(	"  -c, --config=DIR              Read configuration options from DIR.\n"
-				"  -D, --no-detach               Don't fork and detach.\n"
-				"  -d, --debug[=LEVEL]           Increase debug level or set it to LEVEL.\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"
-				"      --bypass-security         Disables meta protocol security, for debugging.\n"
-				"  -o [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");
+		printf(	"  -c, --config=DIR          Read configuration options from DIR.\n"
+				"  -D, --no-detach           Don't fork and detach.\n"
+				"  -d, --debug[=LEVEL]       Increase debug level or set it to LEVEL.\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"
+				"      --pidfile=FILENAME    Write PID and control socket cookie to FILENAME.\n"
+				"      --bypass-security     Disables meta protocol security, for debugging.\n"
+				"  -o [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");
 		printf("Report bugs to tinc@tinc-vpn.org.\n");
 	}
 }
@@ -215,7 +215,7 @@ static bool parse_options(int argc, char **argv) {
 				break;
 
 			case 5:					/* open control socket here */
-				controlcookiename = xstrdup(optarg);
+				pidfilename = xstrdup(optarg);
 				break;
 
 			case '?':
@@ -256,8 +256,8 @@ static void make_names(void) {
 				else
 					xasprintf(&confbase, "%s", installdir);
 			}
-			if(!controlcookiename)
-				xasprintf(&controlcookiename, "%s/cookie", confbase);
+			if(!pidfilename)
+				xasprintf(&pidfilename, "%s/pid", confbase);
 		}
 		RegCloseKey(key);
 		if(*installdir)
@@ -268,8 +268,8 @@ static void make_names(void) {
 	if(!logfilename)
 		xasprintf(&logfilename, LOCALSTATEDIR "/log/%s.log", identname);
 
-	if(!controlcookiename)
-		xasprintf(&controlcookiename, LOCALSTATEDIR "/run/%s.cookie", identname);
+	if(!pidfilename)
+		xasprintf(&pidfilename, LOCALSTATEDIR "/run/%s.pid", identname);
 
 	if(netname) {
 		if(!confbase)
@@ -285,7 +285,7 @@ static void make_names(void) {
 static void free_names(void) {
 	if (identname) free(identname);
 	if (netname) free(netname);
-	if (controlcookiename) free(controlcookiename);
+	if (pidfilename) free(pidfilename);
 	if (logfilename) free(logfilename);
 	if (confbase) free(confbase);
 }
@@ -356,8 +356,8 @@ int main(int argc, char **argv) {
 	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"
@@ -434,10 +434,10 @@ int main2(int argc, char **argv) {
 	/* Setup sockets and open device. */
 
 	if(!setup_network())
-		goto end;
+		goto end_nonet;
 
 	if(!init_control())
-		return 1;
+		goto end_nonet;
 
 	/* Initiate all outgoing connections. */
 
@@ -488,10 +488,11 @@ int main2(int argc, char **argv) {
 	close_network_connections();
 
 end:
-	logger(LOG_NOTICE, "Terminating");
-
 	exit_control();
 
+end_nonet:
+	logger(LOG_NOTICE, "Terminating");
+
 	crypto_exit();
 
 	exit_configuration(&config_tree);