/* packet-ip.c
* Routines for IP and miscellaneous IP protocol packet disassembly
*
- * $Id: packet-ip.c,v 1.190 2003/04/20 11:36:13 guy Exp $
+ * $Id: packet-ip.c,v 1.191 2003/04/29 17:24:35 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
"fragments"
};
-/* Used by IPv6 as well, so not static */
-dissector_table_t ip_dissector_table;
+static dissector_table_t ip_dissector_table;
static dissector_handle_t ip_handle;
static dissector_handle_t data_handle;
/* packet-ip.h
* Definitions for IP packet disassembly structures and routines
*
- * $Id: packet-ip.h,v 1.26 2003/01/22 01:16:33 sahlberg Exp $
+ * $Id: packet-ip.h,v 1.27 2003/04/29 17:24:35 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
void dissect_ip_tcp_options(tvbuff_t *, int, guint,
const ip_tcp_opt *, int, int, packet_info *, proto_tree *);
-/* Dissector table for "ip.proto"; used by IPv6 as well as IPv4 */
-extern dissector_table_t ip_dissector_table;
-
/* Export the DSCP value-string table for other protocols */
extern const value_string dscp_vals[];
/* 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>
#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"
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 */
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");
}
/* packet-ipv6.c
* Routines for IPv6 packet disassembly
*
- * $Id: packet-ipv6.c,v 1.97 2003/04/20 11:36:14 guy Exp $
+ * $Id: packet-ipv6.c,v 1.98 2003/04/29 17:24:35 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
#include <stdio.h>
#include <glib.h>
#include <epan/packet.h>
-#include "packet-ip.h"
#include "packet-ipsec.h"
#include "packet-ipv6.h"
#include <epan/resolv.h>
static dissector_handle_t data_handle;
+static dissector_table_t ip_dissector_table;
+
/* Reassemble fragmented datagrams */
static gboolean ipv6_reassemble = FALSE;
dissector_add("fr.ietf", NLPID_IP6, ipv6_handle);
dissector_add("x.25.spi", NLPID_IP6, ipv6_handle);
dissector_add("arcnet.protocol_id", ARCNET_PROTO_IPv6, ipv6_handle);
+
+ ip_dissector_table = find_dissector_table("ip.proto");
}