summaryrefslogtreecommitdiff
path: root/sbin
diff options
context:
space:
mode:
authorAngelos D. Keromytis <angelos@cvs.openbsd.org>1997-07-13 23:12:10 +0000
committerAngelos D. Keromytis <angelos@cvs.openbsd.org>1997-07-13 23:12:10 +0000
commitb9b4749e03c5faa0c53f25e0e907f4fcc637e11c (patch)
treec86e34bfc8adbf166ab1741d1b867955dbf99257 /sbin
parent633c54df25068ea5ea1efc87233be815e87d708d (diff)
Added -encap flag for flushing, added a missing break; in flushing X25
entries.
Diffstat (limited to 'sbin')
-rw-r--r--sbin/route/keywords.c1
-rw-r--r--sbin/route/keywords.h1
-rw-r--r--sbin/route/route.83
-rw-r--r--sbin/route/route.c8
4 files changed, 10 insertions, 3 deletions
diff --git a/sbin/route/keywords.c b/sbin/route/keywords.c
index d025dd97798..64d0a42f6ea 100644
--- a/sbin/route/keywords.c
+++ b/sbin/route/keywords.c
@@ -51,6 +51,7 @@ struct keytab keywords[] = {
{"x25", K_X25},
{"xns", K_XNS},
{"xresolve", K_XRESOLVE},
+ {"encap", K_ENCAP},
{0, 0}
};
diff --git a/sbin/route/keywords.h b/sbin/route/keywords.h
index 764f8bd8d63..18532e05136 100644
--- a/sbin/route/keywords.h
+++ b/sbin/route/keywords.h
@@ -53,3 +53,4 @@ struct keytab {
#define K_X25 43
#define K_XNS 44
#define K_XRESOLVE 45
+#define K_ENCAP 46
diff --git a/sbin/route/route.8 b/sbin/route/route.8
index d8776a4379c..ab71f3dfc4d 100644
--- a/sbin/route/route.8
+++ b/sbin/route/route.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: route.8,v 1.5 1997/04/10 10:09:01 deraadt Exp $
+.\" $OpenBSD: route.8,v 1.6 1997/07/13 23:12:08 angelos Exp $
.\" $NetBSD: route.8,v 1.6 1995/03/18 15:00:13 cgd Exp $
.\"
.\" Copyright (c) 1983, 1991, 1993
@@ -123,6 +123,7 @@ will ``flush'' the routing tables of all gateway entries.
When the address family may is specified by any of the
.Fl osi ,
.Fl xns ,
+.Fl encap ,
or
.Fl inet
modifiers, only routes having destinations with addresses in the
diff --git a/sbin/route/route.c b/sbin/route/route.c
index cc24e47a1ed..1742ddf22ab 100644
--- a/sbin/route/route.c
+++ b/sbin/route/route.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: route.c,v 1.22 1997/06/24 04:05:38 millert Exp $ */
+/* $OpenBSD: route.c,v 1.23 1997/07/13 23:12:09 angelos Exp $ */
/* $NetBSD: route.c,v 1.16 1996/04/15 18:27:05 cgd Exp $ */
/*
@@ -44,7 +44,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)route.c 8.3 (Berkeley) 3/19/94";
#else
-static char rcsid[] = "$OpenBSD: route.c,v 1.22 1997/06/24 04:05:38 millert Exp $";
+static char rcsid[] = "$OpenBSD: route.c,v 1.23 1997/07/13 23:12:09 angelos Exp $";
#endif
#endif /* not lint */
@@ -259,8 +259,12 @@ flushroutes(argc, argv)
case K_OSI:
af = AF_ISO;
break;
+ case K_ENCAP:
+ af = AF_ENCAP;
+ break;
case K_X25:
af = AF_CCITT;
+ break;
default:
goto bad;
} else