added USR1 signal handler to dump rtsold's internal status

kame/kame/rtsold/Makefile

@@ -18,7 +18,7 @@
 
 BINDIR=	$(PREFIX)/sbin
 PROG=	rtsold
-SRCS=	rtsold.c rtsol.c if.c probe.c
+SRCS=	rtsold.c rtsol.c if.c probe.c dump.c
 
 CC=	gcc
 

kame/kame/rtsold/dump.c

@@ -0,0 +1,127 @@
+/*
+ * Copyright (C) 1999 WIDE Project.
+ * All rights reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the project nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include <sys/types.h>
+
+#include <netinet/in.h>
+#include <netinet/icmp6.h>
+
+#include <syslog.h>
+#include <time.h>
+#include <stdio.h>
+#include <errno.h>
+
+#include "rtsold.h"
+
+static FILE *fp;
+
+extern struct ifinfo *iflist;
+
+static char *sec2str __P((time_t));
+char *ifstatstr[] = {"IDLE", "DELAY", "PROBE", "DOWN", "TENTATIVE"};
+
+static void
+dump_interface_status()
+{
+	struct ifinfo *ifinfo;
+	struct timeval now;
+
+	gettimeofday(&now, NULL);
+
+	for (ifinfo = iflist; ifinfo; ifinfo = ifinfo->next) {
+		fprintf(fp, "Interface %s\n", ifinfo->ifname);
+		fprintf(fp, "  probe interval: ");
+		if (ifinfo->probeinterval) {
+			fprintf(fp, "%d\n", ifinfo->probeinterval);
+			fprintf(fp, "  probe timer: %d\n", ifinfo->probetimer);
+		}
+		else {
+			fprintf(fp, "infinity\n");
+			fprintf(fp, "  no probe timer\n");
+		}
+		fprintf(fp, "  interface status: %s\n",
+			ifinfo->active > 0 ? "active" : "inactive");
+		fprintf(fp, "  rtsold status: %s\n", ifstatstr[ifinfo->state]);
+		fprintf(fp, "  carrier detection: %s\n",
+			ifinfo->mediareqok ? "available" : "unavailabe");
+		fprintf(fp, "  probes: %d, dadcount = %d\n",
+			ifinfo->probes, ifinfo->dadcount);
+		fprintf(fp, "  timer: interval=%d:%d, expire=%s\n",
+			(int)ifinfo->timer.tv_sec, (int)ifinfo->timer.tv_usec,
+			(ifinfo->expire.tv_sec < now.tv_sec) ? "expired"
+			: sec2str(ifinfo->expire.tv_sec - now.tv_sec));
+		fprintf(fp, "  number of valid RAs: %d\n", ifinfo->racnt);
+	}
+}
+
+void
+rtsold_dump_file(dumpfile)
+	char *dumpfile;
+{
+	if ((fp = fopen(dumpfile, "w")) == NULL) {
+		warnmsg(LOG_WARNING, __FUNCTION__, "open a dump file(%s)",
+			dumpfile, strerror(errno));
+		return;
+	}
+
+	dump_interface_status();
+
+	fclose(fp);
+}
+
+static char *
+sec2str(total)
+	time_t total;
+{
+	static char result[256];
+	int days, hours, mins, secs;
+	int first = 1;
+	char *p = result;
+
+	days = total / 3600 / 24;
+	hours = (total / 3600) % 24;
+	mins = (total / 60) % 60;
+	secs = total % 60;
+
+	if (days) {
+		first = 0;
+		p += sprintf(p, "%dd", days);
+	}
+	if (!first || hours) {
+		first = 0;
+		p += sprintf(p, "%dh", hours);
+	}
+	if (!first || mins) {
+		first = 0;
+		p += sprintf(p, "%dm", mins);
+	}
+	sprintf(p, "%ds", secs);
+
+	return(result);
+}

kame/kame/rtsold/rtsold.c

@@ -35,11 +35,13 @@
 #include <netinet/in.h>
 #include <netinet/icmp6.h>
 
+#include <signal.h>
 #include <unistd.h>
 #include <syslog.h>
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
+#include <errno.h>
 #include <err.h>
 #include <stdarg.h>
 #include "rtsold.h"
@@ -72,16 +74,23 @@ static int fflag = 0;
 /* a == b */
 #define TIMEVAL_EQ(a, b) (((a).tv_sec==(b).tv_sec) && ((a).tv_usec==(b).tv_usec))
 
