diff options
author | Yehonatan Zecharia <yonti95@gmail.com> | 2020-08-24 10:52:16 +0300 |
---|---|---|
committer | Yehonatan Zecharia <yonti95@gmail.com> | 2020-08-24 17:10:31 +0000 |
commit | d75ebf11395a7ff6d0f4c53d1fc4c35e6ce8d55d (patch) | |
tree | 51f46a542e9a8daa6442577d844dc8f2a82876c8 /epan/dissectors/packet-btmesh.c | |
parent | c2f316dfeaf5473c285906cc98f1daac9bc6a4e2 (diff) |
Move btmesh frag items inside gcrypt version #if
Diffstat (limited to 'epan/dissectors/packet-btmesh.c')
-rw-r--r-- | epan/dissectors/packet-btmesh.c | 76 |
1 files changed, 38 insertions, 38 deletions
diff --git a/epan/dissectors/packet-btmesh.c b/epan/dissectors/packet-btmesh.c index 2fff14068c..7a6f4b7d73 100644 --- a/epan/dissectors/packet-btmesh.c +++ b/epan/dissectors/packet-btmesh.c @@ -1122,6 +1122,44 @@ static int * const config_heartbeat_publication_status_features_headers[] = { NULL }; +static const fragment_items btmesh_segmented_access_frag_items = { + &ett_btmesh_segmented_access_fragments, + &ett_btmesh_segmented_access_fragment, + + &hf_btmesh_segmented_access_fragments, + &hf_btmesh_segmented_access_fragment, + &hf_btmesh_segmented_access_fragment_overlap, + &hf_btmesh_segmented_access_fragment_overlap_conflict, + &hf_btmesh_segmented_access_fragment_multiple_tails, + &hf_btmesh_segmented_access_fragment_too_long_fragment, + &hf_btmesh_segmented_access_fragment_error, + &hf_btmesh_segmented_access_fragment_count, + NULL, + &hf_btmesh_segmented_access_reassembled_length, + /* Reassembled data field */ + NULL, + "fragments" +}; + +static const fragment_items btmesh_segmented_control_frag_items = { + &ett_btmesh_segmented_control_fragments, + &ett_btmesh_segmented_control_fragment, + + &hf_btmesh_segmented_control_fragments, + &hf_btmesh_segmented_control_fragment, + &hf_btmesh_segmented_control_fragment_overlap, + &hf_btmesh_segmented_control_fragment_overlap_conflict, + &hf_btmesh_segmented_control_fragment_multiple_tails, + &hf_btmesh_segmented_control_fragment_too_long_fragment, + &hf_btmesh_segmented_control_fragment_error, + &hf_btmesh_segmented_control_fragment_count, + NULL, + &hf_btmesh_segmented_control_reassembled_length, + /* Reassembled data field */ + NULL, + "fragments" +}; + #endif static const value_string btmesh_status_code_vals[] = { @@ -1211,44 +1249,6 @@ static const value_string btmesh_model_vals[] = { static reassembly_table upper_transport_reassembly_table; -static const fragment_items btmesh_segmented_access_frag_items = { - &ett_btmesh_segmented_access_fragments, - &ett_btmesh_segmented_access_fragment, - - &hf_btmesh_segmented_access_fragments, - &hf_btmesh_segmented_access_fragment, - &hf_btmesh_segmented_access_fragment_overlap, - &hf_btmesh_segmented_access_fragment_overlap_conflict, - &hf_btmesh_segmented_access_fragment_multiple_tails, - &hf_btmesh_segmented_access_fragment_too_long_fragment, - &hf_btmesh_segmented_access_fragment_error, - &hf_btmesh_segmented_access_fragment_count, - NULL, - &hf_btmesh_segmented_access_reassembled_length, - /* Reassembled data field */ - NULL, - "fragments" -}; - -static const fragment_items btmesh_segmented_control_frag_items = { - &ett_btmesh_segmented_control_fragments, - &ett_btmesh_segmented_control_fragment, - - &hf_btmesh_segmented_control_fragments, - &hf_btmesh_segmented_control_fragment, - &hf_btmesh_segmented_control_fragment_overlap, - &hf_btmesh_segmented_control_fragment_overlap_conflict, - &hf_btmesh_segmented_control_fragment_multiple_tails, - &hf_btmesh_segmented_control_fragment_too_long_fragment, - &hf_btmesh_segmented_control_fragment_error, - &hf_btmesh_segmented_control_fragment_count, - NULL, - &hf_btmesh_segmented_control_reassembled_length, - /* Reassembled data field */ - NULL, - "fragments" -}; - typedef struct _upper_transport_fragment_key { guint16 src; guint16 seq0; |