summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Friedl <markus@cvs.openbsd.org>2006-08-30 15:49:33 +0000
committerMarkus Friedl <markus@cvs.openbsd.org>2006-08-30 15:49:33 +0000
commite834b74f08a74cef655185cb19a9901985c230a3 (patch)
tree12ad0d8941214226b32b2d9399d01031638c0b51
parentdbc58bf999ca12688d2e1b22d4bbd20ed02ec90d (diff)
partial backout of last commit
-rw-r--r--sbin/ipsecctl/pfkdump.c13
1 files changed, 1 insertions, 12 deletions
diff --git a/sbin/ipsecctl/pfkdump.c b/sbin/ipsecctl/pfkdump.c
index 3e1a55612f6..1ff0d8e73a3 100644
--- a/sbin/ipsecctl/pfkdump.c
+++ b/sbin/ipsecctl/pfkdump.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pfkdump.c,v 1.20 2006/08/30 12:16:59 markus Exp $ */
+/* $OpenBSD: pfkdump.c,v 1.21 2006/08/30 15:49:32 markus Exp $ */
/*
* Copyright (c) 2003 Markus Friedl. All rights reserved.
@@ -55,7 +55,6 @@ static void print_ident(struct sadb_ext *, struct sadb_msg *);
static void print_auth(struct sadb_ext *, struct sadb_msg *);
static void print_cred(struct sadb_ext *, struct sadb_msg *);
static void print_udpenc(struct sadb_ext *, struct sadb_msg *);
-static void print_tag(struct sadb_ext *, struct sadb_msg *);
static struct idname *lookup(struct idname [], u_int8_t);
static char *lookup_name(struct idname [], u_int8_t);
@@ -106,7 +105,6 @@ struct idname ext_types[] = {
{ SADB_X_EXT_REMOTE_CREDENTIALS,"remote_cred", print_cred },
{ SADB_X_EXT_UDPENCAP, "udpencap", print_udpenc },
{ SADB_X_EXT_LIFETIME_LASTUSE, "lifetime_lastuse", print_life },
- { SADB_X_EXT_TAG, "tag", print_tag },
{ 0, NULL, NULL }
};
@@ -254,8 +252,6 @@ print_ext(struct sadb_ext *ext, struct sadb_msg *msg)
ext->sadb_ext_type, ext->sadb_ext_len);
return;
}
- printf("type %u len %u",
- ext->sadb_ext_type, ext->sadb_ext_len);
printf("\t%s: ", entry->name);
if (entry->func != NULL)
(*entry->func)(ext, msg);
@@ -379,13 +375,6 @@ print_flow(struct sadb_ext *ext, struct sadb_msg *msg)
lookup_name(flow_types, proto->sadb_protocol_proto), dir);
}
-static void
-print_tag(struct sadb_ext *ext, struct sadb_msg *msg)
-{
- struct sadb_x_tag *stag = (struct sadb_x_tag *)ext;
- printf("%s", stag->sadb_x_tag_name);
-}
-
static char *
alg_by_ext(u_int8_t ext_type, u_int8_t id)
{