diff options
| author | Gilbert Ramirez <gram@alumni.rice.edu> | 2000-06-05 03:21:03 +0000 |
|---|---|---|
| committer | Gilbert Ramirez <gram@alumni.rice.edu> | 2000-06-05 03:21:03 +0000 |
| commit | 8c27c3d37ba4be0f166c17be1ed60a6076703902 (patch) | |
| tree | 5287ca571353212797cb8bb48e50adb10dd89246 /packet-ip.c | |
| parent | 78cd3a9a26184ffcacbc01206331c3622af891e8 (diff) | |
| download | wireshark-8c27c3d37ba4be0f166c17be1ed60a6076703902.tar.gz wireshark-8c27c3d37ba4be0f166c17be1ed60a6076703902.tar.bz2 wireshark-8c27c3d37ba4be0f166c17be1ed60a6076703902.zip | |
Change dissect_ah() so that dissect_ip() doesn't have to make a
special case for it. dissect_ah() is registered with the "ip.proto"
handoff table, and dissect_ah() calls the next dissector using this
same "ip.proto" handoff table.
The old dissect_ah() is kept as dissect_ah_old() since dissect_ipv6()
still uses it. I need to convert some more functions before I can
get rid of dissect_ah_old().
svn path=/trunk/; revision=2039
Diffstat (limited to 'packet-ip.c')
| -rw-r--r-- | packet-ip.c | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/packet-ip.c b/packet-ip.c index 223b98dda8..b81e08a8d9 100644 --- a/packet-ip.c +++ b/packet-ip.c @@ -1,7 +1,7 @@ /* packet-ip.c * Routines for IP and miscellaneous IP protocol packet disassembly * - * $Id: packet-ip.c,v 1.91 2000/06/02 16:43:46 gram Exp $ + * $Id: packet-ip.c,v 1.92 2000/06/05 03:21:01 gram Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -805,7 +805,6 @@ dissect_ip(const u_char *pd, int offset, frame_data *fd, proto_tree *tree) { gchar tos_str[32]; guint hlen, optlen, len; guint16 flags; - int advance; guint8 nxt; /* To do: check for errs, etc. */ @@ -945,15 +944,6 @@ dissect_ip(const u_char *pd, int offset, frame_data *fd, proto_tree *tree) { return; } -again: - switch (nxt) { - case IP_PROTO_AH: - advance = dissect_ah(pd, offset, fd, tree); - nxt = pd[offset]; - offset += advance; - goto again; - } - /* do lookup with the subdissector table */ if (!dissector_try_port(ip_dissector_table, nxt, pd, offset, fd, tree)) { /* Unknown protocol */ |