aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--epan/packet.c49
-rw-r--r--epan/packet.h16
-rw-r--r--gtk/decode_as_dlg.c48
-rw-r--r--packet-atalk.c5
-rw-r--r--packet-bacapp.c9
-rw-r--r--packet-bacnet.c17
-rw-r--r--packet-bvlc.c5
-rw-r--r--packet-chdlc.c5
-rw-r--r--packet-ethertype.c5
-rw-r--r--packet-fr.c5
-rw-r--r--packet-frame.c5
-rw-r--r--packet-gre.c5
-rw-r--r--packet-http.c5
-rw-r--r--packet-ip.c5
-rw-r--r--packet-ipx.c8
-rw-r--r--packet-llc.c8
-rw-r--r--packet-mtp3.c5
-rw-r--r--packet-null.c5
-rw-r--r--packet-osi.c5
-rw-r--r--packet-pgm.c5
-rw-r--r--packet-ppp.c5
-rw-r--r--packet-sctp.c8
-rw-r--r--packet-sua.c6
-rw-r--r--packet-tcp.c5
-rw-r--r--packet-udp.c5
-rw-r--r--packet-vines.c5
-rw-r--r--packet-wsp.c5
-rw-r--r--packet-x25.c5
28 files changed, 188 insertions, 76 deletions
diff --git a/epan/packet.c b/epan/packet.c
index 5e95994c4a..53b33f840b 100644
--- a/epan/packet.c
+++ b/epan/packet.c
@@ -1,7 +1,7 @@
/* packet.c
* Routines for packet disassembly
*
- * $Id: packet.c,v 1.51 2001/12/03 09:00:25 guy Exp $
+ * $Id: packet.c,v 1.52 2001/12/08 06:41:47 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -230,15 +230,26 @@ struct dtbl_entry {
* "dissector_handles" is a list of all dissectors that *could* be
* used in that table; not all of them are necessarily in the table,
* as they may be for protocols that don't have a fixed port number.
+ *
+ * "ui_name" is the name the dissector table has in the user interface.
+ *
+ * "type" is a field type giving the width of the port number for that
+ * dissector table.
+ *
+ * "base" is the base in which to display the port number for that
+ * dissector table.
*/
struct dissector_table {
- GHashTable *hash_table;
- GSList *dissector_handles;
+ GHashTable *hash_table;
+ GSList *dissector_handles;
+ char *ui_name;
+ ftenum_t type;
+ int base;
};
static GHashTable *dissector_tables = NULL;
-/* Finds a dissector table by field name. */
+/* Finds a dissector table by table name. */
static dissector_table_t
find_dissector_table(const char *name)
{
@@ -665,7 +676,8 @@ dissector_table_foreach_changed (char *name,
}
dissector_table_t
-register_dissector_table(const char *name)
+register_dissector_table(const char *name, char *ui_name, ftenum_t type,
+ int base)
{
dissector_table_t sub_dissectors;
@@ -684,10 +696,37 @@ register_dissector_table(const char *name)
sub_dissectors->hash_table = g_hash_table_new( g_direct_hash,
g_direct_equal );
sub_dissectors->dissector_handles = NULL;
+ sub_dissectors->ui_name = ui_name;
+ sub_dissectors->type = type;
+ sub_dissectors->base = base;
g_hash_table_insert( dissector_tables, (gpointer)name, (gpointer) sub_dissectors );
return sub_dissectors;
}
+char *
+get_dissector_table_ui_name(const char *name)
+{
+ dissector_table_t sub_dissectors = find_dissector_table( name);
+
+ return sub_dissectors->ui_name;
+}
+
+ftenum_t
+get_dissector_table_type(const char *name)
+{
+ dissector_table_t sub_dissectors = find_dissector_table( name);
+
+ return sub_dissectors->type;
+}
+
+int
+get_dissector_table_base(const char *name)
+{
+ dissector_table_t sub_dissectors = find_dissector_table( name);
+
+ return sub_dissectors->base;
+}
+
static GHashTable *heur_dissector_lists = NULL;
typedef struct {
diff --git a/epan/packet.h b/epan/packet.h
index 3229786c82..324fcc543c 100644
--- a/epan/packet.h
+++ b/epan/packet.h
@@ -1,7 +1,7 @@
/* packet.h
* Definitions for packet disassembly structures and routines
*
- * $Id: packet.h,v 1.45 2001/12/03 08:47:30 guy Exp $
+ * $Id: packet.h,v 1.46 2001/12/08 06:41:47 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -112,7 +112,19 @@ extern void dissector_table_foreach_handle(char *name, DATFunc_handle func,
gpointer user_data);
/* a protocol uses the function to register a sub-dissector table */
-extern dissector_table_t register_dissector_table(const char *name);
+extern dissector_table_t register_dissector_table(const char *name,
+ char *ui_name, ftenum_t type, int base);
+
+/* Get the UI name for a sub-dissector table, given its internal name */
+extern char *get_dissector_table_ui_name(const char *name);
+
+/* Get the field type to use when displaying values of the selector for a
+ sub-dissector table, given the table's internal name */
+ftenum_t get_dissector_table_type(const char *name);
+
+/* Get the base to use when displaying values of the selector for a
+ sub-dissector table, given the table's internal name */
+extern int get_dissector_table_base(const char *name);
/* Add a sub-dissector to a dissector table. Called by the protocol routine */
/* that wants to register a sub-dissector. */
diff --git a/gtk/decode_as_dlg.c b/gtk/decode_as_dlg.c
index 5ca4a34168..7c023b18f0 100644
--- a/gtk/decode_as_dlg.c
+++ b/gtk/decode_as_dlg.c
@@ -1,6 +1,6 @@
/* decode_as_dlg.c
*
- * $Id: decode_as_dlg.c,v 1.19 2001/12/06 08:50:14 guy Exp $
+ * $Id: decode_as_dlg.c,v 1.20 2001/12/08 06:41:48 guy Exp $
*
* Routines to modify dissector tables on the fly.
*
@@ -90,7 +90,9 @@ enum srcdst_type {
#define E_PAGE_VALUE "notebook_page_value"
/*
- * Clist columns for a "Select" clist
+ * Clist columns for a "Select" clist.
+ * Note that most of these columns aren't displayed; they're attached
+ * to the row of the table as additional information.
*/
#define E_CLIST_S_PROTO_NAME 0
#define E_CLIST_S_TABLE 1
@@ -157,7 +159,7 @@ struct dissector_delete_item {
/* The name of the dissector table */
const gchar *ddi_table_name;
/* The port number in the dissector table */
- gint ddi_port;
+ guint ddi_port;
};
/*
@@ -200,7 +202,7 @@ decode_build_reset_list (gchar *table_name, gpointer key,
item = g_malloc(sizeof(dissector_delete_item_t));
item->ddi_table_name = table_name;
- item->ddi_port = GPOINTER_TO_INT(key);
+ item->ddi_port = GPOINTER_TO_UINT(key);
dissector_reset_list = g_slist_prepend(dissector_reset_list, item);
}
@@ -253,8 +255,42 @@ decode_build_show_list (gchar *table_name, gpointer key,
else
initial_proto_name = dissector_handle_get_short_name(initial);
- text[E_CLIST_D_TABLE] = table_name;
- sprintf(string1, "%d", GPOINTER_TO_INT(key));
+ text[E_CLIST_D_TABLE] = get_dissector_table_ui_name(table_name);
+ switch (get_dissector_table_base(table_name)) {
+
+ case BASE_DEC:
+ sprintf(string1, "%u", GPOINTER_TO_UINT(key));
+ break;
+
+ case BASE_HEX:
+ switch (get_dissector_table_type(table_name)) {
+
+ case FT_UINT8:
+ sprintf(string1, "0x%02x", GPOINTER_TO_UINT(key));
+ break;
+
+ case FT_UINT16:
+ sprintf(string1, "0x%04x", GPOINTER_TO_UINT(key));
+ break;
+
+ case FT_UINT24:
+ sprintf(string1, "0x%06x", GPOINTER_TO_UINT(key));
+ break;
+
+ case FT_UINT32:
+ sprintf(string1, "0x%08x", GPOINTER_TO_UINT(key));
+ break;
+
+ default:
+ g_assert_not_reached();
+ break;
+ }
+ break;
+
+ case BASE_OCT:
+ sprintf(string1, "%#o", GPOINTER_TO_UINT(key));
+ break;
+ }
text[E_CLIST_D_PORT] = string1;
text[E_CLIST_D_INITIAL] = initial_proto_name;
text[E_CLIST_D_CURRENT] = current_proto_name;
diff --git a/packet-atalk.c b/packet-atalk.c
index ecb2346283..458d4928fb 100644
--- a/packet-atalk.c
+++ b/packet-atalk.c
@@ -1,7 +1,7 @@
/* packet-atalk.c
* Routines for Appletalk packet disassembly (DDP, currently).
*
- * $Id: packet-atalk.c,v 1.58 2001/12/03 03:59:33 guy Exp $
+ * $Id: packet-atalk.c,v 1.59 2001/12/08 06:41:41 guy Exp $
*
* Simon Wilkinson <sxw@dcs.ed.ac.uk>
*
@@ -712,7 +712,8 @@ proto_register_atalk(void)
proto_register_subtree_array(ett, array_length(ett));
/* subdissector code */
- ddp_dissector_table = register_dissector_table("ddp.type");
+ ddp_dissector_table = register_dissector_table("ddp.type", "DDP packet type",
+ FT_UINT8, BASE_HEX);
}
void
diff --git a/packet-bacapp.c b/packet-bacapp.c
index c0337319f5..33f85276d9 100644
--- a/packet-bacapp.c
+++ b/packet-bacapp.c
@@ -2,7 +2,7 @@
* Routines for BACnet (APDU) dissection
* Copyright 2001, Hartmut Mueller <hartmut@abmlinux.org>, FH Dortmund
*
- * $Id: packet-bacapp.c,v 1.6 2001/12/03 03:59:33 guy Exp $
+ * $Id: packet-bacapp.c,v 1.7 2001/12/08 06:41:41 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -123,13 +123,12 @@ proto_register_bacapp(void)
"BACapp", "bacapp");
proto_register_field_array(proto_bacapp, hf, array_length(hf));
proto_register_subtree_array(ett, array_length(ett));
+ register_dissector("bacapp", dissect_bacapp, proto_bacapp);
}
+
void
proto_reg_handoff_bacapp(void)
{
- dissector_handle_t bacapp_handle;
-
- bacapp_handle = create_dissector_handle(dissect_bacapp, proto_bacapp);
- dissector_add("bacnet_control_net", 0, bacapp_handle);
data_handle = find_dissector("data");
}
+
diff --git a/packet-bacnet.c b/packet-bacnet.c
index 5cc99c2ba1..6403636e95 100644
--- a/packet-bacnet.c
+++ b/packet-bacnet.c
@@ -2,7 +2,7 @@
* Routines for BACnet (NPDU) dissection
* Copyright 2001, Hartmut Mueller <hartmut@abmlinux.org>, FH Dortmund
*
- * $Id: packet-bacnet.c,v 1.6 2001/12/03 03:59:33 guy Exp $
+ * $Id: packet-bacnet.c,v 1.7 2001/12/08 06:41:41 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -49,7 +49,7 @@
#include "packet.h"
-static dissector_table_t bacnet_dissector_table;
+static dissector_handle_t bacapp_handle;
static dissector_handle_t data_handle;
static const char*
@@ -187,7 +187,6 @@ dissect_bacnet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
gint offset;
guint8 bacnet_version;
guint8 bacnet_control;
- guint8 bacnet_control_net;
guint8 bacnet_dlen;
guint8 bacnet_slen;
guint8 bacnet_mesgtyp;
@@ -207,7 +206,6 @@ dissect_bacnet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
offset = 0;
bacnet_version = tvb_get_guint8(tvb, offset);
bacnet_control = tvb_get_guint8(tvb, offset+1);
- bacnet_control_net = tvb_get_guint8(tvb, offset+1) & BAC_CONTROL_NET;
bacnet_dlen = 0;
bacnet_slen = 0;
bacnet_mesgtyp = 0;
@@ -424,11 +422,12 @@ dissect_bacnet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
/* dissect BACnet APDU
*/
next_tvb = tvb_new_subset(tvb,offset,-1,-1);
- /* Code from Guy Harris */
- if (!dissector_try_port(bacnet_dissector_table,
- bacnet_control_net, next_tvb, pinfo, tree)) {
+ if (bacnet_control & BAC_CONTROL_NET) {
/* Unknown function - dissect the payload as data */
- call_dissector(data_handle,next_tvb, pinfo, tree);
+ call_dissector(data_handle, next_tvb, pinfo, tree);
+ } else {
+ /* APDU - call the APDU dissector */
+ call_dissector(bacapp_handle, next_tvb, pinfo, tree);
}
}
@@ -593,7 +592,6 @@ proto_register_bacnet(void)
proto_register_subtree_array(ett, array_length(ett));
register_dissector("bacnet", dissect_bacnet, proto_bacnet);
- bacnet_dissector_table = register_dissector_table("bacnet_control_net");
}
void
@@ -606,5 +604,6 @@ proto_reg_handoff_bacnet(void)
dissector_add("bvlc.function", 0x09, bacnet_handle);
dissector_add("bvlc.function", 0x0a, bacnet_handle);
dissector_add("bvlc.function", 0x0b, bacnet_handle);
+ bacapp_handle = find_dissector("bacapp");
data_handle = find_dissector("data");
}
diff --git a/packet-bvlc.c b/packet-bvlc.c
index abed81f59e..e74d27b9a8 100644
--- a/packet-bvlc.c
+++ b/packet-bvlc.c
@@ -2,7 +2,7 @@
* Routines for BACnet/IP (BVLL, BVLC) dissection
* Copyright 2001, Hartmut Mueller <hartmut@abmlinux.org>, FH Dortmund
*
- * $Id: packet-bvlc.c,v 1.6 2001/12/03 03:59:33 guy Exp $
+ * $Id: packet-bvlc.c,v 1.7 2001/12/08 06:41:41 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -389,7 +389,8 @@ proto_register_bvlc(void)
register_dissector("bvlc", dissect_bvlc, proto_bvlc);
- bvlc_dissector_table = register_dissector_table("bvlc.function");
+ bvlc_dissector_table = register_dissector_table("bvlc.function",
+ "BVLC Function", FT_UINT8, BASE_HEX);
}
void
diff --git a/packet-chdlc.c b/packet-chdlc.c
index 5c66ee6b46..60919a49b6 100644
--- a/packet-chdlc.c
+++ b/packet-chdlc.c
@@ -1,7 +1,7 @@
/* packet-chdlc.c
* Routines for Cisco HDLC packet disassembly
*
- * $Id: packet-chdlc.c,v 1.7 2001/12/03 03:59:33 guy Exp $
+ * $Id: packet-chdlc.c,v 1.8 2001/12/08 06:41:41 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -189,7 +189,8 @@ proto_register_chdlc(void)
proto_register_subtree_array(ett, array_length(ett));
/* subdissector code */
- subdissector_table = register_dissector_table("chdlctype");
+ subdissector_table = register_dissector_table("chdlctype",
+ "Cisco HDLC frame type", FT_UINT16, BASE_HEX);
register_dissector("chdlc", dissect_chdlc, proto_chdlc);
}
diff --git a/packet-ethertype.c b/packet-ethertype.c
index c3adeb3a29..644094f4eb 100644
--- a/packet-ethertype.c
+++ b/packet-ethertype.c
@@ -1,7 +1,7 @@
/* ethertype.c
* Routines for calling the right protocol for the ethertype.
*
- * $Id: packet-ethertype.c,v 1.22 2001/11/26 04:52:49 hagbard Exp $
+ * $Id: packet-ethertype.c,v 1.23 2001/12/08 06:41:41 guy Exp $
*
* Gilbert Ramirez <gram@alumni.rice.edu>
*
@@ -263,7 +263,8 @@ void
proto_register_ethertype(void)
{
/* subdissector code */
- ethertype_dissector_table = register_dissector_table("ethertype");
+ ethertype_dissector_table = register_dissector_table("ethertype",
+ "Ethertype", FT_UINT16, BASE_HEX);
}
void
diff --git a/packet-fr.c b/packet-fr.c
index 5bb4c5ed4c..e830c2f40e 100644
--- a/packet-fr.c
+++ b/packet-fr.c
@@ -3,7 +3,7 @@
*
* Copyright 2001, Paul Ionescu <paul@acorp.ro>
*
- * $Id: packet-fr.c,v 1.25 2001/12/03 03:59:34 guy Exp $
+ * $Id: packet-fr.c,v 1.26 2001/12/08 06:41:41 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -416,7 +416,8 @@ void proto_register_fr(void)
proto_register_field_array(proto_fr, hf, array_length(hf));
proto_register_subtree_array(ett, array_length(ett));
- fr_subdissector_table = register_dissector_table("fr.ietf");
+ fr_subdissector_table = register_dissector_table("fr.ietf",
+ "Frame Relay NLPID", FT_UINT8, BASE_HEX);
register_dissector("fr", dissect_fr_uncompressed, proto_fr);
}
diff --git a/packet-frame.c b/packet-frame.c
index 1e6b1d1514..231acab969 100644
--- a/packet-frame.c
+++ b/packet-frame.c
@@ -2,7 +2,7 @@
*
* Top-most dissector. Decides dissector based on Wiretap Encapsulation Type.
*
- * $Id: packet-frame.c,v 1.12 2001/12/06 22:52:18 guy Exp $
+ * $Id: packet-frame.c,v 1.13 2001/12/08 06:41:41 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -202,7 +202,8 @@ proto_register_frame(void)
};
module_t *frame_module;
- wtap_encap_dissector_table = register_dissector_table("wtap_encap");
+ wtap_encap_dissector_table = register_dissector_table("wtap_encap",
+ "Wiretap encapsulation type", FT_UINT32, BASE_DEC);
proto_frame = proto_register_protocol("Frame", "Frame", "frame");
proto_register_field_array(proto_frame, hf, array_length(hf));
diff --git a/packet-gre.c b/packet-gre.c
index 5ec6dc7db2..230cd4f913 100644
--- a/packet-gre.c
+++ b/packet-gre.c
@@ -2,7 +2,7 @@
* Routines for the Generic Routing Encapsulation (GRE) protocol
* Brad Robel-Forrest <brad.robel-forrest@watchguard.com>
*
- * $Id: packet-gre.c,v 1.47 2001/12/03 03:59:34 guy Exp $
+ * $Id: packet-gre.c,v 1.48 2001/12/08 06:41:41 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -375,7 +375,8 @@ proto_register_gre(void)
proto_register_subtree_array(ett, array_length(ett));
/* subdissector code */
- gre_dissector_table = register_dissector_table("gre.proto");
+ gre_dissector_table = register_dissector_table("gre.proto",
+ "GRE protocol type", FT_UINT16, BASE_HEX);
}
void
diff --git a/packet-http.c b/packet-http.c
index 94b4f5c150..03724fc97b 100644
--- a/packet-http.c
+++ b/packet-http.c
@@ -3,7 +3,7 @@
*
* Guy Harris <guy@alum.mit.edu>
*
- * $Id: packet-http.c,v 1.42 2001/12/03 03:59:35 guy Exp $
+ * $Id: packet-http.c,v 1.43 2001/12/08 06:41:41 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -414,7 +414,8 @@ proto_register_http(void)
* This only works for protocols such as IPP that run over
* HTTP on a specific non-HTTP port.
*/
- subdissector_table = register_dissector_table("http.port");
+ subdissector_table = register_dissector_table("http.port",
+ "TCP port for protocols using HTTP", FT_UINT16, BASE_DEC);
/*
* Heuristic dissectors SHOULD register themselves in
diff --git a/packet-ip.c b/packet-ip.c
index f4184d2e13..b7b72eeb72 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.150 2001/12/03 03:59:35 guy Exp $
+ * $Id: packet-ip.c,v 1.151 2001/12/08 06:41:41 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -1774,7 +1774,8 @@ proto_register_ip(void)
proto_register_subtree_array(ett, array_length(ett));
/* subdissector code */
- ip_dissector_table = register_dissector_table("ip.proto");
+ ip_dissector_table = register_dissector_table("ip.proto",
+ "IP protocol", FT_UINT8, BASE_DEC);
/* Register configuration options */
ip_module = prefs_register_protocol(proto_ip, NULL);
diff --git a/packet-ipx.c b/packet-ipx.c
index f7e669b3d6..7e8d73d340 100644
--- a/packet-ipx.c
+++ b/packet-ipx.c
@@ -2,7 +2,7 @@
* Routines for NetWare's IPX
* Gilbert Ramirez <gram@alumni.rice.edu>
*
- * $Id: packet-ipx.c,v 1.96 2001/12/03 03:59:35 guy Exp $
+ * $Id: packet-ipx.c,v 1.97 2001/12/08 06:41:41 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -974,8 +974,10 @@ proto_register_ipx(void)
proto_register_subtree_array(ett, array_length(ett));
- ipx_type_dissector_table = register_dissector_table("ipx.packet_type");
- ipx_socket_dissector_table = register_dissector_table("ipx.socket");
+ ipx_type_dissector_table = register_dissector_table("ipx.packet_type",
+ "IPX packet type", FT_UINT8, BASE_HEX);
+ ipx_socket_dissector_table = register_dissector_table("ipx.socket",
+ "IPX socket", FT_UINT16, BASE_HEX);
}
void
diff --git a/packet-llc.c b/packet-llc.c
index 27cb7630fe..c7c87b8ee4 100644
--- a/packet-llc.c
+++ b/packet-llc.c
@@ -2,7 +2,7 @@
* Routines for IEEE 802.2 LLC layer
* Gilbert Ramirez <gram@alumni.rice.edu>
*
- * $Id: packet-llc.c,v 1.91 2001/12/03 03:59:36 guy Exp $
+ * $Id: packet-llc.c,v 1.92 2001/12/08 06:41:41 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -550,8 +550,10 @@ proto_register_llc(void)
proto_register_subtree_array(ett, array_length(ett));
/* subdissector code */
- subdissector_table = register_dissector_table("llc.dsap");
- cisco_subdissector_table = register_dissector_table("llc.cisco_pid");
+ subdissector_table = register_dissector_table("llc.dsap",
+ "LLC SAP", FT_UINT8, BASE_HEX);
+ cisco_subdissector_table = register_dissector_table("llc.cisco_pid",
+ "Cisco OUI PID", FT_UINT16, BASE_HEX);
register_dissector("llc", dissect_llc, proto_llc);
}
diff --git a/packet-mtp3.c b/packet-mtp3.c
index 6cbce4aeb1..eb7194a4dc 100644
--- a/packet-mtp3.c
+++ b/packet-mtp3.c
@@ -2,7 +2,7 @@
* Routines for Message Transfer Part Level 3 dissection
* Copyright 2001, Michael Tuexen <Michael.Tuexen@icn.siemens.de>
*
- * $Id: packet-mtp3.c,v 1.5 2001/07/07 09:06:40 guy Exp $
+ * $Id: packet-mtp3.c,v 1.6 2001/12/08 06:41:41 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -426,7 +426,8 @@ proto_register_mtp3(void)
/* Register the dissector */
register_dissector("mtp3", dissect_mtp3, proto_mtp3);
- mtp3_sio_dissector_table = register_dissector_table("mtp3.service_indicator");
+ mtp3_sio_dissector_table = register_dissector_table("mtp3.service_indicator",
+ "MTP3 Service indicator", FT_UINT8, BASE_HEX);
mtp3_module = prefs_register_protocol(proto_mtp3, NULL);
diff --git a/packet-null.c b/packet-null.c
index a88cbbbb05..2b78444e62 100644
--- a/packet-null.c
+++ b/packet-null.c
@@ -1,7 +1,7 @@
/* packet-null.c
* Routines for null packet disassembly
*
- * $Id: packet-null.c,v 1.49 2001/12/03 03:59:37 guy Exp $
+ * $Id: packet-null.c,v 1.50 2001/12/08 06:41:41 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -313,7 +313,8 @@ proto_register_null(void)
proto_register_subtree_array(ett, array_length(ett));
/* subdissector code */
- null_dissector_table = register_dissector_table("null.type");
+ null_dissector_table = register_dissector_table("null.type",
+ "BSD AF_ type", FT_UINT32, BASE_DEC);
}
void
diff --git a/packet-osi.c b/packet-osi.c
index de3a9462de..92840d9c96 100644
--- a/packet-osi.c
+++ b/packet-osi.c
@@ -2,7 +2,7 @@
* Routines for ISO/OSI network and transport protocol packet disassembly
* Main entrance point and common functions
*
- * $Id: packet-osi.c,v 1.50 2001/12/03 03:59:37 guy Exp $
+ * $Id: packet-osi.c,v 1.51 2001/12/08 06:41:41 guy Exp $
* Laurent Deniel <deniel@worldnet.fr>
* Ralf Schneider <Ralf.Schneider@t-online.de>
*
@@ -181,7 +181,8 @@ proto_register_osi(void)
/* There's no "OSI" protocol *per se*, but we do register a
dissector table so various protocols running at the
network layer can register themselves. */
- osinl_subdissector_table = register_dissector_table("osinl");
+ osinl_subdissector_table = register_dissector_table("osinl",
+ "OSI NLPID", FT_UINT8, BASE_HEX);
}
void
diff --git a/packet-pgm.c b/packet-pgm.c
index a3e2c0e355..5b642e6889 100644
--- a/packet-pgm.c
+++ b/packet-pgm.c
@@ -1,7 +1,7 @@
/* packet-pgm.c
* Routines for pgm packet disassembly
*
- * $Id: packet-pgm.c,v 1.10 2001/12/03 03:59:37 guy Exp $
+ * $Id: packet-pgm.c,v 1.11 2001/12/08 06:41:41 guy Exp $
*
* Copyright (c) 2000 by Talarian Corp
*
@@ -1076,7 +1076,8 @@ proto_register_pgm(void)
proto_register_subtree_array(ett, array_length(ett));
/* subdissector code */
- subdissector_table = register_dissector_table("pgm.port");
+ subdissector_table = register_dissector_table("pgm.port",
+ "PGM port", FT_UINT16, BASE_DEC);
register_heur_dissector_list("pgm", &heur_subdissector_list);
/*
diff --git a/packet-ppp.c b/packet-ppp.c
index fabab92a8c..e6e11ca7f6 100644
--- a/packet-ppp.c
+++ b/packet-ppp.c
@@ -1,7 +1,7 @@
/* packet-ppp.c
* Routines for ppp packet disassembly
*
- * $Id: packet-ppp.c,v 1.79 2001/12/08 01:03:19 guy Exp $
+ * $Id: packet-ppp.c,v 1.80 2001/12/08 06:41:42 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -2578,7 +2578,8 @@ proto_register_ppp(void)
proto_register_subtree_array(ett, array_length(ett));
/* subdissector code */
- subdissector_table = register_dissector_table("ppp.protocol");
+ subdissector_table = register_dissector_table("ppp.protocol",
+ "PPP protocol", FT_UINT16, BASE_HEX);
register_dissector("ppp_hdlc", dissect_ppp_hdlc, proto_ppp);
register_dissector("ppp", dissect_ppp, proto_ppp);
diff --git a/packet-sctp.c b/packet-sctp.c
index fc99a60347..2d9a3612ae 100644
--- a/packet-sctp.c
+++ b/packet-sctp.c
@@ -2,7 +2,7 @@
* Routines for Stream Control Transmission Protocol dissection
* Copyright 2000, Michael Tüxen <Michael.Tuexen@icn.siemens.de>
*
- * $Id: packet-sctp.c,v 1.22 2001/12/03 03:59:39 guy Exp $
+ * $Id: packet-sctp.c,v 1.23 2001/12/08 06:41:42 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -1932,8 +1932,10 @@ proto_register_sctp(void)
proto_register_subtree_array(ett, array_length(ett));
/* subdissector code */
- sctp_port_dissector_table = register_dissector_table("sctp.port");
- sctp_ppi_dissector_table = register_dissector_table("sctp.ppi");
+ sctp_port_dissector_table = register_dissector_table("sctp.port",
+ "SCTP port", FT_UINT16, BASE_DEC);
+ sctp_ppi_dissector_table = register_dissector_table("sctp.ppi",
+ "SCTP payload protocol identifier", FT_UINT32, BASE_HEX);
};
diff --git a/packet-sua.c b/packet-sua.c
index a1ba464030..8d049f5ed4 100644
--- a/packet-sua.c
+++ b/packet-sua.c
@@ -6,7 +6,7 @@
*
* Copyright 2000, Michael Tüxen <Michael.Tuexen@icn.siemens.de>
*
- * $Id: packet-sua.c,v 1.2 2001/12/03 03:59:39 guy Exp $
+ * $Id: packet-sua.c,v 1.3 2001/12/08 06:41:42 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -2744,7 +2744,9 @@ proto_register_sua(void)
proto_register_subtree_array(ett, array_length(ett));
sua_module = prefs_register_protocol(proto_sua, NULL);
- sua_light_dissector_table = register_dissector_table("sual.subsystem_number");
+ sua_light_dissector_table = register_dissector_table("sual.subsystem_number",
+ "SUA Light subsystem number", FT_UINT16,
+ BASE_DEC);
prefs_register_enum_preference(sua_module,
"sua_version",
diff --git a/packet-tcp.c b/packet-tcp.c
index 566e69fcb7..ce62e63037 100644
--- a/packet-tcp.c
+++ b/packet-tcp.c
@@ -1,7 +1,7 @@
/* packet-tcp.c
* Routines for TCP packet disassembly
*
- * $Id: packet-tcp.c,v 1.121 2001/12/05 08:20:30 guy Exp $
+ * $Id: packet-tcp.c,v 1.122 2001/12/08 06:41:42 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -1210,7 +1210,8 @@ proto_register_tcp(void)
proto_register_subtree_array(ett, array_length(ett));
/* subdissector code */
- subdissector_table = register_dissector_table("tcp.port");
+ subdissector_table = register_dissector_table("tcp.port",
+ "TCP port", FT_UINT16, BASE_DEC);
register_heur_dissector_list("tcp", &heur_subdissector_list);
/* Register configuration preferences */
diff --git a/packet-udp.c b/packet-udp.c
index 7a89441a8b..4bb5657121 100644
--- a/packet-udp.c
+++ b/packet-udp.c
@@ -1,7 +1,7 @@
/* packet-udp.c
* Routines for UDP packet disassembly
*
- * $Id: packet-udp.c,v 1.98 2001/12/03 08:47:28 guy Exp $
+ * $Id: packet-udp.c,v 1.99 2001/12/08 06:41:42 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -267,7 +267,8 @@ proto_register_udp(void)
proto_register_subtree_array(ett, array_length(ett));
/* subdissector code */
- udp_dissector_table = register_dissector_table("udp.port");
+ udp_dissector_table = register_dissector_table("udp.port",
+ "UDP port", FT_UINT16, BASE_DEC);
register_heur_dissector_list("udp", &heur_subdissector_list);
/* Register configuration preferences */
diff --git a/packet-vines.c b/packet-vines.c
index 76c905c4b7..144dfc1672 100644
--- a/packet-vines.c
+++ b/packet-vines.c
@@ -1,7 +1,7 @@
/* packet-vines.c
* Routines for Banyan VINES protocol packet disassembly
*
- * $Id: packet-vines.c,v 1.36 2001/12/03 03:59:40 guy Exp $
+ * $Id: packet-vines.c,v 1.37 2001/12/08 06:41:42 guy Exp $
*
* Don Lafontaine <lafont02@cn.ca>
*
@@ -336,7 +336,8 @@ proto_register_vines(void)
proto_register_subtree_array(ett, array_length(ett));
/* subdissector code */
- vines_dissector_table = register_dissector_table("vines.proto");
+ vines_dissector_table = register_dissector_table("vines.proto",
+ "Vines protocol", FT_UINT8, BASE_HEX);
register_dissector("vines", dissect_vines, proto_vines);
vines_handle = find_dissector("vines");
diff --git a/packet-wsp.c b/packet-wsp.c
index a0547b5448..522e610606 100644
--- a/packet-wsp.c
+++ b/packet-wsp.c
@@ -2,7 +2,7 @@
*
* Routines to dissect WSP component of WAP traffic.
*
- * $Id: packet-wsp.c,v 1.48 2001/12/07 11:10:52 guy Exp $
+ * $Id: packet-wsp.c,v 1.49 2001/12/08 06:41:42 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -4220,7 +4220,8 @@ proto_register_wsp(void)
register_dissector("wsp-co", dissect_wsp_fromwap_co, proto_wsp);
register_dissector("wsp-cl", dissect_wsp_fromwap_cl, proto_wsp);
- wsp_dissector_table = register_dissector_table("wsp.content_type.type");
+ wsp_dissector_table = register_dissector_table("wsp.content_type.type",
+ "WSP content type", FT_UINT8, BASE_HEX);
register_heur_dissector_list("wsp", &heur_subdissector_list);
wsp_fromudp_handle = create_dissector_handle(dissect_wsp_fromudp,
diff --git a/packet-x25.c b/packet-x25.c
index 7d7c0c1792..eff0233efe 100644
--- a/packet-x25.c
+++ b/packet-x25.c
@@ -2,7 +2,7 @@
* Routines for x25 packet disassembly
* Olivier Abad <oabad@cybercable.fr>
*
- * $Id: packet-x25.c,v 1.60 2001/12/05 08:43:26 guy Exp $
+ * $Id: packet-x25.c,v 1.61 2001/12/08 06:41:42 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -2253,7 +2253,8 @@ proto_register_x25(void)
proto_register_subtree_array(ett, array_length(ett));
register_init_routine(&reinit_x25_hashtable);
- x25_subdissector_table = register_dissector_table("x.25.spi");
+ x25_subdissector_table = register_dissector_table("x.25.spi",
+ "X.25 secondary protocol identifier", FT_UINT8, BASE_HEX);
register_heur_dissector_list("x.25", &x25_heur_subdissector_list);
register_dissector("x.25", dissect_x25, proto_x25);
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-24 10:52:33 +0000