summaryrefslogtreecommitdiff
path: root/usr.bin/netstat
diff options
context:
space:
mode:
authorMichele Marchetto <michele@cvs.openbsd.org>2009-04-28 12:09:37 +0000
committerMichele Marchetto <michele@cvs.openbsd.org>2009-04-28 12:09:37 +0000
commitcacc01fc73d29b7231e7a8069ffcd331e6f03a1e (patch)
tree37170a0b7e7261f304d28e35c2749d2a828fea7b /usr.bin/netstat
parent6bcde5d977a5f0f33a32ea5c22cfe7999c602030 (diff)
Sync with kernel changes.
Add support to route(8) for a new dummy operation to allow packets coming in with a particular label to leave the MPLS cloud and join ipv4/ipv6 stack. ok claudio@ laurent@
Diffstat (limited to 'usr.bin/netstat')
-rw-r--r--usr.bin/netstat/show.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/usr.bin/netstat/show.c b/usr.bin/netstat/show.c
index 16c5acb0765..270e5af645f 100644
--- a/usr.bin/netstat/show.c
+++ b/usr.bin/netstat/show.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: show.c,v 1.20 2009/02/06 19:58:31 chl Exp $ */
+/* $OpenBSD: show.c,v 1.21 2009/04/28 12:09:36 michele Exp $ */
/* $NetBSD: show.c,v 1.1 1996/11/15 18:01:41 gwr Exp $ */
/*
@@ -558,7 +558,7 @@ p_sockaddr_mpls(struct sockaddr *in, struct sockaddr *out, int flags, int width)
if (in->sa_family != AF_MPLS)
return;
- if (flags & MPLS_OP_POP)
+ if (flags & MPLS_OP_POP || flags == MPLS_OP_LOCAL)
cp = label_print(in, NULL);
else
cp = label_print(in, out);
@@ -893,6 +893,8 @@ char *
label_print_op(u_int32_t type)
{
switch (type & (MPLS_OP_PUSH | MPLS_OP_POP | MPLS_OP_SWAP)) {
+ case MPLS_OP_LOCAL:
+ return ("LOCAL");
case MPLS_OP_POP:
return ("POP");
case MPLS_OP_SWAP: