Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/usr.sbin/rtadvd sync with latest kame.
details: https://anonhg.NetBSD.org/src/rev/5d2e47d30006
branches: trunk
changeset: 486495:5d2e47d30006
user: itojun <itojun%NetBSD.org@localhost>
date: Tue May 23 11:37:58 2000 +0000
description:
sync with latest kame.
- decrease warning level on missing rtadvd.conf (actually, the file
can be omitted)
- strict prototype
- gather stats better, emit stats on SIGUSR1 to /var/run
diffstat:
usr.sbin/rtadvd/Makefile | 4 +-
usr.sbin/rtadvd/advcap.c | 5 +-
usr.sbin/rtadvd/advcap.h | 3 +-
usr.sbin/rtadvd/config.c | 11 +-
usr.sbin/rtadvd/config.h | 3 +-
usr.sbin/rtadvd/dump.c | 207 ++++++++++++++++++++++++++++++++++++++++++
usr.sbin/rtadvd/dump.h | 33 ++++++
usr.sbin/rtadvd/if.c | 10 +-
usr.sbin/rtadvd/if.h | 3 +-
usr.sbin/rtadvd/pathnames.h | 3 +-
usr.sbin/rtadvd/rrenum.c | 3 +-
usr.sbin/rtadvd/rrenum.h | 3 +-
usr.sbin/rtadvd/rtadvd.8 | 28 ++++-
usr.sbin/rtadvd/rtadvd.c | 99 ++++++++++++++++---
usr.sbin/rtadvd/rtadvd.conf.5 | 52 +++++----
usr.sbin/rtadvd/rtadvd.h | 18 +++-
usr.sbin/rtadvd/timer.c | 5 +-
usr.sbin/rtadvd/timer.h | 3 +-
18 files changed, 417 insertions(+), 76 deletions(-)
diffs (truncated from 1049 to 300 lines):
diff -r f40b0ca2b5bc -r 5d2e47d30006 usr.sbin/rtadvd/Makefile
--- a/usr.sbin/rtadvd/Makefile Tue May 23 10:20:14 2000 +0000
+++ b/usr.sbin/rtadvd/Makefile Tue May 23 11:37:58 2000 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.2 1999/07/03 06:26:26 itojun Exp $
+# $NetBSD: Makefile,v 1.3 2000/05/23 11:37:58 itojun Exp $
PROG= rtadvd
-SRCS= rtadvd.c rrenum.c advcap.c if.c config.c timer.c
+SRCS= rtadvd.c rrenum.c advcap.c if.c config.c timer.c dump.c
CPPFLAGS+=-DINET6
MAN= rtadvd.8 rtadvd.conf.5
diff -r f40b0ca2b5bc -r 5d2e47d30006 usr.sbin/rtadvd/advcap.c
--- a/usr.sbin/rtadvd/advcap.c Tue May 23 10:20:14 2000 +0000
+++ b/usr.sbin/rtadvd/advcap.c Tue May 23 11:37:58 2000 +0000
@@ -1,4 +1,5 @@
-/* $NetBSD: advcap.c,v 1.4 2000/03/13 06:16:46 itojun Exp $ */
+/* $NetBSD: advcap.c,v 1.5 2000/05/23 11:37:58 itojun Exp $ */
+/* $KAME: advcap.c,v 1.4 2000/05/23 11:17:40 itojun Exp $ */
/*
* Copyright (c) 1983 The Regents of the University of California.
@@ -137,7 +138,7 @@
tf = open(RM = cp, O_RDONLY);
}
if (tf < 0) {
- syslog(LOG_WARNING,
+ syslog(LOG_INFO,
"<%s> open: %s", __FUNCTION__, strerror(errno));
return (-2);
}
diff -r f40b0ca2b5bc -r 5d2e47d30006 usr.sbin/rtadvd/advcap.h
--- a/usr.sbin/rtadvd/advcap.h Tue May 23 10:20:14 2000 +0000
+++ b/usr.sbin/rtadvd/advcap.h Tue May 23 11:37:58 2000 +0000
@@ -1,4 +1,5 @@
-/* $NetBSD: advcap.h,v 1.2 1999/07/06 13:02:09 itojun Exp $ */
+/* $NetBSD: advcap.h,v 1.3 2000/05/23 11:37:58 itojun Exp $ */
+/* $KAME: advcap.h,v 1.2 2000/05/16 13:34:13 itojun Exp $ */
/*
* Copyright (C) 1994,1995 by Andrey A. Chernov, Moscow, Russia.
diff -r f40b0ca2b5bc -r 5d2e47d30006 usr.sbin/rtadvd/config.c
--- a/usr.sbin/rtadvd/config.c Tue May 23 10:20:14 2000 +0000
+++ b/usr.sbin/rtadvd/config.c Tue May 23 11:37:58 2000 +0000
@@ -1,4 +1,5 @@
-/* $NetBSD: config.c,v 1.6 2000/03/13 06:16:46 itojun Exp $ */
+/* $NetBSD: config.c,v 1.7 2000/05/23 11:37:58 itojun Exp $ */
+/* $KAME: config.c,v 1.12 2000/05/22 22:23:07 itojun Exp $ */
/*
* Copyright (C) 1998 WIDE Project.
@@ -57,7 +58,7 @@
#include <errno.h>
#include <string.h>
#include <stdlib.h>
-#ifdef __NetBSD__
+#if defined(__NetBSD__) || defined(__OpenBSD__)
#include <search.h>
#endif
#include <unistd.h>
@@ -260,6 +261,8 @@
/* link into chain */
insque(pfx, &tmp->prefix);
+ pfx->origin = PREFIX_FROM_CONFIG;
+
makeentry(entbuf, i, "prefixlen", added);
MAYHAVE(val, entbuf, 64);
if (val < 0 || val > 128) {
@@ -438,6 +441,7 @@
pp->preflifetime = DEF_ADVPREFERREDLIFETIME;
pp->onlinkflg = 1;
pp->autoconfflg = 1;
+ pp->origin = PREFIX_FROM_KERNEL;
/* link into chain */
insque(pp, &rai->prefix);
@@ -493,6 +497,7 @@
prefix->preflifetime = ipr->ipr_pltime;
prefix->onlinkflg = ipr->ipr_raf_onlink;
prefix->autoconfflg = ipr->ipr_raf_auto;
+ prefix->origin = PREFIX_FROM_DYNAMIC;
insque(prefix, &rai->prefix);
@@ -520,7 +525,7 @@
/*
* Delete a prefix to the list of specified interface and reconstruct
* the outgoing packet.
- * The prefix must be in the list
+ * The prefix must be in the list.
*/
void
delete_prefix(struct rainfo *rai, struct prefix *prefix)
diff -r f40b0ca2b5bc -r 5d2e47d30006 usr.sbin/rtadvd/config.h
--- a/usr.sbin/rtadvd/config.h Tue May 23 10:20:14 2000 +0000
+++ b/usr.sbin/rtadvd/config.h Tue May 23 11:37:58 2000 +0000
@@ -1,4 +1,5 @@
-/* $NetBSD: config.h,v 1.3 2000/02/02 04:07:50 itojun Exp $ */
+/* $NetBSD: config.h,v 1.4 2000/05/23 11:37:58 itojun Exp $ */
+/* $KAME: config.h,v 1.3 2000/05/16 13:34:13 itojun Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, 1998, and 1999 WIDE Project.
diff -r f40b0ca2b5bc -r 5d2e47d30006 usr.sbin/rtadvd/dump.c
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usr.sbin/rtadvd/dump.c Tue May 23 11:37:58 2000 +0000
@@ -0,0 +1,207 @@
+/* $NetBSD: dump.c,v 1.1 2000/05/23 11:37:58 itojun Exp $ */
+/* $KAME: dump.c,v 1.10 2000/05/23 11:31:25 itojun Exp $ */
+
+/*
+ * Copyright (C) 2000 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 <sys/socket.h>
+
+#include <net/if.h>
+#if defined(__FreeBSD__) && __FreeBSD__ >= 3
+#include <net/if_var.h>
+#endif /* __FreeBSD__ >= 3 */
+#include <net/if_dl.h>
+
+#include <netinet/in.h>
+
+/* XXX: the following two are non-standard include files */
+#include <netinet6/in6_var.h>
+#include <netinet6/nd6.h>
+
+#include <arpa/inet.h>
+
+#include <time.h>
+#include <stdio.h>
+#include <stdarg.h>
+#include <syslog.h>
+#include <string.h>
+#include <errno.h>
+
+#include "rtadvd.h"
+#include "timer.h"
+#include "dump.h"
+
+static FILE *fp;
+
+extern struct rainfo *ralist;
+
+static char *ether_str __P((struct sockaddr_dl *));
+static void if_dump __P((void));
+
+#ifdef __FreeBSD__ /* XXX: see PORTABILITY */
+#define LONGLONG "%qu"
+#else
+#define LONGLONG "%llu"
+#endif
+
+static char *
+ether_str(sdl)
+ struct sockaddr_dl *sdl;
+{
+ static char ebuf[32];
+ u_char *cp;
+
+ if (sdl->sdl_alen && sdl->sdl_alen > 5) {
+ cp = (u_char *)LLADDR(sdl);
+ sprintf(ebuf, "%x:%x:%x:%x:%x:%x",
+ cp[0], cp[1], cp[2], cp[3], cp[4], cp[5]);
+ }
+ else {
+ sprintf(ebuf, "NONE");
+ }
+
+ return(ebuf);
+}
+
+static void
+if_dump()
+{
+ struct rainfo *rai;
+ struct prefix *pfx;
+ char prefixbuf[INET6_ADDRSTRLEN];
+ int first;
+
+ for (rai = ralist; rai; rai = rai->next) {
+ fprintf(fp, "%s:\n", rai->ifname);
+
+ /* control information */
+ if (rai->lastsent.tv_sec) {
+ /* note that ctime() appends CR by itself */
+ fprintf(fp, " Last RA sent: %s",
+ ctime((time_t *)&rai->lastsent.tv_sec));
+ }
+ if (rai->timer) {
+ fprintf(fp, " Next RA will be sent: %s",
+ ctime((time_t *)&rai->timer->tm.tv_sec));
+ }
+ fprintf(fp, " waits: %d, initcount: %d\n",
+ rai->waiting, rai->initcounter);
+
+ /* statistics */
+ fprintf(fp,
+ " statistics: RA(out/in/inconsistent): "
+ LONGLONG "/" LONGLONG "/" LONGLONG ", ",
+ (unsigned long long)rai->raoutput,
+ (unsigned long long)rai->rainput,
+ (unsigned long long)rai->rainconsistent);
+ fprintf(fp, "RS(input): " LONGLONG "\n",
+ (unsigned long long)rai->rsinput);
+
+ /* interface information */
+ if (rai->advlinkopt)
+ fprintf(fp, " Link-layer address: %s\n",
+ ether_str(rai->sdl));
+ fprintf(fp, " MTU: %d\n", rai->phymtu);
+
+ /* Router configuration variables */
+ fprintf(fp,
+ " DefaultLifetime: %d, MaxAdvInterval: %d, "
+ "MinAdvInterval: %d\n",
+ rai->lifetime, rai->maxinterval, rai->mininterval);
+ fprintf(fp, " Flags: %s%s%s MTU: %d\n",
+ rai->managedflg ? "M" : "", rai->otherflg ? "O" : "",
+#ifdef MIP6
+ rai->haflg ? "H" :
+#endif
+ "", rai->linkmtu);
+ fprintf(fp, " ReachableTime: %d, RetransTimer: %d, "
+ "CurHopLimit: %d\n", rai->reachabletime,
+ rai->retranstimer, rai->hoplimit);
+#ifdef MIP6
+ fprintf(fp, " HAPreference: %d, HALifetime: %d\n",
+ rai->hapref, rai->hatime);
+#endif
+
+ for (first = 1, pfx = rai->prefix.next; pfx != &rai->prefix;
+ pfx = pfx->next) {
+ if (first) {
+ fprintf(fp, " Prefixes:\n");
+ first = 0;
+ }
+ fprintf(fp, " %s/%d(",
+ inet_ntop(AF_INET6, &pfx->prefix,
+ prefixbuf, sizeof(prefixbuf)),
+ pfx->prefixlen);
+ switch(pfx->origin) {
+ case PREFIX_FROM_KERNEL:
+ fprintf(fp, "KERNEL, ");
+ break;
+ case PREFIX_FROM_CONFIG:
+ fprintf(fp, "CONFIG, ");
+ break;
+ case PREFIX_FROM_DYNAMIC:
+ fprintf(fp, "DYNAMIC, ");
+ break;
+ }
+ if (pfx->validlifetime == ND6_INFINITE_LIFETIME)
+ fprintf(fp, "vltime: infinity, ");
+ else
+ fprintf(fp, "vltime: %ld, ",
+ (long)pfx->validlifetime);
+ if (pfx->preflifetime == ND6_INFINITE_LIFETIME)
+ fprintf(fp, "pltime: infinity, ");
+ else
+ fprintf(fp, "pltime: %ld, ",
+ (long)pfx->preflifetime);
+ fprintf(fp, "flags: %s%s%s",
+ pfx->onlinkflg ? "L" : "",
+ pfx->autoconfflg ? "A" : "",
+#ifdef MIP6
+ pfx->routeraddr ? "R" :
+#endif
+ "");
+ fprintf(fp, ")\n");
+ }
+ }
Home |
Main Index |
Thread Index |
Old Index