From f2c276ec2160e98377ba5509b95125f0414c0520 Mon Sep 17 00:00:00 2001 From: Chris Maynard Date: Wed, 11 Sep 2013 21:37:58 +0000 Subject: Change the name of the Cisco HDLC dissector table from chdlctype to chdlc.protocol and change the UI name to match. It is by far much more common to name the tables after the field than to pick another name. svn path=/trunk/; revision=51958 --- epan/dissectors/packet-ip.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'epan/dissectors/packet-ip.c') diff --git a/epan/dissectors/packet-ip.c b/epan/dissectors/packet-ip.c index f3f3abb854..c4f27fbb03 100644 --- a/epan/dissectors/packet-ip.c +++ b/epan/dissectors/packet-ip.c @@ -2428,10 +2428,10 @@ dissect_ip_heur(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data { int length, tot_length; guint8 oct, version, ihl; - + /* - 0 1 2 3 - 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 + 0 1 2 3 + 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ |Version| IHL |Type of Service| Total Length | +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ @@ -2450,8 +2450,8 @@ dissect_ip_heur(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data /* 3. IPv6 Header Format - 0 1 2 3 - 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 + 0 1 2 3 + 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ |Version| Traffic Class | Flow Label | +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ @@ -3062,7 +3062,7 @@ proto_reg_handoff_ip(void) dissector_add_uint("llc.dsap", SAP_IP, ip_handle); dissector_add_uint("ip.proto", IP_PROTO_IPIP, ip_handle); dissector_add_uint("null.type", BSD_AF_INET, ip_handle); - dissector_add_uint("chdlctype", ETHERTYPE_IP, ip_handle); + dissector_add_uint("chdlc.protocol", ETHERTYPE_IP, ip_handle); dissector_add_uint("osinl.excl", NLPID_IP, ip_handle); dissector_add_uint("fr.ietf", NLPID_IP, ip_handle); dissector_add_uint("x.25.spi", NLPID_IP, ip_handle); -- cgit v1.2.3