summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStuart Henderson <sthen@cvs.openbsd.org>2010-01-20 15:19:26 +0000
committerStuart Henderson <sthen@cvs.openbsd.org>2010-01-20 15:19:26 +0000
commitaa6c3435d9510e4e76bfec94eab765f6425a95c8 (patch)
tree87e0f0d202d314ba6a5714323eed278559a0a81a
parentc87695fac88f7cc1788454ab62461473cb38c771 (diff)
Print RFC3947 NAT Original Address (NAT-OA) payloads, they're a subset
of the id payload, so using the existing id printer. ok dlg@
-rw-r--r--usr.sbin/tcpdump/print-ike.c11
1 files changed, 10 insertions, 1 deletions
diff --git a/usr.sbin/tcpdump/print-ike.c b/usr.sbin/tcpdump/print-ike.c
index 114ffe7746a..f76b4339a32 100644
--- a/usr.sbin/tcpdump/print-ike.c
+++ b/usr.sbin/tcpdump/print-ike.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: print-ike.c,v 1.33 2009/11/12 16:07:41 deraadt Exp $ */
+/* $OpenBSD: print-ike.c,v 1.34 2010/01/20 15:19:25 sthen Exp $ */
/*
* Copyright (c) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999
@@ -923,9 +923,18 @@ ike_pl_print (u_int8_t type, u_int8_t *buf, u_int8_t doi)
case PAYLOAD_SEQ:
case PAYLOAD_POP:
case PAYLOAD_NAT_D:
+ break;
+
case PAYLOAD_NAT_OA:
+ /* RFC3947 NAT-OA uses a subset of the ID payload */
+ ipsec_id_print(buf, this_len, doi);
+ break;
+
case PAYLOAD_NAT_D_DRAFT:
+ break;
+
case PAYLOAD_NAT_OA_DRAFT:
+ ipsec_id_print(buf, this_len, doi);
break;
default: