summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2008-12-15 20:16:21 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2008-12-15 20:16:21 +0000
commit4d7c244780c9696a784ea46249648a2bb6b0e233 (patch)
tree51d375d018173ffb1ab0168dfd375c130b5ae191
parent7285cd19e397cea0e1e599d0f386c6b8bf55f679 (diff)
work around tree breakage by mpls people
-rw-r--r--usr.bin/netstat/show.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/usr.bin/netstat/show.c b/usr.bin/netstat/show.c
index 7ab0927b866..25e4d8fd348 100644
--- a/usr.bin/netstat/show.c
+++ b/usr.bin/netstat/show.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: show.c,v 1.14 2008/09/15 20:13:10 claudio Exp $ */
+/* $OpenBSD: show.c,v 1.15 2008/12/15 20:16:20 deraadt Exp $ */
/* $NetBSD: show.c,v 1.1 1996/11/15 18:01:41 gwr Exp $ */
/*
@@ -605,8 +605,10 @@ routename(struct sockaddr *sa)
case AF_LINK:
return (link_print(sa));
+#if 0
case AF_MPLS:
return (label_print(sa));
+#endif
case AF_UNSPEC:
if (sa->sa_len == sizeof(struct sockaddr_rtlabel)) {
static char name[RTLABEL_LEN];
@@ -813,8 +815,10 @@ netname(struct sockaddr *sa, struct sockaddr *mask)
(struct sockaddr_in6 *)mask);
case AF_LINK:
return (link_print(sa));
+#if 0
case AF_MPLS:
return (label_print(sa));
+#endif
default:
snprintf(line, sizeof(line), "af %d: %s",
sa->sa_family, any_ntoa(sa));
@@ -863,6 +867,7 @@ link_print(struct sockaddr *sa)
}
}
+#if 0
char *
label_print_op(u_int8_t type)
{
@@ -905,6 +910,7 @@ label_print(struct sockaddr *sa)
return (line);
}
+#endif
void
index_pfk(struct sadb_msg *msg, void **headers)