aboutsummaryrefslogtreecommitdiffstats
path: root/packet-ipsec.c
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2003-04-29 17:24:35 +0000
committerGuy Harris <guy@alum.mit.edu>2003-04-29 17:24:35 +0000
commit74e3d695fcc195def1c67453f2e62444c398ca6b (patch)
tree0c2f3ff67f160a69377a1c12a71b7b1956cbc81d /packet-ipsec.c
parente29579a74a27a5613483882b78c0dbc836275921 (diff)
Don't export "ip_dissector_table" explicitly; now that we have
"find_dissector_table()", have the IPv6 and IPSEC dissectors fetch the IP dissector table by name. svn path=/trunk/; revision=7600
Diffstat (limited to 'packet-ipsec.c')
-rw-r--r--packet-ipsec.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/packet-ipsec.c b/packet-ipsec.c
index 9b4b76071d..5cbce1ca97 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.42 2002/08/28 21:00:17 jmayer Exp $
+ * $Id: packet-ipsec.c,v 1.43 2003/04/29 17:24:35 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -32,7 +32,6 @@
#include <glib.h>
#include <epan/packet.h>
#include "packet-ipsec.h"
-#include "packet-ip.h"
#include <epan/resolv.h>
#include "ipproto.h"
#include "prefs.h"
@@ -56,6 +55,8 @@ static gint ett_ipcomp = -1;
static dissector_handle_t data_handle;
+static dissector_table_t ip_dissector_table;
+
struct newah {
guint8 ah_nxt; /* Next Header */
guint8 ah_len; /* Length of data + 1, in 32bit */
@@ -353,4 +354,6 @@ proto_reg_handoff_ipsec(void)
dissector_add("ip.proto", IP_PROTO_ESP, esp_handle);
ipcomp_handle = create_dissector_handle(dissect_ipcomp, proto_ipcomp);
dissector_add("ip.proto", IP_PROTO_IPCOMP, ipcomp_handle);
+
+ ip_dissector_table = find_dissector_table("ip.proto");
}