diff options
| author |   ho <ho@openbsd.org> | 2003-12-18 09:14:18 +0000 |
|---|---|---|
| committer | ho <ho@openbsd.org> | 2003-12-18 09:14:18 +0000 |
| commit | 205ac80826f3bb1e5948b93e4d3fe40dc4796690 (patch) | |
| tree | ae479c9817439fa7d6a63a07fe4dff12fed1eae3 | |
| parent | spls do not protect cpu_itmr and thus time might jump back sometimes due to cpu_itmr modified to a higher value than a read itmr; found and testing by miod@ (diff) | |
| download | wireguard-openbsd-205ac80826f3bb1e5948b93e4d3fe40dc4796690.tar.xz wireguard-openbsd-205ac80826f3bb1e5948b93e4d3fe40dc4796690.zip | |
Recognize NAT-D and NAT-OA payloads. markus@ ok.
| -rw-r--r-- | usr.sbin/tcpdump/ike.h | 6 | ||||
| -rw-r--r-- | usr.sbin/tcpdump/print-ike.c | 8 |
2 files changed, 11 insertions, 3 deletions
diff --git a/usr.sbin/tcpdump/ike.h b/usr.sbin/tcpdump/ike.h index ab87e635542..55fc3a2ac19 100644 --- a/usr.sbin/tcpdump/ike.h +++ b/usr.sbin/tcpdump/ike.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ike.h,v 1.5 2002/06/11 17:05:13 ho Exp $ */ +/* $OpenBSD: ike.h,v 1.6 2003/12/18 09:14:18 ho Exp $ */ /* * Copyright (c) 2001 Håkan Olsson. All rights reserved. @@ -109,6 +109,8 @@ #define PAYLOAD_DELETE 12 #define PAYLOAD_VENDOR 13 #define PAYLOAD_ATTRIBUTE 14 +#define PAYLOAD_NAT_D 15 +#define PAYLOAD_NAT_OA 16 #define IKE_PAYLOAD_TYPES_INITIALIZER \ { "NONE", /* 0 */ \ @@ -126,6 +128,8 @@ "DELETE", /* 12 */ \ "VENDOR", /* 13 */ \ "ATTRIBUTE", /* 14 (ikecfg) */ \ + "NAT-D", /* 15 */ \ + "NAT-OA", /* 16 */ \ } /* Exchange types */ diff --git a/usr.sbin/tcpdump/print-ike.c b/usr.sbin/tcpdump/print-ike.c index 2f1b0bb9cd9..bad2b88c2c9 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.15 2002/09/23 04:10:14 millert Exp $ */ +/* $OpenBSD: print-ike.c,v 1.16 2003/12/18 09:14:18 ho Exp $ */ /* * Copyright (c) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999 @@ -29,7 +29,7 @@ #ifndef lint static const char rcsid[] = - "@(#) $Header: /home/cvs/src/usr.sbin/tcpdump/print-ike.c,v 1.15 2002/09/23 04:10:14 millert Exp $ (XXX)"; + "@(#) $Header: /home/cvs/src/usr.sbin/tcpdump/print-ike.c,v 1.16 2003/12/18 09:14:18 ho Exp $ (XXX)"; #endif #include <sys/param.h> @@ -686,6 +686,10 @@ ike_pl_print (u_char type, u_char *buf, u_char doi) ike_pl_attribute_print(buf+4, this_len); break; + case PAYLOAD_NAT_D: + case PAYLOAD_NAT_OA: + break; + default: break; } |