diff options
author | Bill Meier <wmeier@newsguy.com> | 2014-10-03 10:13:07 -0400 |
---|---|---|
committer | Bill Meier <wmeier@newsguy.com> | 2014-10-03 14:28:42 +0000 |
commit | bb5daa6ae9070a1093b5fbc8f078d9eaf101d769 (patch) | |
tree | 9af6b8bd3bbcaa75ea90adf0709069d245e14c2d /epan/dissectors/packet-wcp.c | |
parent | 451de17929eaa48af07bfc6154a9603318121562 (diff) |
Add editor modelines; Adjust whitespace as needed.
Change-Id: I391cdf80a6e4ae5b0f4068e0500a90d013588f8a
Reviewed-on: https://code.wireshark.org/review/4442
Reviewed-by: Bill Meier <wmeier@newsguy.com>
Diffstat (limited to 'epan/dissectors/packet-wcp.c')
-rw-r--r-- | epan/dissectors/packet-wcp.c | 239 |
1 files changed, 126 insertions, 113 deletions
diff --git a/epan/dissectors/packet-wcp.c b/epan/dissectors/packet-wcp.c index bc6b598ad1..03b1daa569 100644 --- a/epan/dissectors/packet-wcp.c +++ b/epan/dissectors/packet-wcp.c @@ -202,10 +202,10 @@ static dissector_handle_t fr_uncompressed_handle; static const value_string cmd_string[] = { {0, "Compressed Data"}, - {1, "Uncompressed Data"}, - {15, "Extended"}, + {1, "Uncompressed Data"}, + {15, "Extended"}, { 0, NULL } - }; +}; static const value_string ext_cmd_string[] = { {0, "Per Packet Compression"}, @@ -215,7 +215,7 @@ static const value_string ext_cmd_string[] = { {0x0a, "Init Ack"}, { 0, NULL } - }; +}; @@ -609,124 +609,137 @@ static tvbuff_t *wcp_uncompress( tvbuff_t *src_tvb, int offset, packet_info *pin void proto_register_wcp(void) { - static hf_register_info hf[] = { - { &hf_wcp_cmd, - { "Command", "wcp.cmd", FT_UINT8, BASE_HEX, VALS(cmd_string), WCP_CMD, - "Compression Command", HFILL }}, - { &hf_wcp_ext_cmd, - { "Extended Command", "wcp.ext_cmd", FT_UINT8, BASE_HEX, VALS(ext_cmd_string), WCP_EXT_CMD, - "Extended Compression Command", HFILL }}, - { &hf_wcp_seq, - { "SEQ", "wcp.seq", FT_UINT16, BASE_HEX, NULL, WCP_SEQ, - "Sequence Number", HFILL }}, - { &hf_wcp_chksum, - { "Checksum", "wcp.checksum", FT_UINT8, BASE_DEC, NULL, 0, - "Packet Checksum", HFILL }}, - { &hf_wcp_tid, - { "TID", "wcp.tid", FT_UINT16, BASE_DEC, NULL, 0, - NULL, HFILL }}, - { &hf_wcp_rev, - { "Revision", "wcp.rev", FT_UINT8, BASE_DEC, NULL, 0, - NULL, HFILL }}, - { &hf_wcp_init, - { "Initiator", "wcp.init", FT_UINT8, BASE_DEC, NULL, 0, - NULL, HFILL }}, - { &hf_wcp_seq_size, - { "Seq Size", "wcp.seq_size", FT_UINT8, BASE_DEC, NULL, 0, - "Sequence Size", HFILL }}, - { &hf_wcp_alg_cnt, - { "Alg Count", "wcp.alg_cnt", FT_UINT8, BASE_DEC, NULL, 0, - "Algorithm Count", HFILL }}, - { &hf_wcp_alg_a, - { "Alg 1", "wcp.alg1", FT_UINT8, BASE_DEC, NULL, 0, - "Algorithm #1", HFILL }}, - { &hf_wcp_alg_b, - { "Alg 2", "wcp.alg2", FT_UINT8, BASE_DEC, NULL, 0, - "Algorithm #2", HFILL }}, - { &hf_wcp_alg_c, - { "Alg 3", "wcp.alg3", FT_UINT8, BASE_DEC, NULL, 0, - "Algorithm #3", HFILL }}, - { &hf_wcp_alg_d, - { "Alg 4", "wcp.alg4", FT_UINT8, BASE_DEC, NULL, 0, - "Algorithm #4", HFILL }}, - { &hf_wcp_alg, - { "Alg", "wcp.alg", FT_UINT8, BASE_DEC, NULL, 0, - "Algorithm", HFILL }}, + static hf_register_info hf[] = { + { &hf_wcp_cmd, + { "Command", "wcp.cmd", FT_UINT8, BASE_HEX, VALS(cmd_string), WCP_CMD, + "Compression Command", HFILL }}, + { &hf_wcp_ext_cmd, + { "Extended Command", "wcp.ext_cmd", FT_UINT8, BASE_HEX, VALS(ext_cmd_string), WCP_EXT_CMD, + "Extended Compression Command", HFILL }}, + { &hf_wcp_seq, + { "SEQ", "wcp.seq", FT_UINT16, BASE_HEX, NULL, WCP_SEQ, + "Sequence Number", HFILL }}, + { &hf_wcp_chksum, + { "Checksum", "wcp.checksum", FT_UINT8, BASE_DEC, NULL, 0, + "Packet Checksum", HFILL }}, + { &hf_wcp_tid, + { "TID", "wcp.tid", FT_UINT16, BASE_DEC, NULL, 0, + NULL, HFILL }}, + { &hf_wcp_rev, + { "Revision", "wcp.rev", FT_UINT8, BASE_DEC, NULL, 0, + NULL, HFILL }}, + { &hf_wcp_init, + { "Initiator", "wcp.init", FT_UINT8, BASE_DEC, NULL, 0, + NULL, HFILL }}, + { &hf_wcp_seq_size, + { "Seq Size", "wcp.seq_size", FT_UINT8, BASE_DEC, NULL, 0, + "Sequence Size", HFILL }}, + { &hf_wcp_alg_cnt, + { "Alg Count", "wcp.alg_cnt", FT_UINT8, BASE_DEC, NULL, 0, + "Algorithm Count", HFILL }}, + { &hf_wcp_alg_a, + { "Alg 1", "wcp.alg1", FT_UINT8, BASE_DEC, NULL, 0, + "Algorithm #1", HFILL }}, + { &hf_wcp_alg_b, + { "Alg 2", "wcp.alg2", FT_UINT8, BASE_DEC, NULL, 0, + "Algorithm #2", HFILL }}, + { &hf_wcp_alg_c, + { "Alg 3", "wcp.alg3", FT_UINT8, BASE_DEC, NULL, 0, + "Algorithm #3", HFILL }}, + { &hf_wcp_alg_d, + { "Alg 4", "wcp.alg4", FT_UINT8, BASE_DEC, NULL, 0, + "Algorithm #4", HFILL }}, + { &hf_wcp_alg, + { "Alg", "wcp.alg", FT_UINT8, BASE_DEC, NULL, 0, + "Algorithm", HFILL }}, #if 0 - { &hf_wcp_rexmit, - { "Rexmit", "wcp.rexmit", FT_UINT8, BASE_DEC, NULL, 0, - "Retransmit", HFILL }}, + { &hf_wcp_rexmit, + { "Rexmit", "wcp.rexmit", FT_UINT8, BASE_DEC, NULL, 0, + "Retransmit", HFILL }}, #endif - { &hf_wcp_hist_size, - { "History", "wcp.hist", FT_UINT8, BASE_DEC, NULL, 0, - "History Size", HFILL }}, - { &hf_wcp_ppc, - { "PerPackComp", "wcp.ppc", FT_UINT8, BASE_DEC, NULL, 0, - "Per Packet Compression", HFILL }}, - { &hf_wcp_pib, - { "PIB", "wcp.pib", FT_UINT8, BASE_DEC, NULL, 0, - NULL, HFILL }}, - { &hf_wcp_compressed_data, - { "Compressed Data", "wcp.compressed_data", FT_NONE, BASE_NONE, NULL, 0, - "Raw compressed data", HFILL }}, - { &hf_wcp_comp_bits, - { "Compress Flag", "wcp.flag", FT_UINT8, BASE_HEX, NULL, 0, - "Compressed byte flag", HFILL }}, + { &hf_wcp_hist_size, + { "History", "wcp.hist", FT_UINT8, BASE_DEC, NULL, 0, + "History Size", HFILL }}, + { &hf_wcp_ppc, + { "PerPackComp", "wcp.ppc", FT_UINT8, BASE_DEC, NULL, 0, + "Per Packet Compression", HFILL }}, + { &hf_wcp_pib, + { "PIB", "wcp.pib", FT_UINT8, BASE_DEC, NULL, 0, + NULL, HFILL }}, + { &hf_wcp_compressed_data, + { "Compressed Data", "wcp.compressed_data", FT_NONE, BASE_NONE, NULL, 0, + "Raw compressed data", HFILL }}, + { &hf_wcp_comp_bits, + { "Compress Flag", "wcp.flag", FT_UINT8, BASE_HEX, NULL, 0, + "Compressed byte flag", HFILL }}, #if 0 - { &hf_wcp_comp_marker, - { "Compress Marker", "wcp.mark", FT_UINT8, BASE_DEC, NULL, 0, - "Compressed marker", HFILL }}, + { &hf_wcp_comp_marker, + { "Compress Marker", "wcp.mark", FT_UINT8, BASE_DEC, NULL, 0, + "Compressed marker", HFILL }}, #endif - { &hf_wcp_offset, - { "Source offset", "wcp.off", FT_UINT16, BASE_HEX, NULL, WCP_OFFSET_MASK, - "Data source offset", HFILL }}, - { &hf_wcp_short_len, - { "Compress Length", "wcp.short_len", FT_UINT8, BASE_HEX, NULL, 0xf0, - "Compressed length", HFILL }}, - { &hf_wcp_long_len, - { "Compress Length", "wcp.long_len", FT_UINT8, BASE_HEX, NULL, 0, - "Compressed length", HFILL }}, - { &hf_wcp_long_run, - { "Long Compression", "wcp.long_comp", FT_BYTES, BASE_NONE, NULL, 0, - "Long Compression type", HFILL }}, - { &hf_wcp_short_run, - { "Short Compression", "wcp.short_comp", FT_BYTES, BASE_NONE, NULL, 0, - "Short Compression type", HFILL }}, - - }; - - - static gint *ett[] = { - &ett_wcp, - &ett_wcp_comp_data, - &ett_wcp_field, - }; - - static ei_register_info ei[] = { - { &ei_wcp_compressed_data_exceeds, { "wcp.compressed_data.exceeds", PI_MALFORMED, PI_ERROR, "Compressed data exceeds maximum buffer length", EXPFILL }}, - { &ei_wcp_uncompressed_data_exceeds, { "wcp.uncompressed_data.exceeds", PI_MALFORMED, PI_ERROR, "Uncompressed data exceeds maximum buffer length", EXPFILL }}, - }; - - expert_module_t* expert_wcp; - - proto_wcp = proto_register_protocol ("Wellfleet Compression", "WCP", "wcp"); - proto_register_field_array (proto_wcp, hf, array_length(hf)); - proto_register_subtree_array(ett, array_length(ett)); - expert_wcp = expert_register_protocol(proto_wcp); - expert_register_field_array(expert_wcp, ei, array_length(ei)); + { &hf_wcp_offset, + { "Source offset", "wcp.off", FT_UINT16, BASE_HEX, NULL, WCP_OFFSET_MASK, + "Data source offset", HFILL }}, + { &hf_wcp_short_len, + { "Compress Length", "wcp.short_len", FT_UINT8, BASE_HEX, NULL, 0xf0, + "Compressed length", HFILL }}, + { &hf_wcp_long_len, + { "Compress Length", "wcp.long_len", FT_UINT8, BASE_HEX, NULL, 0, + "Compressed length", HFILL }}, + { &hf_wcp_long_run, + { "Long Compression", "wcp.long_comp", FT_BYTES, BASE_NONE, NULL, 0, + "Long Compression type", HFILL }}, + { &hf_wcp_short_run, + { "Short Compression", "wcp.short_comp", FT_BYTES, BASE_NONE, NULL, 0, + "Short Compression type", HFILL }}, + + }; + + + static gint *ett[] = { + &ett_wcp, + &ett_wcp_comp_data, + &ett_wcp_field, + }; + + static ei_register_info ei[] = { + { &ei_wcp_compressed_data_exceeds, { "wcp.compressed_data.exceeds", PI_MALFORMED, PI_ERROR, "Compressed data exceeds maximum buffer length", EXPFILL }}, + { &ei_wcp_uncompressed_data_exceeds, { "wcp.uncompressed_data.exceeds", PI_MALFORMED, PI_ERROR, "Uncompressed data exceeds maximum buffer length", EXPFILL }}, + }; + + expert_module_t* expert_wcp; + + proto_wcp = proto_register_protocol ("Wellfleet Compression", "WCP", "wcp"); + proto_register_field_array (proto_wcp, hf, array_length(hf)); + proto_register_subtree_array(ett, array_length(ett)); + expert_wcp = expert_register_protocol(proto_wcp); + expert_register_field_array(expert_wcp, ei, array_length(ei)); } void proto_reg_handoff_wcp(void) { - dissector_handle_t wcp_handle; + dissector_handle_t wcp_handle; - /* - * Get handle for the Frame Relay (uncompressed) dissector. - */ - fr_uncompressed_handle = find_dissector("fr_uncompressed"); + /* + * Get handle for the Frame Relay (uncompressed) dissector. + */ + fr_uncompressed_handle = find_dissector("fr_uncompressed"); - wcp_handle = create_dissector_handle(dissect_wcp, proto_wcp); - dissector_add_uint("fr.nlpid", NLPID_COMPRESSED, wcp_handle); - dissector_add_uint("ethertype", ETHERTYPE_WCP, wcp_handle); + wcp_handle = create_dissector_handle(dissect_wcp, proto_wcp); + dissector_add_uint("fr.nlpid", NLPID_COMPRESSED, wcp_handle); + dissector_add_uint("ethertype", ETHERTYPE_WCP, wcp_handle); } + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 8 + * tab-width: 8 + * indent-tabs-mode: t + * End: + * + * vi: set shiftwidth=8 tabstop=8 noexpandtab: + * :indentSize=8:tabSize=8:noTabs=false: + */ |