summaryrefslogtreecommitdiffstats
path: root/sbin/routed
diff options
context:
space:
mode:
authorwollman <wollman@FreeBSD.org>1996-09-16 17:04:22 +0000
committerwollman <wollman@FreeBSD.org>1996-09-16 17:04:22 +0000
commit8554e18558853e6f6d8f38fc97f56b3ddfc7418a (patch)
tree4766cc5c5fa9f69e4ec8193b5e7b659a3464ef4b /sbin/routed
parent5dd2c963ce7fe11b20171b5fc8e2398c1303a926 (diff)
downloadFreeBSD-src-8554e18558853e6f6d8f38fc97f56b3ddfc7418a.zip
FreeBSD-src-8554e18558853e6f6d8f38fc97f56b3ddfc7418a.tar.gz
Layer on FreeBSD local changes from old routed.
Diffstat (limited to 'sbin/routed')
-rw-r--r--sbin/routed/Makefile18
-rw-r--r--sbin/routed/Makefile.inc1
-rw-r--r--sbin/routed/defs.h5
-rw-r--r--sbin/routed/main.c4
-rw-r--r--sbin/routed/routed.82
-rw-r--r--sbin/routed/rtquery/Makefile6
-rw-r--r--sbin/routed/table.c9
7 files changed, 20 insertions, 25 deletions
diff --git a/sbin/routed/Makefile b/sbin/routed/Makefile
index c567e68e..b17fd70 100644
--- a/sbin/routed/Makefile
+++ b/sbin/routed/Makefile
@@ -1,22 +1,10 @@
-# @(#)Makefile 8.1 (Berkeley) 6/19/93
+# From: @(#)Makefile 8.1 (Berkeley) 6/19/93
+# $Id$
PROG= routed
SRCS= if.c input.c main.c output.c parms.c radix.c rdisc.c table.c trace.c
-MAN8= routed.0
+MAN8= routed.8
SUBDIR= rtquery
-DPADD= ${LIBCOMPAT}
-LDADD= -lcompat
#COPTS= -g -DDEBUG -Wall
.include <bsd.prog.mk>
-
-.if (${MACHINE} == "vax")
-# The following can be deleted where not appropriate to use the kernel's
-# inline code expansions.
-INLINE= /sys/vax/inline/obj/inline
-C2= /usr/libexec/c2
-.c.o:
- ${CC} -S ${CFLAGS} ${.CURDIR}/${.PREFIX}.c
- @${C2} ${.PREFIX}.s | ${INLINE} | ${AS} -o ${.PREFIX}.o
- @rm -f ${.PREFIX}.s
-.endif
diff --git a/sbin/routed/Makefile.inc b/sbin/routed/Makefile.inc
new file mode 100644
index 0000000..10fa13f
--- /dev/null
+++ b/sbin/routed/Makefile.inc
@@ -0,0 +1 @@
+.include "../../Makefile.inc"
diff --git a/sbin/routed/defs.h b/sbin/routed/defs.h
index 452b71a..8dcf6ae 100644
--- a/sbin/routed/defs.h
+++ b/sbin/routed/defs.h
@@ -31,12 +31,11 @@
* SUCH DAMAGE.
*
* @(#)defs.h 8.1 (Berkeley) 6/5/93
- *
- * $NetBSD$
+ * $Id$
*/
#ifndef __NetBSD__
-#ident "$Revision: 1.16 $"
+#ident "$Revision: 1.1.1.1 $"
#endif
/* Definitions for RIPv2 routing process.
diff --git a/sbin/routed/main.c b/sbin/routed/main.c
index 84a7fac..4c353ae 100644
--- a/sbin/routed/main.c
+++ b/sbin/routed/main.c
@@ -39,7 +39,7 @@ static char sccsid[] = "@(#)main.c 8.1 (Berkeley) 6/5/93";
#elif defined(__NetBSD__)
static char rcsid[] = "$NetBSD$";
#endif
-#ident "$Revision: 1.17 $"
+#ident "$Revision: 1.1.1.1 $"
#include "defs.h"
#include "pathnames.h"
@@ -119,7 +119,7 @@ main(int argc,
(void)gethostname(myname, sizeof(myname)-1);
(void)gethost(myname, &myaddr);
- while ((n = getopt(argc, argv, "sqdghmpAtT:F:P:")) != EOF) {
+ while ((n = getopt(argc, argv, "sqdghmAtT:F:P:")) != EOF) {
switch (n) {
case 's':
supplier = 1;
diff --git a/sbin/routed/routed.8 b/sbin/routed/routed.8
index de3abf3..4d203a7 100644
--- a/sbin/routed/routed.8
+++ b/sbin/routed/routed.8
@@ -39,7 +39,7 @@
.Nd network RIP and router discovery routing daemon
.Sh SYNOPSIS
.Nm
-.Op Fl sqdghmpAt
+.Op Fl sqdghmAt
.Op Fl T Ar tracefile
.Oo
.Fl F
diff --git a/sbin/routed/rtquery/Makefile b/sbin/routed/rtquery/Makefile
index f9aee5c..e748e73 100644
--- a/sbin/routed/rtquery/Makefile
+++ b/sbin/routed/rtquery/Makefile
@@ -1,8 +1,8 @@
-# @(#)Makefile 8.1 (Berkeley) 6/5/93
+# From: @(#)Makefile 8.1 (Berkeley) 6/5/93
+# $Id$
PROG= rtquery
-MAN8= rtquery.0
+MAN8= rtquery.8
#COPTS= -g -DDEBUG -Wall
-.include "../../Makefile.inc"
.include <bsd.prog.mk>
diff --git a/sbin/routed/table.c b/sbin/routed/table.c
index 6ad97f0..cef0f90 100644
--- a/sbin/routed/table.c
+++ b/sbin/routed/table.c
@@ -36,7 +36,7 @@ static char sccsid[] = "@(#)tables.c 8.1 (Berkeley) 6/5/93";
#elif defined(__NetBSD__)
static char rcsid[] = "$NetBSD$";
#endif
-#ident "$Revision: 1.25 $"
+#ident "$Revision: 1.1.1.1 $"
#include "defs.h"
@@ -1570,8 +1570,15 @@ rtadd(naddr dst,
if (0 == rhead->rnh_addaddr(&rt->rt_dst_sock, &mask_sock,
rhead, rt->rt_nodes)) {
+/*
+ * This will happen if RIP1 and RIP2 routeds talk to one another and
+ * there are variable subnets. This is only good for filling up your
+ * syslog. -jkh
+ */
+#if 0
msglog("rnh_addaddr() failed for %s mask=%#x",
naddr_ntoa(dst), mask);
+#endif
}
}
OpenPOWER on IntegriCloud