diff options
| author | Andrii Vladyka <a.vladyka@ukr.net> | 2019-05-01 23:24:32 +0300 |
|---|---|---|
| committer | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2019-05-14 14:57:53 +0000 |
| commit | 07aa2a8e4994b9daa396d9f03a098c0e684ea7ad (patch) | |
| tree | 15dd57cfbfd019e87fa2b06779c04d78ee5cb6c8 /epan/dissectors/packet-docsis.c | |
| parent | 88096e1fc5ce41ecf1c8ab8a642c237c121f5444 (diff) | |
docsis: fix for encrypted DOCSIS PDU packets do not match the filter 'eth.dst'
Bug: 15731
Change-Id: I6c9dd8ca722679dd6e4cc91e6f3ca81162307f56
Reviewed-on: https://code.wireshark.org/review/33042
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-docsis.c')
| -rw-r--r-- | epan/dissectors/packet-docsis.c | 48 |
1 files changed, 7 insertions, 41 deletions
diff --git a/epan/dissectors/packet-docsis.c b/epan/dissectors/packet-docsis.c index e043d52ad2..6475cf0df4 100644 --- a/epan/dissectors/packet-docsis.c +++ b/epan/dissectors/packet-docsis.c @@ -259,15 +259,6 @@ static const value_string unique_no_phs[] = { { 0, NULL } }; -static const true_false_string ig_tfs = { - "Group address (multicast/broadcast)", - "Individual address (unicast)" -}; -static const true_false_string lg_tfs = { - "Locally administered address (this is NOT the factory default)", - "Globally unique address (factory default)" -}; - /* Fragmentation Flags / Sequence */ static guint8 frag_flags; static guint8 frag_seq; @@ -1178,38 +1169,6 @@ proto_register_docsis (void) FT_UINT8, BASE_NONE, VALS(local_proto_checksum_vals), 0x0, NULL, HFILL} }, - { &hf_docsis_dst, - { "Destination", "docsis.dst_mac", - FT_ETHER, BASE_NONE, NULL, 0x0, - "Destination Hardware Address", HFILL } - }, - { &hf_docsis_dst_resolved, - { "Destination (resolved)", "docsis.dst_mac_resolved", - FT_STRING, BASE_NONE, NULL, 0x0, - "Destination Hardware Address (resolved)", HFILL } - }, - { &hf_docsis_src, - { "Source", "docsis.src_mac", - FT_ETHER, BASE_NONE, NULL, 0x0, - "Source Hardware Address", HFILL } - }, - { &hf_docsis_src_resolved, - { "Source (resolved)", "docsis.src_mac_resolved", - FT_STRING, BASE_NONE, NULL, 0x0, - "Source Hardware Address (resolved)", HFILL } - }, - { &hf_docsis_lg, - { "LG bit", "docsis.mac_lg", - FT_BOOLEAN, 24, - TFS(&lg_tfs), 0x020000, - "Specifies if this is a locally administered or globally unique (IEEE assigned) address", HFILL }}, - - { &hf_docsis_ig, - { "IG bit", "docsis.mac_ig", - FT_BOOLEAN, 24, - TFS(&ig_tfs), 0x010000, - "Specifies if this is an individual (unicast) or group (broadcast/multicast) address", HFILL } - }, { &hf_docsis_encrypted_payload, { "Encrypted Payload", "docsis.encrypted_payload", FT_BYTES, BASE_NONE, NULL, 0x0, @@ -1270,6 +1229,13 @@ proto_reg_handoff_docsis (void) { dissector_add_uint ("wtap_encap", WTAP_ENCAP_DOCSIS, docsis_handle); + hf_docsis_dst = proto_registrar_get_id_byname ("eth.dst"); + hf_docsis_dst_resolved = proto_registrar_get_id_byname ("eth.dst_resolved"); + hf_docsis_src = proto_registrar_get_id_byname ("eth.src"); + hf_docsis_src_resolved = proto_registrar_get_id_byname ("eth.src_resolved"); + hf_docsis_lg = proto_registrar_get_id_byname ("eth.lg"); + hf_docsis_ig = proto_registrar_get_id_byname ("eth.ig"); + docsis_mgmt_handle = find_dissector ("docsis_mgmt"); eth_withoutfcs_handle = find_dissector_add_dependency("eth_withoutfcs", proto_docsis); } |