From: Hans Dedecker <dedeckeh@gmail.com>
Date: Thu, 1 Jun 2017 12:19:42 +0000 (+0200)
Subject: 464xlat: rework process id write logic
X-Git-Url: http://git.openwrt.org/?p=feed%2Frouting.git;a=commitdiff_plain;h=04843f42349344e43c581e6236699d9b2a1c4ac6

464xlat: rework process id write logic

Write the process id in the pid file immediately after the 464xlat pid file has
been openend. Before the process id was written when the parent process exits
leaving a window where no valid process id was in place in the 464xlat pid file.
This lead to issues if the 464xlat utility was launched to terminate a running
464xlat utility as it could possibly terminate a random process.
If the parent process exits the pid file is updated with the process id of the
forked 464xlat utility.
Also rework the signal handling of SIGTERM so the running 464xlat utility is
correctly terminated.

Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
---

diff --git a/nat46/src/464xlatcfg.c b/nat46/src/464xlatcfg.c
index f184616..0f9ad31 100644
--- a/nat46/src/464xlatcfg.c
+++ b/nat46/src/464xlatcfg.c
@@ -1,6 +1,7 @@
 /* 464xlatcfg.c
  *
  * Copyright (c) 2015 Steven Barth <cyrus@openwrt.org>
+ * Copyright (c) 2017 Hans Dedecker <dedeckeh@gmail.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2
@@ -40,8 +41,9 @@ int main(int argc, const char *argv[])
 	snprintf(buf, sizeof(buf), "/var/run/%s.pid", argv[1]);
 	FILE *fp = fopen(buf, "r");
 	if (fp) {
-		fscanf(fp, "%d", &pid);
-		kill(pid, SIGTERM);
+		if (fscanf(fp, "%d", &pid) == 1)
+			kill(pid, SIGTERM);
+
 		unlink(buf);
 		fclose(fp);
 	}
@@ -52,7 +54,9 @@ int main(int argc, const char *argv[])
 	if (!argv[3] || !argv[4] || !(fp = fopen(buf, "wx")))
 		return 1;
 
-	signal(SIGTERM, sighandler);
+	signal(SIGTERM, SIG_DFL);
+	setvbuf(fp, NULL, _IOLBF, 0);
+	fprintf(fp, "%d\n", getpid());
 
 	prefix[sizeof(prefix) - 1] = 0;
 	strncpy(prefix, argv[3], sizeof(prefix) - 1);
@@ -133,6 +137,7 @@ int main(int argc, const char *argv[])
 		fclose(stderr);
 		chdir("/");
 		setsid();
+		signal(SIGTERM, sighandler);
 		pause();
 
 		nat46 = fopen("/proc/net/nat46/control", "w");
@@ -141,6 +146,7 @@ int main(int argc, const char *argv[])
 			fclose(nat46);
 		}
 	} else {
+		rewind(fp);
 		fprintf(fp, "%d\n", pid);
 	}