summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sbin/route/route.c4
-rw-r--r--sbin/route/show.c3
-rw-r--r--usr.bin/netstat/netstat.15
-rw-r--r--usr.bin/netstat/show.c3
4 files changed, 9 insertions, 6 deletions
diff --git a/sbin/route/route.c b/sbin/route/route.c
index 88af3f94a6e..fcb83dbdf6a 100644
--- a/sbin/route/route.c
+++ b/sbin/route/route.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: route.c,v 1.134 2009/06/25 15:42:24 claudio Exp $ */
+/* $OpenBSD: route.c,v 1.135 2009/06/27 11:35:57 michele Exp $ */
/* $NetBSD: route.c,v 1.16 1996/04/15 18:27:05 cgd Exp $ */
/*
@@ -1203,7 +1203,7 @@ char metricnames[] =
"\011priority\010rttvar\7rtt\6ssthresh\5sendpipe\4recvpipe\3expire\2hopcount\1mtu";
char routeflags[] =
"\1UP\2GATEWAY\3HOST\4REJECT\5DYNAMIC\6MODIFIED\7DONE\010MASK_PRESENT\011CLONING"
-"\012XRESOLVE\013LLINFO\014STATIC\015BLACKHOLE\016PROTO3\017PROTO2\020PROTO1\021CLONED\022SOURCE\023MPATH\024JUMBO";
+"\012XRESOLVE\013LLINFO\014STATIC\015BLACKHOLE\016PROTO3\017PROTO2\020PROTO1\021CLONED\022SOURCE\023MPATH\024JUMBO\025MPLS";
char ifnetflags[] =
"\1UP\2BROADCAST\3DEBUG\4LOOPBACK\5PTP\6NOTRAILERS\7RUNNING\010NOARP\011PPROMISC"
"\012ALLMULTI\013OACTIVE\014SIMPLEX\015LINK0\016LINK1\017LINK2\020MULTICAST";
diff --git a/sbin/route/show.c b/sbin/route/show.c
index 68a6dad167b..9ccb0662ccd 100644
--- a/sbin/route/show.c
+++ b/sbin/route/show.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: show.c,v 1.79 2009/05/31 18:02:28 claudio Exp $ */
+/* $OpenBSD: show.c,v 1.80 2009/06/27 11:35:57 michele Exp $ */
/* $NetBSD: show.c,v 1.1 1996/11/15 18:01:41 gwr Exp $ */
/*
@@ -100,6 +100,7 @@ static const struct bits bits[] = {
{ RTF_CLONED, 'c' },
{ RTF_JUMBO, 'J' },
{ RTF_MPATH, 'P' },
+ { RTF_MPLS, 'T' },
{ 0 }
};
diff --git a/usr.bin/netstat/netstat.1 b/usr.bin/netstat/netstat.1
index 6407e19d2d8..3c0100c47ad 100644
--- a/usr.bin/netstat/netstat.1
+++ b/usr.bin/netstat/netstat.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: netstat.1,v 1.55 2009/06/04 18:59:34 mk Exp $
+.\" $OpenBSD: netstat.1,v 1.56 2009/06/27 11:35:57 michele Exp $
.\" $NetBSD: netstat.1,v 1.11 1995/10/03 21:42:43 thorpej Exp $
.\"
.\" Copyright (c) 1983, 1990, 1992, 1993
@@ -30,7 +30,7 @@
.\"
.\" from: @(#)netstat.1 8.8 (Berkeley) 4/18/94
.\"
-.Dd $Mdocdate: June 4 2009 $
+.Dd $Mdocdate: June 27 2009 $
.Dt NETSTAT 1
.Os
.Sh NAME
@@ -341,6 +341,7 @@ M RTF_MODIFIED Modified dynamically (by redirect).
P RTF_MPATH Multipath route.
R RTF_REJECT Host or net unreachable.
S RTF_STATIC Manually added.
+T RTF_MPLS MPLS route.
U RTF_UP Route usable.
X RTF_XRESOLVE External daemon translates proto to link address.
.El
diff --git a/usr.bin/netstat/show.c b/usr.bin/netstat/show.c
index 7bca6a1af13..2633f523865 100644
--- a/usr.bin/netstat/show.c
+++ b/usr.bin/netstat/show.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: show.c,v 1.24 2009/05/31 18:03:42 claudio Exp $ */
+/* $OpenBSD: show.c,v 1.25 2009/06/27 11:35:57 michele Exp $ */
/* $NetBSD: show.c,v 1.1 1996/11/15 18:01:41 gwr Exp $ */
/*
@@ -96,6 +96,7 @@ static const struct bits bits[] = {
{ RTF_CLONED, 'c' },
{ RTF_JUMBO, 'J' },
{ RTF_MPATH, 'P' },
+ { RTF_MPLS, 'T' },
{ 0 }
};