This patch adds support for dissecting CGMP that goes directly over
EthernetII and corrects the test for IS-IS virtual link. Both were
noticed when looking at local traffic at the Uni.
The display filter problem occurs when trying to filter with
names. For example "ip.addr == 130.230.52.1" works, but "ip.addr ==
broker-gw" fails even if names are supported. The error message is
"The string "-" was unexpected in this context." and comes from
epan/dfilter/grammar.c. Maybe someone can take a look at this?
Index: etypes.h
===================================================================
RCS file: /cvsroot/ethereal/etypes.h,v
retrieving revision 1.23
diff -u -r1.23 etypes.h
--- etypes.h 2002/02/17 00:16:19 1.23
+++ etypes.h 2002/03/23 18:10:36
@@ -56,6 +56,10 @@
#define ETHERTYPE_TRAIN 0x1984
#endif
+#ifndef ETHERTYPE_CGMP
+#define ETHERTYPE_CGMP 0x2001
+#endif
+
#ifndef ETHERTYPE_3C_NBP_DGRAM
#define ETHERTYPE_3C_NBP_DGRAM 0x3c07
#endif
Index: packet-cgmp.c
===================================================================
RCS file: /cvsroot/ethereal/packet-cgmp.c,v
retrieving revision 1.14
diff -u -r1.14 packet-cgmp.c
--- packet-cgmp.c 2002/01/24 09:20:47 1.14
+++ packet-cgmp.c 2002/03/23 18:10:36
@@ -143,4 +143,5 @@
cgmp_handle = create_dissector_handle(dissect_cgmp, proto_cgmp);
dissector_add("llc.cisco_pid", 0x2001, cgmp_handle);
+ dissector_add("ethertype", 0x2001, cgmp_handle);
}
Index: packet-ethertype.c
===================================================================
RCS file: /cvsroot/ethereal/packet-ethertype.c,v
retrieving revision 1.26
diff -u -r1.26 packet-ethertype.c
--- packet-ethertype.c 2002/02/17 00:16:19 1.26
+++ packet-ethertype.c 2002/03/23 18:10:37
@@ -76,6 +76,7 @@
{ETHERTYPE_DEC_CUST, "DEC Customer use" },
{ETHERTYPE_DEC_SCA, "DEC LAVC/SCA" },
{ETHERTYPE_ETHBRIDGE, "Transparent Ethernet bridging" },
+ {ETHERTYPE_CGMP, "Cisco Group Management Protocol" },
/*
* NDISWAN on Windows translates Ethernet frames from higher-level
Index: packet-isis-lsp.c
===================================================================
RCS file: /cvsroot/ethereal/packet-isis-lsp.c,v
retrieving revision 1.25
diff -u -r1.25 packet-isis-lsp.c
--- packet-isis-lsp.c 2002/01/21 07:36:36 1.25
+++ packet-isis-lsp.c 2002/03/23 18:10:38
@@ -967,7 +967,7 @@
if ( show_virtual ) {
/* virtual path flag */
proto_tree_add_text ( tree, tvb, offset, 1,
- tvb_get_guint8(tvb, offset) ? "IsNotVirtual" : "IsVirtual" );
+ tvb_get_guint8(tvb, offset) ? "IsVirtual" : "IsNotVirtual" );
} else {
proto_tree_add_text ( tree, tvb, offset, 1,
"Reserved value 0x%02x, must == 0",
--
Heikki Vatiainen * hessu@xxxxxxxxx
Tampere University of Technology * Tampere, Finland