diff options
author | Jeff Morriss <jeff.morriss.ws@gmail.com> | 2013-06-28 13:04:01 +0000 |
---|---|---|
committer | Jeff Morriss <jeff.morriss.ws@gmail.com> | 2013-06-28 13:04:01 +0000 |
commit | 8d29106ffba430b423ac28fa393e70136fd3d9fe (patch) | |
tree | f7fbff6e55f1672b8e174f6a373fe4c46956ece6 /epan | |
parent | 0d75d64949c1adaeccde663b295ab819781a400c (diff) |
From Dirk via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8850 :
The attached patch fixes the integer type of the WCCP identity mask value.
This is a bitmask which should be printed as hex, it doesn't make sense to
print it as an IPv4 address. See
http://tools.ietf.org/id/draft-wilson-wrec-wccp-v2-01.txt section 5.7.7 and
the attached capture file as an example.
The current draft http://tools.ietf.org/html/draft-mclaggan-wccp-v2rev1-00#section-6.15
doesn't mention "mask" in the names of the field any more, but the description
still describes them as mask values.
svn path=/trunk/; revision=50211
Diffstat (limited to 'epan')
-rw-r--r-- | epan/dissectors/packet-wccp.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/epan/dissectors/packet-wccp.c b/epan/dissectors/packet-wccp.c index 34b1fe36a1..89403b9d75 100644 --- a/epan/dissectors/packet-wccp.c +++ b/epan/dissectors/packet-wccp.c @@ -3305,19 +3305,19 @@ proto_register_wccp(void) NULL, HFILL } }, { &hf_mask_element_src_ip, - { "Source Address Mask", "wccp.mask_element.src_ip", FT_UINT32, BASE_CUSTOM, wccp_fmt_ipadddress, 0x0, + { "Source Address Mask", "wccp.mask_element.src_ip", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL } }, { &hf_mask_element_dest_ip, - { "Destination Address Mask", "wccp.mask_element.dest_ip", FT_UINT32, BASE_CUSTOM, wccp_fmt_ipadddress, 0x0, + { "Destination Address Mask", "wccp.mask_element.dest_ip", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL } }, { &hf_mask_element_src_port, - { "Source Port Mask", "wccp.mask_element.src_port", FT_UINT16, BASE_DEC, NULL, 0x0, + { "Source Port Mask", "wccp.mask_element.src_port", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL } }, { &hf_mask_element_dest_port, - { "Destination Port Mask", "wccp.mask_element.dest_port", FT_UINT16, BASE_DEC, NULL, 0x0, + { "Destination Port Mask", "wccp.mask_element.dest_port", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL } }, { &hf_alt_assignment_info_assignment_type, |