diff options
| author | Guy Harris <guy@alum.mit.edu> | 2001-04-23 03:37:31 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2001-04-23 03:37:31 +0000 |
| commit | 2bc2974c6e9b0e380912d7036a1b2b8ce0edb214 (patch) | |
| tree | bf5339bf1e5133423026b0e8f2a4f995c378d749 /packet-ipsec.c | |
| parent | ae84ef77de6187da2194e8437c166e80efa64ae2 (diff) | |
Tvbuffification of the IPv6 and ICMPv6 dissectors, and some bug fixes
and an update to draft 7 of ICMPv6 name lookups, from Heikki Vatiainen.
Fix some formats in the ICMPv6 dissector to use %u, rather than %d, for
unsigned quantities.
Show various type and code values in ICMPv6 as decimal, not hexadecimal
(they're decimal in the RFCs).
svn path=/trunk/; revision=3360
Diffstat (limited to 'packet-ipsec.c')
| -rw-r--r-- | packet-ipsec.c | 20 |
1 files changed, 2 insertions, 18 deletions
diff --git a/packet-ipsec.c b/packet-ipsec.c index 4906e511e8..7da8beb201 100644 --- a/packet-ipsec.c +++ b/packet-ipsec.c @@ -1,7 +1,7 @@ /* packet-ipsec.c * Routines for IPsec/IPComp packet disassembly * - * $Id: packet-ipsec.c,v 1.28 2001/04/17 06:29:12 guy Exp $ + * $Id: packet-ipsec.c,v 1.29 2001/04/23 03:37:31 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -106,22 +106,6 @@ static const value_string cpi2val[] = { #define offsetof(type, member) ((size_t)(&((type *)0)->member)) #endif -static int dissect_ah_header(tvbuff_t *tvb, packet_info *pinfo, - proto_tree *tree, guint8 *nxt_p, proto_tree **next_tree_p); - -int -dissect_ah_old(const u_char *pd, int offset, frame_data *fd, proto_tree *tree) -{ - tvbuff_t *tvb; - int advance; - - tvb = tvb_create_from_top(offset); - advance = dissect_ah_header(tvb, &pi, tree, NULL, NULL); - - /* start of the new header (could be a extension header) */ - return advance; -} - static void dissect_ah(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { @@ -143,7 +127,7 @@ dissect_ah(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } } -static int +int dissect_ah_header(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint8 *nxt_p, proto_tree **next_tree_p) { |