+int main __P((int argc, char *argv[]));
+
 /* static variables and functions */
 static int mobile_node = 0;
-int main __P((int argc, char *argv[]));
+static int do_dump;
+static char *dumpfilename = "/var/tmp/rtsold.dump"; /* XXX: should be configurable */
+static char *pidfilename = "/var/run/rtsold.pid"; /* should be configurable */
+
 static int ifconfig __P((char *ifname));
 static int make_packet __P((struct ifinfo *ifinfo));
 static struct timeval *rtsol_check_timer __P((void));
 static void TIMEVAL_ADD __P((struct timeval *a, struct timeval *b,
 			     struct timeval *result));
 static void TIMEVAL_SUB __P((struct timeval *a, struct timeval *b,
 			     struct timeval *result));
+
+static void rtsold_set_dump_file __P(());
 static void usage __P((char *progname));
 
 int
@@ -157,6 +166,10 @@ main(argc, argv)
 	if (!getinet6sysctl(IPV6CTL_ACCEPT_RTADV))
 		warnx("kernel is configured not to accept RAs");
 
+	/* initialization to dump internal status to a file */
+	if (signal(SIGUSR1, (void *)rtsold_set_dump_file) < 0)
+		errx(1, "failed to set signal for dump status");
+
 	/* configuration per interface */
 	if (ifinit())
 		errx(1, "failed to initilizatoin interfaces");
@@ -177,13 +190,33 @@ main(argc, argv)
 	if (!fflag)
 		daemon(0, 0);		/* act as a daemon */
 
+	/* dump the current pid */
+	if (!once) {
+		pid_t pid = getpid();
+		FILE *fp;
+
+		if ((fp = fopen(pidfilename, "w")) == NULL)
+			warnmsg(LOG_ERR, __FUNCTION__,
+				"failed to open a log file(%s)",
+				pidfilename, strerror(errno));
+		else {
+			fprintf(fp, "%d\n", pid);
+			fclose(fp);
+		}
+	}
+
 	FD_ZERO(&fdset);
 	FD_SET(s, &fdset);
 	while (1) {		/* main loop */
 		extern int errno;
 		int e;
 		struct fd_set select_fd = fdset;
 
+		if (do_dump) {	/* SIGUSR1 */
+			do_dump = 0;
+			rtsold_dump_file(dumpfilename);
+		}
+
 		timeout = rtsol_check_timer();
 
 		if (once) {
@@ -528,7 +561,7 @@ TIMEVAL_ADD(struct timeval *a, struct timeval *b, struct timeval *result)
  * result = a - b
  * XXX: this function assumes that a >= b.
  */
-static void
+void
 TIMEVAL_SUB(struct timeval *a, struct timeval *b, struct timeval *result)
 {
 	long l;
@@ -543,6 +576,12 @@ TIMEVAL_SUB(struct timeval *a, struct timeval *b, struct timeval *result)
 	}
 }
 
+static void
+rtsold_set_dump_file()
+{
+	do_dump = 1;
+}
+
 static void
 usage(char *progname)
 {

kame/kame/rtsold/rtsold.h

@@ -83,3 +83,6 @@ extern void rtsol_input __P((int s));
 /* probe.c */
 extern int probe_init __P((void));
 extern void defrouter_probe __P((int ifindex));
+
+/* dump.c */
+extern void rtsold_dump_file __P((char *));