osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

From Kovarththanan Rajaratnam via bug 3548: 

More header_field_info cleanup.

svn path=/trunk/; revision=28772
This commit is contained in:
Stig Bjørlykke 2009-06-19 02:09:52 +00:00
parent 2bba6be84f
commit 9391dce6b2
12 changed files with 399 additions and 399 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
epan/dissectors/packet-isis-snp.c
View File

@ -544,7 +544,7 @@ isis_register_csnp(int proto_isis) {
static hf_register_info hf[] = {
{ &hf_isis_csnp_pdu_length,
{ "PDU length", "isis.csnp.pdu_length", FT_UINT16,
BASE_DEC, NULL, 0x0, "", HFILL }},
BASE_DEC, NULL, 0x0, NULL, HFILL }},
};
static gint *ett[] = {
&ett_isis_csnp,

382
epan/dissectors/packet-isup.c
View File

File diff suppressed because it is too large Load Diff

16
epan/dissectors/packet-iuup.c
View File

@ -889,14 +889,14 @@ void proto_reg_handoff_iuup(void) {
{ &hf_iuup_init_rfci_flow_len[i][7], { "RFCI " #i " Flow 7 Len", "iuup.rfci."#i".flow.7.len", FT_UINT16, BASE_DEC, NULL,0x0,NULL,HFILL}}, \
{ &hf_iuup_init_rfci_li[i], { "RFCI " #i " LI", "iuup.rfci."#i".li", FT_UINT8, BASE_HEX, VALS(iuup_init_rfci_li_vals),0x40,"Length Indicator",HFILL}}, \
{ &hf_iuup_init_rfci_lri[i], { "RFCI " #i " LRI", "iuup.rfci."#i".lri", FT_UINT8, BASE_HEX, VALS(iuup_init_lri_vals),0x80,"Last Record Indicator",HFILL}}, \
{ &hf_iuup_rfci_subflow[i][0], { "RFCI " #i " Flow 0", "iuup.rfci."#i".flow.0", FT_BYTES, BASE_HEX, NULL,0x0,NULL,HFILL}}, \
{ &hf_iuup_rfci_subflow[i][1], { "RFCI " #i " Flow 1", "iuup.rfci."#i".flow.1", FT_BYTES, BASE_HEX, NULL,0x0,NULL,HFILL}}, \
{ &hf_iuup_rfci_subflow[i][2], { "RFCI " #i " Flow 2", "iuup.rfci."#i".flow.2", FT_BYTES, BASE_HEX, NULL,0x0,NULL,HFILL}}, \
{ &hf_iuup_rfci_subflow[i][3], { "RFCI " #i " Flow 3", "iuup.rfci."#i".flow.3", FT_BYTES, BASE_HEX, NULL,0x0,NULL,HFILL}}, \
{ &hf_iuup_rfci_subflow[i][4], { "RFCI " #i " Flow 4", "iuup.rfci."#i".flow.4", FT_BYTES, BASE_HEX, NULL,0x0,NULL,HFILL}}, \
{ &hf_iuup_rfci_subflow[i][5], { "RFCI " #i " Flow 5", "iuup.rfci."#i".flow.5", FT_BYTES, BASE_HEX, NULL,0x0,NULL,HFILL}}, \
{ &hf_iuup_rfci_subflow[i][6], { "RFCI " #i " Flow 6", "iuup.rfci."#i".flow.6", FT_BYTES, BASE_HEX, NULL,0x0,NULL,HFILL}}, \
{ &hf_iuup_rfci_subflow[i][7], { "RFCI " #i " Flow 7", "iuup.rfci."#i".flow.7", FT_BYTES, BASE_HEX, NULL,0x0,NULL,HFILL}}, \
{ &hf_iuup_rfci_subflow[i][0], { "RFCI " #i " Flow 0", "iuup.rfci."#i".flow.0", FT_BYTES, BASE_NONE, NULL,0x0,NULL,HFILL}}, \
{ &hf_iuup_rfci_subflow[i][1], { "RFCI " #i " Flow 1", "iuup.rfci."#i".flow.1", FT_BYTES, BASE_NONE, NULL,0x0,NULL,HFILL}}, \
{ &hf_iuup_rfci_subflow[i][2], { "RFCI " #i " Flow 2", "iuup.rfci."#i".flow.2", FT_BYTES, BASE_NONE, NULL,0x0,NULL,HFILL}}, \
{ &hf_iuup_rfci_subflow[i][3], { "RFCI " #i " Flow 3", "iuup.rfci."#i".flow.3", FT_BYTES, BASE_NONE, NULL,0x0,NULL,HFILL}}, \
{ &hf_iuup_rfci_subflow[i][4], { "RFCI " #i " Flow 4", "iuup.rfci."#i".flow.4", FT_BYTES, BASE_NONE, NULL,0x0,NULL,HFILL}}, \
{ &hf_iuup_rfci_subflow[i][5], { "RFCI " #i " Flow 5", "iuup.rfci."#i".flow.5", FT_BYTES, BASE_NONE, NULL,0x0,NULL,HFILL}}, \
{ &hf_iuup_rfci_subflow[i][6], { "RFCI " #i " Flow 6", "iuup.rfci."#i".flow.6", FT_BYTES, BASE_NONE, NULL,0x0,NULL,HFILL}}, \
{ &hf_iuup_rfci_subflow[i][7], { "RFCI " #i " Flow 7", "iuup.rfci."#i".flow.7", FT_BYTES, BASE_NONE, NULL,0x0,NULL,HFILL}}, \
{ &hf_iuup_init_ipti[i], { "RFCI " #i " IPTI", "iuup.rfci."#i".ipti", FT_UINT8, BASE_HEX, NULL,i%2 ? 0x0F : 0xF0,NULL,HFILL}}

14
epan/dissectors/packet-ositp.c
View File

@ -1751,16 +1751,16 @@ void proto_register_cotp(void)
"No explicit flow control in class 2", HFILL}},
{ &hf_cotp_tpdu_number,
{ "TPDU number", "cotp.tpdu-number", FT_UINT8, BASE_HEX, NULL, 0x7f,
"TPDU number", HFILL}},
NULL, HFILL}},
{ &hf_cotp_tpdu_number_extended,
{ "TPDU number", "cotp.tpdu-number", FT_UINT32, BASE_HEX, NULL, 0x0 /* XXX - 0x7fff? */,
"TPDU number", HFILL}},
NULL, HFILL}},
{ &hf_cotp_next_tpdu_number,
{ "Your TPDU number", "cotp.next-tpdu-number", FT_UINT8, BASE_HEX, NULL, 0x0,
"Your TPDU number", HFILL}},
NULL, HFILL}},
{ &hf_cotp_next_tpdu_number_extended,
{ "Your TPDU number", "cotp.next-tpdu-number", FT_UINT32, BASE_HEX, NULL, 0x0,
"Your TPDU number", HFILL}},
NULL, HFILL}},
{ &hf_cotp_eot,
{ "Last data unit", "cotp.eot", FT_BOOLEAN, 8, TFS(&fragment_descriptions), 0x80,
"Is current TPDU the last data unit of a complete DT TPDU sequence (End of TSDU)?", HFILL}},
@ -1784,10 +1784,10 @@ void proto_register_cotp(void)
"Reassembly error due to illegal segments", HFILL }},
{ &hf_cotp_segment,
{ "COTP Segment", "cotp.segment", FT_FRAMENUM, BASE_NONE, NULL, 0x0,
"COTP Segment", HFILL }},
NULL, HFILL }},
{ &hf_cotp_segments,
{ "COTP Segments", "cotp.segments", FT_NONE, BASE_DEC, NULL, 0x0,
"COTP Segments", HFILL }},
{ "COTP Segments", "cotp.segments", FT_NONE, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
{ &hf_cotp_reassembled_in,
{ "Reassembled COTP in frame", "cotp.reassembled_in", FT_FRAMENUM, BASE_NONE, NULL, 0x0,
"This COTP packet is reassembled in this frame", HFILL }},

12
epan/dissectors/packet-pppoe.c
View File

@ -827,27 +827,27 @@ void proto_register_pppoes(void)
{
{ &hf_pppoes_tags,
{ "PPPoE Tags", "pppoes.tags", FT_NONE, BASE_NONE,
NULL, 0x0, "", HFILL
NULL, 0x0, NULL, HFILL
}
},
{ &hf_pppoes_tag,
{ "Tag", "pppoes.tag", FT_UINT16, BASE_HEX,
VALS(tag_vals), 0x0, "", HFILL
VALS(tag_vals), 0x0, NULL, HFILL
}
},
{ &hf_pppoes_tag_credits,
{ "Credits", "pppoes.tags.credits", FT_BYTES, BASE_HEX,
NULL, 0x0, "", HFILL
{ "Credits", "pppoes.tags.credits", FT_BYTES, BASE_NONE,
NULL, 0x0, NULL, HFILL
}
},
{ &hf_pppoes_tag_credits_fcn,
{ "FCN", "pppoes.tags.credits.fcn", FT_UINT16, BASE_DEC,
NULL, 0x0, "", HFILL
NULL, 0x0, NULL, HFILL
}
},
{ &hf_pppoes_tag_credits_bcn,
{ "BCN", "pppoes.tags.credits.bcn", FT_UINT16, BASE_DEC,
NULL, 0x0, "", HFILL
NULL, 0x0, NULL, HFILL
}
}
};

22
epan/dissectors/packet-rmt-fec.h
View File

@ -97,27 +97,27 @@ struct _fec_ptr
#define FEC_FIELD_ARRAY(base_structure, base_protocol) \
{ &base_structure.header, \
{ "Forward Error Correction (FEC) header", base_protocol ".fec", FT_NONE, BASE_NONE, NULL, 0x0, "", HFILL }}, \
{ "Forward Error Correction (FEC) header", base_protocol ".fec", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }}, \
{ &base_structure.encoding_id, \
{ "FEC Encoding ID", base_protocol ".fec.encoding_id", FT_UINT8, BASE_DEC, VALS(string_fec_encoding_id), 0x0, "", HFILL }}, \
{ "FEC Encoding ID", base_protocol ".fec.encoding_id", FT_UINT8, BASE_DEC, VALS(string_fec_encoding_id), 0x0, NULL, HFILL }}, \
{ &base_structure.instance_id, \
{ "FEC Instance ID", base_protocol ".fec.instance_id", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL }}, \
{ "FEC Instance ID", base_protocol ".fec.instance_id", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, \
{ &base_structure.sbn, \
{ "Source Block Number", base_protocol ".fec.sbn", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }}, \
{ "Source Block Number", base_protocol ".fec.sbn", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, \
{ &base_structure.sbl, \
{ "Source Block Length", base_protocol ".fec.sbl", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }}, \
{ "Source Block Length", base_protocol ".fec.sbl", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, \
{ &base_structure.esi, \
{ "Encoding Symbol ID", base_protocol ".fec.esi", FT_UINT32, BASE_HEX, NULL, 0x0, "", HFILL }}, \
{ "Encoding Symbol ID", base_protocol ".fec.esi", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, \
{ &base_structure.fti_header, \
{ "FEC Object Transmission Information", base_protocol ".fec.fti", FT_NONE, BASE_NONE, NULL, 0x0, "", HFILL }}, \
{ "FEC Object Transmission Information", base_protocol ".fec.fti", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }}, \
{ &base_structure.fti_transfer_length, \
{ "Transfer Length", base_protocol ".fec.fti.transfer_length", FT_UINT64, BASE_DEC, NULL, 0x0, "", HFILL }}, \
{ "Transfer Length", base_protocol ".fec.fti.transfer_length", FT_UINT64, BASE_DEC, NULL, 0x0, NULL, HFILL }}, \
{ &base_structure.fti_encoding_symbol_length, \
{ "Encoding Symbol Length", base_protocol ".fec.fti.encoding_symbol_length", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }}, \
{ "Encoding Symbol Length", base_protocol ".fec.fti.encoding_symbol_length", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, \
{ &base_structure.fti_max_source_block_length, \
{ "Maximum Source Block Length", base_protocol ".fec.fti.max_source_block_length", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }}, \
{ "Maximum Source Block Length", base_protocol ".fec.fti.max_source_block_length", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, \
{ &base_structure.fti_max_number_encoding_symbols, \
{ "Maximum Number of Encoding Symbols", base_protocol ".fec.fti.max_number_encoding_symbols", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }}
{ "Maximum Number of Encoding Symbols", base_protocol ".fec.fti.max_number_encoding_symbols", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}
#define FEC_SUBTREE_ARRAY(base_structure) \
&base_structure.main

40
epan/dissectors/packet-rmt-lct.h
View File

@ -124,45 +124,45 @@ struct _lct_ptr
#define LCT_FIELD_ARRAY(base_structure, base_protocol) \
{ &base_structure.header, \
{ "Layered Coding Transport (LCT) header", base_protocol ".lct", FT_NONE, BASE_NONE, NULL, 0x0, "", HFILL }}, \
{ "Layered Coding Transport (LCT) header", base_protocol ".lct", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }}, \
{ &base_structure.version, \
{ "Version", base_protocol ".lct.version", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL }}, \
{ "Version", base_protocol ".lct.version", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, \
{ &base_structure.fsize_header, \
{ "Field sizes (bytes)", base_protocol ".lct.fsize", FT_NONE, BASE_NONE, NULL, 0x0, "", HFILL }}, \
{ "Field sizes (bytes)", base_protocol ".lct.fsize", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }}, \
{ &base_structure.fsize_cci, \
{ "Congestion Control Information field size", base_protocol ".lct.fsize.cci", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL }}, \
{ "Congestion Control Information field size", base_protocol ".lct.fsize.cci", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, \
{ &base_structure.fsize_tsi, \
{ "Transport Session Identifier field size", base_protocol ".lct.fsize.tsi", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL }}, \
{ "Transport Session Identifier field size", base_protocol ".lct.fsize.tsi", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, \
{ &base_structure.fsize_toi, \
{ "Transport Object Identifier field size", base_protocol ".lct.fsize.toi", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL }}, \
{ "Transport Object Identifier field size", base_protocol ".lct.fsize.toi", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, \
{ &base_structure.flags_header, \
{ "Flags", base_protocol ".lct.flags", FT_NONE, BASE_NONE, NULL, 0x0, "", HFILL }}, \
{ "Flags", base_protocol ".lct.flags", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }}, \
{ &base_structure.flags_sct_present, \
{ "Sender Current Time present flag", base_protocol ".lct.flags.sct_present", FT_BOOLEAN, BASE_NONE, TFS(&boolean_set_notset), 0x0, "", HFILL }}, \
{ "Sender Current Time present flag", base_protocol ".lct.flags.sct_present", FT_BOOLEAN, BASE_NONE, TFS(&boolean_set_notset), 0x0, NULL, HFILL }}, \
{ &base_structure.flags_ert_present, \
{ "Expected Residual Time present flag", base_protocol ".lct.flags.ert_present", FT_BOOLEAN, BASE_NONE, TFS(&boolean_set_notset), 0x0, "", HFILL }}, \
{ "Expected Residual Time present flag", base_protocol ".lct.flags.ert_present", FT_BOOLEAN, BASE_NONE, TFS(&boolean_set_notset), 0x0, NULL, HFILL }}, \
{ &base_structure.flags_close_session, \
{ "Close Session flag", base_protocol ".lct.flags.close_session", FT_BOOLEAN, BASE_NONE, TFS(&boolean_set_notset), 0x0, "", HFILL }}, \
{ "Close Session flag", base_protocol ".lct.flags.close_session", FT_BOOLEAN, BASE_NONE, TFS(&boolean_set_notset), 0x0, NULL, HFILL }}, \
{ &base_structure.flags_close_object, \
{ "Close Object flag", base_protocol ".lct.flags.close_object", FT_BOOLEAN, BASE_NONE, TFS(&boolean_set_notset), 0x0, "", HFILL }}, \
{ "Close Object flag", base_protocol ".lct.flags.close_object", FT_BOOLEAN, BASE_NONE, TFS(&boolean_set_notset), 0x0, NULL, HFILL }}, \
{ &base_structure.hlen, \
{ "Header length", base_protocol ".lct.hlen", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }}, \
{ "Header length", base_protocol ".lct.hlen", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, \
{ &base_structure.codepoint, \
{ "Codepoint", base_protocol ".lct.codepoint", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL }}, \
{ "Codepoint", base_protocol ".lct.codepoint", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, \
{ &base_structure.cci, \
{ "Congestion Control Information", base_protocol ".lct.cci", FT_BYTES, BASE_NONE, NULL, 0x0, "", HFILL }}, \
{ "Congestion Control Information", base_protocol ".lct.cci", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }}, \
{ &base_structure.tsi, \
{ "Transport Session Identifier", base_protocol ".lct.tsi", FT_UINT64, BASE_DEC, NULL, 0x0, "", HFILL }}, \
{ "Transport Session Identifier", base_protocol ".lct.tsi", FT_UINT64, BASE_DEC, NULL, 0x0, NULL, HFILL }}, \
{ &base_structure.toi, \
{ "Transport Object Identifier (up to 64 bites)", base_protocol ".lct.toi", FT_UINT64, BASE_DEC, NULL, 0x0, "", HFILL }}, \
{ "Transport Object Identifier (up to 64 bites)", base_protocol ".lct.toi", FT_UINT64, BASE_DEC, NULL, 0x0, NULL, HFILL }}, \
{ &base_structure.toi_extended, \
{ "Transport Object Identifier (up to 112 bits)", base_protocol ".lct.toi_extended", FT_BYTES, BASE_NONE, NULL, 0x0, "", HFILL }}, \
{ "Transport Object Identifier (up to 112 bits)", base_protocol ".lct.toi_extended", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }}, \
{ &base_structure.sct, \
{ "Sender Current Time", base_protocol ".lct.sct", FT_RELATIVE_TIME, BASE_NONE, NULL, 0x0, "", HFILL }}, \
{ "Sender Current Time", base_protocol ".lct.sct", FT_RELATIVE_TIME, BASE_NONE, NULL, 0x0, NULL, HFILL }}, \
{ &base_structure.ert, \
{ "Expected Residual Time", base_protocol ".lct.ert", FT_RELATIVE_TIME, BASE_NONE, NULL, 0x0, "", HFILL }}, \
{ "Expected Residual Time", base_protocol ".lct.ert", FT_RELATIVE_TIME, BASE_NONE, NULL, 0x0, NULL, HFILL }}, \
{ &base_structure.ext, \
{ "Extension count", base_protocol ".lct.ext", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL }}
{ "Extension count", base_protocol ".lct.ext", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}
#define LCT_SUBTREE_ARRAY(base_structure) \
&base_structure.main, \

100
epan/dissectors/packet-snmp.c
View File

@ -3043,68 +3043,68 @@ void proto_register_snmp(void) {
static hf_register_info hf[] = {
{ &hf_snmp_v3_flags_auth,
{ "Authenticated", "snmp.v3.flags.auth", FT_BOOLEAN, 8,
TFS(&flags_set_truth), TH_AUTH, "", HFILL }},
TFS(&flags_set_truth), TH_AUTH, NULL, HFILL }},
{ &hf_snmp_v3_flags_crypt,
{ "Encrypted", "snmp.v3.flags.crypt", FT_BOOLEAN, 8,
TFS(&flags_set_truth), TH_CRYPT, "", HFILL }},
TFS(&flags_set_truth), TH_CRYPT, NULL, HFILL }},
{ &hf_snmp_v3_flags_report,
{ "Reportable", "snmp.v3.flags.report", FT_BOOLEAN, 8,
TFS(&flags_set_truth), TH_REPORT, "", HFILL }},
TFS(&flags_set_truth), TH_REPORT, NULL, HFILL }},
{ &hf_snmp_engineid_conform, {
"Engine ID Conformance", "snmp.engineid.conform", FT_BOOLEAN, 8,
TFS(&tfs_snmp_engineid_conform), F_SNMP_ENGINEID_CONFORM, "Engine ID RFC3411 Conformance", HFILL }},
{ &hf_snmp_engineid_enterprise, {
"Engine Enterprise ID", "snmp.engineid.enterprise", FT_UINT32, BASE_DEC,
VALS(sminmpec_values), 0, "Engine Enterprise ID", HFILL }},
VALS(sminmpec_values), 0, NULL, HFILL }},
{ &hf_snmp_engineid_format, {
"Engine ID Format", "snmp.engineid.format", FT_UINT8, BASE_DEC,
VALS(snmp_engineid_format_vals), 0, "Engine ID Format", HFILL }},
VALS(snmp_engineid_format_vals), 0, NULL, HFILL }},
{ &hf_snmp_engineid_ipv4, {
"Engine ID Data: IPv4 address", "snmp.engineid.ipv4", FT_IPv4, BASE_NONE,
NULL, 0, "Engine ID Data: IPv4 address", HFILL }},
NULL, 0, NULL, HFILL }},
{ &hf_snmp_engineid_ipv6, {
"Engine ID Data: IPv6 address", "snmp.engineid.ipv6", FT_IPv6, BASE_NONE,
NULL, 0, "Engine ID Data: IPv6 address", HFILL }},
NULL, 0, NULL, HFILL }},
{ &hf_snmp_engineid_mac, {
"Engine ID Data: MAC address", "snmp.engineid.mac", FT_ETHER, BASE_NONE,
NULL, 0, "Engine ID Data: MAC address", HFILL }},
NULL, 0, NULL, HFILL }},
{ &hf_snmp_engineid_text, {
"Engine ID Data: Text", "snmp.engineid.text", FT_STRING, BASE_NONE,
NULL, 0, "Engine ID Data: Text", HFILL }},
NULL, 0, NULL, HFILL }},
{ &hf_snmp_engineid_time, {
"Engine ID Data: Time", "snmp.engineid.time", FT_ABSOLUTE_TIME, BASE_NONE,
NULL, 0, "Engine ID Data: Time", HFILL }},
NULL, 0, NULL, HFILL }},
{ &hf_snmp_engineid_data, {
"Engine ID Data", "snmp.engineid.data", FT_BYTES, BASE_HEX,
NULL, 0, "Engine ID Data", HFILL }},
"Engine ID Data", "snmp.engineid.data", FT_BYTES, BASE_NONE,
NULL, 0, NULL, HFILL }},
{ &hf_snmp_msgAuthentication,
{ "Authentication", "snmp.v3.auth", FT_BOOLEAN, 8,
TFS(&auth_flags), 0, "", HFILL }},
{ "Authentication", "snmp.v3.auth", FT_BOOLEAN, BASE_NONE,
TFS(&auth_flags), 0x0, NULL, HFILL }},
{ &hf_snmp_decryptedPDU, {
"Decrypted ScopedPDU", "snmp.decrypted_pdu", FT_BYTES, BASE_HEX,
"Decrypted ScopedPDU", "snmp.decrypted_pdu", FT_BYTES, BASE_NONE,
NULL, 0, "Decrypted PDU", HFILL }},
{ &hf_snmp_noSuchObject, { "noSuchObject", "snmp.noSuchObject", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
{ &hf_snmp_noSuchInstance, { "noSuchInstance", "snmp.noSuchInstance", FT_NONE, BASE_DEC, NULL, 0, "", HFILL }},
{ &hf_snmp_endOfMibView, { "endOfMibView", "snmp.endOfMibView", FT_NONE, BASE_DEC, NULL, 0, "", HFILL }},
{ &hf_snmp_unSpecified, { "unSpecified", "snmp.unSpecified", FT_NONE, BASE_DEC, NULL, 0, "", HFILL }},
{ &hf_snmp_noSuchObject, { "noSuchObject", "snmp.noSuchObject", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
{ &hf_snmp_noSuchInstance, { "noSuchInstance", "snmp.noSuchInstance", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
{ &hf_snmp_endOfMibView, { "endOfMibView", "snmp.endOfMibView", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
{ &hf_snmp_unSpecified, { "unSpecified", "snmp.unSpecified", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
{ &hf_snmp_integer32_value, { "Value (Integer32)", "snmp.value.int", FT_INT64, BASE_DEC, NULL, 0, "", HFILL }},
{ &hf_snmp_octetstring_value, { "Value (OctetString)", "snmp.value.octets", FT_BYTES, BASE_NONE, NULL, 0, "", HFILL }},
{ &hf_snmp_oid_value, { "Value (OID)", "snmp.value.oid", FT_OID, BASE_NONE, NULL, 0, "", HFILL }},
{ &hf_snmp_null_value, { "Value (Null)", "snmp.value.null", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
{ &hf_snmp_ipv4_value, { "Value (IpAddress)", "snmp.value.ipv4", FT_IPv4, BASE_NONE, NULL, 0, "", HFILL }},
{ &hf_snmp_ipv6_value, { "Value (IpAddress)", "snmp.value.ipv6", FT_IPv6, BASE_NONE, NULL, 0, "", HFILL }},
{ &hf_snmp_anyaddress_value, { "Value (IpAddress)", "snmp.value.addr", FT_BYTES, BASE_DEC, NULL, 0, "", HFILL }},
{ &hf_snmp_unsigned32_value, { "Value (Unsigned32)", "snmp.value.u32", FT_INT64, BASE_DEC, NULL, 0, "", HFILL }},
{ &hf_snmp_gauge32_value, { "Value (Gauge32)", "snmp.value.g32", FT_INT64, BASE_DEC, NULL, 0, "", HFILL }},
{ &hf_snmp_unknown_value, { "Value (Unknown)", "snmp.value.unk", FT_BYTES, BASE_NONE, NULL, 0, "", HFILL }},
{ &hf_snmp_counter_value, { "Value (Counter32)", "snmp.value.counter", FT_UINT64, BASE_DEC, NULL, 0, "", HFILL }},
{ &hf_snmp_big_counter_value, { "Value (Counter64)", "snmp.value.counter", FT_UINT64, BASE_DEC, NULL, 0, "", HFILL }},
{ &hf_snmp_nsap_value, { "Value (NSAP)", "snmp.value.nsap", FT_UINT64, BASE_DEC, NULL, 0, "", HFILL }},
{ &hf_snmp_timeticks_value, { "Value (Timeticks)", "snmp.value.timeticks", FT_UINT64, BASE_DEC, NULL, 0, "", HFILL }},
{ &hf_snmp_opaque_value, { "Value (Opaque)", "snmp.value.opaque", FT_BYTES, BASE_NONE, NULL, 0, "", HFILL }},
{ &hf_snmp_objectname, { "Object Name", "snmp.name", FT_OID, BASE_NONE, NULL, 0, "", HFILL }},
{ &hf_snmp_scalar_instance_index, { "Scalar Instance Index", "snmp.name.index", FT_UINT64, BASE_DEC, NULL, 0, "", HFILL }},
{ &hf_snmp_integer32_value, { "Value (Integer32)", "snmp.value.int", FT_INT64, BASE_DEC, NULL, 0, NULL, HFILL }},
{ &hf_snmp_octetstring_value, { "Value (OctetString)", "snmp.value.octets", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
{ &hf_snmp_oid_value, { "Value (OID)", "snmp.value.oid", FT_OID, BASE_NONE, NULL, 0, NULL, HFILL }},
{ &hf_snmp_null_value, { "Value (Null)", "snmp.value.null", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
{ &hf_snmp_ipv4_value, { "Value (IpAddress)", "snmp.value.ipv4", FT_IPv4, BASE_NONE, NULL, 0, NULL, HFILL }},
{ &hf_snmp_ipv6_value, { "Value (IpAddress)", "snmp.value.ipv6", FT_IPv6, BASE_NONE, NULL, 0, NULL, HFILL }},
{ &hf_snmp_anyaddress_value, { "Value (IpAddress)", "snmp.value.addr", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
{ &hf_snmp_unsigned32_value, { "Value (Unsigned32)", "snmp.value.u32", FT_INT64, BASE_DEC, NULL, 0, NULL, HFILL }},
{ &hf_snmp_gauge32_value, { "Value (Gauge32)", "snmp.value.g32", FT_INT64, BASE_DEC, NULL, 0, NULL, HFILL }},
{ &hf_snmp_unknown_value, { "Value (Unknown)", "snmp.value.unk", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
{ &hf_snmp_counter_value, { "Value (Counter32)", "snmp.value.counter", FT_UINT64, BASE_DEC, NULL, 0, NULL, HFILL }},
{ &hf_snmp_big_counter_value, { "Value (Counter64)", "snmp.value.counter", FT_UINT64, BASE_DEC, NULL, 0, NULL, HFILL }},
{ &hf_snmp_nsap_value, { "Value (NSAP)", "snmp.value.nsap", FT_UINT64, BASE_DEC, NULL, 0, NULL, HFILL }},
{ &hf_snmp_timeticks_value, { "Value (Timeticks)", "snmp.value.timeticks", FT_UINT64, BASE_DEC, NULL, 0, NULL, HFILL }},
{ &hf_snmp_opaque_value, { "Value (Opaque)", "snmp.value.opaque", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
{ &hf_snmp_objectname, { "Object Name", "snmp.name", FT_OID, BASE_NONE, NULL, 0, NULL, HFILL }},
{ &hf_snmp_scalar_instance_index, { "Scalar Instance Index", "snmp.name.index", FT_UINT64, BASE_DEC, NULL, 0, NULL, HFILL }},
@ -3120,7 +3120,7 @@ void proto_register_snmp(void) {
"snmp.Version", HFILL }},
{ &hf_snmp_community,
{ "community", "snmp.community",
FT_STRING, BASE_HEX, NULL, 0,
FT_STRING, BASE_NONE, NULL, 0,
"snmp.OCTET_STRING", HFILL }},
{ &hf_snmp_data,
{ "data", "snmp.data",
@ -3128,7 +3128,7 @@ void proto_register_snmp(void) {
"snmp.PDUs", HFILL }},
{ &hf_snmp_parameters,
{ "parameters", "snmp.parameters",
FT_BYTES, BASE_HEX, NULL, 0,
FT_BYTES, BASE_NONE, NULL, 0,
"snmp.OCTET_STRING", HFILL }},
{ &hf_snmp_datav2u,
{ "datav2u", "snmp.datav2u",
@ -3140,11 +3140,11 @@ void proto_register_snmp(void) {
"snmp.PDUs", HFILL }},
{ &hf_snmp_encrypted,
{ "encrypted", "snmp.encrypted",
FT_BYTES, BASE_HEX, NULL, 0,
FT_BYTES, BASE_NONE, NULL, 0,
"snmp.OCTET_STRING", HFILL }},
{ &hf_snmp_msgAuthoritativeEngineID,
{ "msgAuthoritativeEngineID", "snmp.msgAuthoritativeEngineID",
FT_BYTES, BASE_HEX, NULL, 0,
FT_BYTES, BASE_NONE, NULL, 0,
"snmp.T_msgAuthoritativeEngineID", HFILL }},
{ &hf_snmp_msgAuthoritativeEngineBoots,
{ "msgAuthoritativeEngineBoots", "snmp.msgAuthoritativeEngineBoots",
@ -3156,15 +3156,15 @@ void proto_register_snmp(void) {
"snmp.T_msgAuthoritativeEngineTime", HFILL }},
{ &hf_snmp_msgUserName,
{ "msgUserName", "snmp.msgUserName",
FT_STRING, BASE_HEX, NULL, 0,
FT_STRING, BASE_NONE, NULL, 0,
"snmp.T_msgUserName", HFILL }},
{ &hf_snmp_msgAuthenticationParameters,
{ "msgAuthenticationParameters", "snmp.msgAuthenticationParameters",
FT_BYTES, BASE_HEX, NULL, 0,
FT_BYTES, BASE_NONE, NULL, 0,
"snmp.T_msgAuthenticationParameters", HFILL }},
{ &hf_snmp_msgPrivacyParameters,
{ "msgPrivacyParameters", "snmp.msgPrivacyParameters",
FT_BYTES, BASE_HEX, NULL, 0,
FT_BYTES, BASE_NONE, NULL, 0,
"snmp.T_msgPrivacyParameters", HFILL }},
{ &hf_snmp_msgVersion,
{ "msgVersion", "snmp.msgVersion",
@ -3176,7 +3176,7 @@ void proto_register_snmp(void) {
"snmp.HeaderData", HFILL }},
{ &hf_snmp_msgSecurityParameters,
{ "msgSecurityParameters", "snmp.msgSecurityParameters",
FT_BYTES, BASE_HEX, NULL, 0,
FT_BYTES, BASE_NONE, NULL, 0,
"snmp.T_msgSecurityParameters", HFILL }},
{ &hf_snmp_msgData,
{ "msgData", "snmp.msgData",
@ -3192,7 +3192,7 @@ void proto_register_snmp(void) {
"snmp.INTEGER_484_2147483647", HFILL }},
{ &hf_snmp_msgFlags,
{ "msgFlags", "snmp.msgFlags",
FT_BYTES, BASE_HEX, NULL, 0,
FT_BYTES, BASE_NONE, NULL, 0,
"snmp.T_msgFlags", HFILL }},
{ &hf_snmp_msgSecurityModel,
{ "msgSecurityModel", "snmp.msgSecurityModel",
@ -3204,15 +3204,15 @@ void proto_register_snmp(void) {
"snmp.ScopedPDU", HFILL }},
{ &hf_snmp_encryptedPDU,
{ "encryptedPDU", "snmp.encryptedPDU",
FT_BYTES, BASE_HEX, NULL, 0,
FT_BYTES, BASE_NONE, NULL, 0,
"snmp.T_encryptedPDU", HFILL }},
{ &hf_snmp_contextEngineID,
{ "contextEngineID", "snmp.contextEngineID",
FT_BYTES, BASE_HEX, NULL, 0,
FT_BYTES, BASE_NONE, NULL, 0,
"snmp.SnmpEngineID", HFILL }},
{ &hf_snmp_contextName,
{ "contextName", "snmp.contextName",
FT_BYTES, BASE_HEX, NULL, 0,
FT_BYTES, BASE_NONE, NULL, 0,
"snmp.OCTET_STRING", HFILL }},
{ &hf_snmp_get_request,
{ "get-request", "snmp.get_request",
@ -3352,11 +3352,11 @@ void proto_register_snmp(void) {
"snmp.OBJECT_IDENTIFIER", HFILL }},
{ &hf_snmp_description,
{ "description", "snmp.description",
FT_BYTES, BASE_HEX, NULL, 0,
FT_BYTES, BASE_NONE, NULL, 0,
"snmp.DisplayString", HFILL }},
{ &hf_snmp_password,
{ "password", "snmp.password",
FT_BYTES, BASE_HEX, NULL, 0,
FT_BYTES, BASE_NONE, NULL, 0,
"snmp.OCTET_STRING", HFILL }},
{ &hf_snmp_subtree,
{ "subtree", "snmp.subtree",

2
epan/dissectors/packet-tpncp.c
View File

@ -567,7 +567,7 @@ static gint init_tpncp_data_fields_info(tpncp_data_field_info *data_fields_info,
hf_entr.hfinfo.display = BASE_DEC;
hf_entr.hfinfo.strings = NULL;
hf_entr.hfinfo.bitmask = 0x0;
hf_entr.hfinfo.blurb = "";
hf_entr.hfinfo.blurb = NULL;
hf_entr.hfinfo.id = 0;
hf_entr.hfinfo.parent = 0;
hf_entr.hfinfo.bitshift = 0;

194
epan/dissectors/packet-wlccp.c
View File

@ -3111,7 +3111,7 @@ proto_register_wlccp(void)
{ &hf_wlccp_type,
{ "Message Type", "wlccp.type",
FT_UINT8, BASE_HEX, NULL,
0x0, "Message Type", HFILL }
0x0, NULL, HFILL }
},
{ &hf_wlccp_subtype,
@ -3123,43 +3123,43 @@ proto_register_wlccp(void)
{ &hf_wlccp_base_message_type_0,
{ "Base message type", "wlccp.base_message_type",
FT_UINT8, BASE_HEX_DEC, VALS(wlccp_msg_type_vs_0),
MT_BASE_MSG_TYPE, "Base message type", HFILL }
MT_BASE_MSG_TYPE, NULL, HFILL }
},
{ &hf_wlccp_base_message_type_1,
{ "Base message type", "wlccp.base_message_type",
FT_UINT8, BASE_HEX_DEC, VALS(wlccp_msg_type_vs_1),
MT_BASE_MSG_TYPE, "Base message type", HFILL }
MT_BASE_MSG_TYPE, NULL, HFILL }
},
{ &hf_wlccp_base_message_type_2,
{ "Base message type", "wlccp.base_message_type",
FT_UINT8, BASE_HEX_DEC, VALS(wlccp_msg_type_vs_2),
MT_BASE_MSG_TYPE, "Base message type", HFILL }
MT_BASE_MSG_TYPE, NULL, HFILL }
},
{ &hf_wlccp_base_message_type_3,
{ "Base message type", "wlccp.base_message_type",
FT_UINT8, BASE_HEX_DEC, VALS(wlccp_msg_type_vs_3),
MT_BASE_MSG_TYPE, "Base message type", HFILL }
MT_BASE_MSG_TYPE, NULL, HFILL }
},
{ &hf_wlccp_base_message_type_4,
{ "Base message type", "wlccp.base_message_type",
FT_UINT8, BASE_HEX_DEC, VALS(wlccp_msg_type_vs_4),
MT_BASE_MSG_TYPE, "Base message type", HFILL }
MT_BASE_MSG_TYPE, NULL, HFILL }
},
{ &hf_wlccp_base_message_type_5,
{ "Base message type", "wlccp.base_message_type",
FT_UINT8, BASE_HEX_DEC, VALS(wlccp_msg_type_vs_5),
MT_BASE_MSG_TYPE, "Base message type", HFILL }
MT_BASE_MSG_TYPE, NULL, HFILL }
},
{ &hf_wlccp_base_message_type_unknown,
{ "Base message type", "wlccp.base_message_type",
FT_UINT8, BASE_HEX_DEC, NULL,
MT_BASE_MSG_TYPE, "Base message type", HFILL }
MT_BASE_MSG_TYPE, NULL, HFILL }
},
{ &hf_wlccp_hops,
@ -3171,7 +3171,7 @@ proto_register_wlccp(void)
{ &hf_wlccp_nm_version,
{ "NM Version", "wlccp.nm_version",
FT_UINT8, BASE_DEC, NULL,
0x0, "NM Version", HFILL }
0x0, NULL, HFILL }
},
{ &hf_wlccp_msg_id,
@ -3185,13 +3185,13 @@ proto_register_wlccp(void)
{ &hf_wlccp_flags,
{ "Flags", "wlccp.flags",
FT_UINT16, BASE_HEX, NULL,
0x0, "Flags", HFILL }
0x0, NULL, HFILL }
},
{ &hf_wlccp_rm_flags,
{ "RM Flags", "wlccp.rm_flags",
FT_UINT8, BASE_HEX, NULL,
0x0, "RM Flags", HFILL }
0x0, NULL, HFILL }
},
{ &hf_wlccp_retry_flag,
@ -3305,13 +3305,13 @@ proto_register_wlccp(void)
{ &hf_wlccp_status,
{ "Status", "wlccp.status",
FT_UINT8, BASE_DEC, VALS(wlccp_status_vs),
0x0, "Status", HFILL }
0x0, NULL, HFILL }
},
{ &hf_wlccp_path_init_rsvd,
{ "Reserved", "wlccp.path_init_reserved",
FT_UINT8, BASE_DEC, NULL,
0x0, "Reserved", HFILL }
0x0, NULL, HFILL }
},
{ &hf_wlccp_relay_node_type,
@ -3389,7 +3389,7 @@ proto_register_wlccp(void)
{ &hf_wlccp_scm_election_group,
{ "SCM Election Group", "wlccp.scm_election_group",
FT_UINT8, BASE_DEC, NULL, 0,
"SCM Election Group", HFILL }
NULL, HFILL }
},
{ &hf_wlccp_scm_attach_count,
@ -3401,13 +3401,13 @@ proto_register_wlccp(void)
{ &hf_wlccp_scm_priority_flags,
{ "SCM Priority flags", "wlccp.scm_priority_flags",
FT_UINT8, BASE_HEX, NULL, 0,
"SCM Priority flags", HFILL }
NULL, HFILL }
},
{ &hf_wlccp_scm_priority,
{ "SCM Priority", "wlccp.scm_priority",
FT_UINT8, BASE_DEC, NULL,
F_SCM_PRIORITY, "SCM Priority", HFILL }
F_SCM_PRIORITY, NULL, HFILL }
},
{ &hf_wlccp_scm_preferred_flag,
@ -3419,7 +3419,7 @@ proto_register_wlccp(void)
{ &hf_wlccp_scm_bridge_priority_flags,
{ "Bridge Priority flags", "wlccp.scm_bridge_priority_flags",
FT_UINT8, BASE_DEC, NULL, 0,
"Bridge Priority flags", HFILL }
NULL, HFILL }
},
{ &hf_wlccp_scm_bridge_priority,
@ -3485,55 +3485,55 @@ proto_register_wlccp(void)
{ &hf_wlccp_ap_node_id,
{ "AP Node ID", "wlccp.apnodeid",
FT_NONE, BASE_NONE, NULL, 0,
"AP Node ID", HFILL }
NULL, HFILL }
},
{ &hf_wlccp_ap_node_type,
{ "AP Node Type", "wlccp.apnodetype",
FT_UINT16, BASE_HEX, NULL, 0,
"AP Node Type", HFILL }
NULL, HFILL }
},
{ &hf_wlccp_ap_node_id_address,
{ "AP Node Address", "wlccp.apnodeidaddress",
FT_ETHER, BASE_NONE, NULL, 0,
"AP Node Address", HFILL }
NULL, HFILL }
},
{ &hf_wlccp_aaa_msg_type,
{ "AAA Message Type", "wlccp.aaa_msg_type",
FT_UINT8, BASE_HEX, VALS(wlccp_aaa_msg_type_vs), 0,
"AAA Message Type", HFILL }
NULL, HFILL }
},
{ &hf_wlccp_aaa_auth_type,
{ "AAA Authentication Type", "wlccp.aaa_auth_type",
FT_UINT8, BASE_HEX, VALS(wlccp_eapol_auth_type_vs), 0,
"AAA Authentication Type", HFILL }
NULL, HFILL }
},
{ &hf_wlccp_keymgmt_type,
{ "AAA Key Management Type", "wlccp.aaa_keymgmt_type",
FT_UINT8, BASE_HEX, VALS(wlccp_key_mgmt_type_vs), 0,
"AAA Key Management Type", HFILL }
NULL, HFILL }
},
{ &hf_wlccp_eapol_msg,
{ "EAPOL Message", "wlccp.eapol_msg",
FT_NONE, BASE_NONE, NULL, 0,
"EAPOL Message", HFILL }
NULL, HFILL }
},
{ &hf_wlccp_eapol_version,
{ "EAPOL Version", "wlccp.eapol_version",
FT_UINT8, BASE_DEC, NULL, 0,
"EAPOL Version", HFILL }
NULL, HFILL }
},
{ &hf_wlccp_eapol_type,
{ "EAPOL Type", "wlccp.eapol_type",
FT_UINT8, BASE_HEX, VALS(eapol_type_vs), 0,
"EAPOL Type", HFILL }
NULL, HFILL }
},
{ &hf_wlccp_eap_msg_length,
@ -3544,62 +3544,62 @@ proto_register_wlccp(void)
{ &hf_wlccp_eap_msg,
{ "EAP Message", "wlccp.eap_msg",
FT_BYTES, BASE_HEX, NULL, 0,
"EAP Message", HFILL }
FT_BYTES, BASE_NONE, NULL, 0,
NULL, HFILL }
},
{ &hf_wlccp_cisco_acctg_msg,
{ "Cisco Accounting Message", "wlccp.cisco_acctg_msg",
FT_BYTES, BASE_HEX, NULL, 0,
"Cisco Accounting Message", HFILL }
FT_BYTES, BASE_NONE, NULL, 0,
NULL, HFILL }
},
{ &hf_wlccp_wids_msg_type,
{ "WIDS Message Type", "wlccp.wids_msg_type",
FT_UINT8, BASE_DEC, NULL, 0,
"WIDS Message Type", HFILL }
NULL, HFILL }
},
{ &hf_wlccp_nmconfig,
{ "NM Config", "wlccp.nmconfig",
FT_UINT8, BASE_DEC, NULL, 0,
"NM Config", HFILL }
NULL, HFILL }
},
{ &hf_wlccp_scmstate_change,
{ "SCM State Change", "wlccp.scmstate_change",
FT_UINT8, BASE_DEC, NULL, 0,
"SCM State Change", HFILL }
NULL, HFILL }
},
{ &hf_wlccp_scmstate_change_reason,
{ "SCM State Change Reason", "wlccp.scmstate_change_reason",
FT_UINT8, BASE_DEC, NULL, 0,
"SCM State Change Reason", HFILL }
NULL, HFILL }
},
{ &hf_wlccp_scmattach_state,
{ "SCM Attach State ", "wlccp.scmattach_state",
{ "SCM Attach State", "wlccp.scmattach_state",
FT_UINT8, BASE_DEC, NULL, 0,
"SCM Attach State", HFILL }
NULL, HFILL }
},
{ &hf_wlccp_nmcapability,
{ "NM Capability", "wlccp.nm_capability",
FT_UINT8, BASE_DEC, NULL, 0,
"NM Capability", HFILL }
NULL, HFILL }
},
{ &hf_wlccp_refresh_req_id,
{ "Refresh Request ID", "wlccp.refresh_request_id",
FT_UINT32, BASE_DEC, NULL, 0,
"Refresh Request ID", HFILL }
NULL, HFILL }
},
{ &hf_wlccp_tlv,
{ "WLCCP TLV", "wlccp.tlv",
FT_NONE, BASE_NONE, NULL, 0,
"WLCCP TLV", HFILL }
NULL, HFILL }
},
{ &hf_tlv_flags,
@ -3610,8 +3610,8 @@ proto_register_wlccp(void)
{ &hf_wlccp_null_tlv,
{ "NULL TLV", "wlccp.wlccp_null_tlv",
FT_BYTES, BASE_HEX, NULL ,
0, "NULL TLV", HFILL }
FT_BYTES, BASE_NONE, NULL ,
0, NULL, HFILL }
},
@ -3690,109 +3690,109 @@ proto_register_wlccp(void)
{ &hf_wlccp_tlv_length,
{ "TLV Length", "wlccp.tlv_length",
FT_UINT16, BASE_DEC, NULL, 0,
"TLV Length", HFILL }
NULL, HFILL }
},
{ &hf_wlccp_path_length,
{ "Path Length", "wlccp.path_length",
FT_UINT8, BASE_DEC, NULL, 0,
"Path Length", HFILL }
NULL, HFILL }
},
{ &hf_wlccp_mic_msg_seq_count,
{ "MIC Message Sequence Count", "wlccp.mic_msg_seq_count",
FT_UINT64, BASE_DEC, NULL, 0,
"MIC Message Sequence Count", HFILL }
NULL, HFILL }
},
{ &hf_wlccp_mic_length,
{ "MIC Length", "wlccp.mic_length",
FT_UINT16, BASE_DEC, NULL, 0,
"MIC Length", HFILL }
NULL, HFILL }
},
{ &hf_wlccp_mic_value,
{ "MIC Value", "wlccp.mic_value",
FT_BYTES, BASE_HEX, NULL, 0,
"MIC Value", HFILL }
FT_BYTES, BASE_NONE, NULL, 0,
NULL, HFILL }
},
{ &hf_wlccp_dest_node_type,
{ "Destination node type", "wlccp.dest_node_type",
FT_UINT16, BASE_DEC, VALS(wlccp_node_type_vs),
0x0, "Destination node type", HFILL }
0x0, NULL, HFILL }
},
{ &hf_wlccp_dest_node_id,
{ "Destination node ID", "wlccp.dest_node_id",
FT_ETHER, BASE_NONE, NULL,
0x0, "Destination node ID", HFILL }
0x0, NULL, HFILL }
},
{ &hf_wlccp_supp_node_type,
{ "Destination node type", "wlccp.supp_node_type",
FT_UINT16, BASE_DEC, VALS(wlccp_node_type_vs),
0x0, "Destination node type", HFILL }
0x0, NULL, HFILL }
},
{ &hf_wlccp_supp_node_id,
{ "Supporting node ID", "wlccp.supp_node_id",
FT_ETHER, BASE_NONE, NULL,
0x0, "Supporting node ID", HFILL }
0x0, NULL, HFILL }
},
{ &hf_wlccp_src_node_type,
{ "Source node type", "wlccp.source_node_type",
FT_UINT16, BASE_DEC, VALS(wlccp_node_type_vs),
0x0, "Source node type", HFILL }
0x0, NULL, HFILL }
},
{ &hf_wlccp_src_node_id,
{ "Source node ID", "wlccp.source_node_id",
FT_ETHER, BASE_NONE, NULL,
0x0, "Source node ID", HFILL }
0x0, NULL, HFILL }
},
{ &hf_wlccp_key_mgmt_type,
{ "Key Management type", "wlccp.key_mgmt_type",
FT_UINT8, BASE_HEX, NULL,
0x0, "Key Management type", HFILL }
0x0, NULL, HFILL }
},
{ &hf_wlccp_key_seq_count,
{ "Key Sequence Count", "wlccp.key_seq_count",
FT_UINT32, BASE_DEC, NULL, 0,
"Key Sequence Count", HFILL }
NULL, HFILL }
},
{ &hf_wlccp_session_timeout,
{ "Session Timeout", "wlccp.session_timeout",
FT_UINT32, BASE_DEC, NULL, 0,
"Session Timeout", HFILL }
NULL, HFILL }
},
{ &hf_wlccp_nonce,
{ "Nonce Value", "wlccp.nonce_value",
FT_BYTES, BASE_HEX, NULL, 0,
"Nonce Value", HFILL }
FT_BYTES, BASE_NONE, NULL, 0,
NULL, HFILL }
},
{ &hf_wlccp_token,
{ "Token", "wlccp.token",
FT_UINT8, BASE_HEX, NULL, 0,
"Token", HFILL }
NULL, HFILL }
},
{ &hf_wlccp_scan_mode,
{ "Scan Mode", "wlccp.scan_mode",
FT_UINT8, BASE_HEX, NULL,
0, "Scan Mode", HFILL }
0, NULL, HFILL }
},
{ &hf_wlccp_mode,
{ "Mode", "wlccp.mode",
FT_UINT8, BASE_HEX, VALS(wlccp_mode_vs),
0, "Mode", HFILL }
0, NULL, HFILL }
},
{ &hf_wlccp_rss,
@ -3804,43 +3804,43 @@ proto_register_wlccp(void)
{ &hf_wlccp_srcidx,
{ "Source Index", "wlccp.srcidx",
FT_UINT8, BASE_HEX, NULL, 0,
"Source Index", HFILL }
NULL, HFILL }
},
{ &hf_wlccp_parent_tsf,
{ "Parent TSF", "wlccp.parenttsf",
FT_UINT32, BASE_HEX, NULL, 0,
"Parent TSF", HFILL }
NULL, HFILL }
},
{ &hf_wlccp_target_tsf,
{ "Target TSF", "wlccp.targettsf",
FT_UINT64, BASE_HEX, NULL, 0,
"Target TSF", HFILL }
NULL, HFILL }
},
{ &hf_wlccp_channel,
{ "Channel", "wlccp.channel",
FT_UINT8, BASE_DEC, NULL, 0,
"Channel", HFILL }
NULL, HFILL }
},
{ &hf_wlccp_phy_type,
{ "PHY Type", "wlccp.phy_type",
FT_UINT8, BASE_DEC, VALS(phy_type_80211_vs), 0,
"PHY Type", HFILL }
NULL, HFILL }
},
{ &hf_wlccp_bssid,
{ "BSS ID", "wlccp.bssid",
FT_ETHER, BASE_NONE, NULL, 0,
"Basic Service Set ID ", HFILL }
"Basic Service Set ID", HFILL }
},
{ &hf_wlccp_beacon_interval,
{ "Beacon Interval", "wlccp.beacon_interval",
FT_UINT16, BASE_DEC, NULL, 0,
"Beacon Interval", HFILL }
NULL, HFILL }
},
/*
@ -3854,7 +3854,7 @@ proto_register_wlccp(void)
{ &hf_wlccp_80211_capabilities,
{ "802.11 Capabilities Flags", "wlccp.80211_capabilities",
FT_UINT16, BASE_HEX, NULL,
0x0, "802.11 Capabilities Flags", HFILL }
0x0, NULL, HFILL }
},
{ &hf_80211_cap_ess,
@ -3933,86 +3933,86 @@ proto_register_wlccp(void)
{ &hf_80211_reserved,
{ "Reserved", "wlccp.80211_reserved",
FT_UINT16, BASE_DEC, NULL,
F_80211_RESVD, "Reserved", HFILL }
F_80211_RESVD, NULL, HFILL }
},
{ &hf_80211_dsss_ofdm,
{ "DSSS-OFDM Flag", "wlccp.dsss_ofdm_flag",
FT_UINT16, BASE_DEC, NULL,
F_80211_DSSS_OFDM, "DSSS-OFDM Flag", HFILL }
F_80211_DSSS_OFDM, NULL, HFILL }
},
{ &hf_80211_dlyd_block_ack,
{ "Delayed Block Ack Flag", "wlccp.dsss_dlyd_block_ack_flag",
FT_UINT16, BASE_DEC, NULL,
F_80211_DLYD_BLK_ACK, "Delayed Block Ack Flag", HFILL }
F_80211_DLYD_BLK_ACK, NULL, HFILL }
},
{ &hf_80211_imm_block_ack,
{ "Immediate Block Ack Flag", "wlccp.dsss_imm_block_ack_flag",
FT_UINT16, BASE_DEC, NULL,
F_80211_IMM_BLK_ACK, "Immediate Block Ack Flag", HFILL }
F_80211_IMM_BLK_ACK, NULL, HFILL }
},
{ &hf_wlccp_tlv80211,
{ "802.11 TLV Value", "wlccp.tlv80211",
FT_BYTES, BASE_HEX, NULL, 0,
"802.11 TLV Value", HFILL }
FT_BYTES, BASE_NONE, NULL, 0,
NULL, HFILL }
},
{ &hf_wlccp_duration,
{ "Duration", "wlccp.duration",
FT_UINT16, BASE_DEC, NULL, 0,
"Duration", HFILL }
NULL, HFILL }
},
{ &hf_wlccp_rpidensity,
{ "RPI Density", "wlccp.rpi_denisty",
FT_BYTES, BASE_DEC, NULL, 0,
"RPI Density", HFILL }
FT_BYTES, BASE_NONE, NULL, 0,
NULL, HFILL }
},
{ &hf_wlccp_ccabusy,
{ "CCA Busy", "wlccp.cca_busy",
FT_UINT8, BASE_HEX, NULL, 0,
"CCA Busy", HFILL }
NULL, HFILL }
},
{ &hf_wlccp_stamac,
{ "Station MAC", "wlccp.station_mac",
FT_ETHER, BASE_NONE, NULL, 0,
"Station MAC", HFILL }
NULL, HFILL }
},
{ &hf_wlccp_sta_type,
{ "Station Type", "wlccp.station_type",
FT_UINT8, BASE_HEX, NULL, 0,
"Station Type", HFILL }
NULL, HFILL }
},
{ &hf_wlccp_token2,
{ "2 Byte Token", "wlccp.token2",
FT_UINT16, BASE_HEX, NULL, 0,
"2 Byte Token", HFILL }
NULL, HFILL }
},
{ &hf_wlccp_interval,
{ "Interval", "wlccp.interval",
FT_UINT16, BASE_DEC, NULL, 0,
"Interval", HFILL }
NULL, HFILL }
},
{ &hf_framereport_elements,
{ "Frame Report Elements", "wlccp.framereport_elements",
FT_NONE, BASE_NONE, NULL, 0,
"Frame Report Elements", HFILL }
NULL, HFILL }
},
{ &hf_wlccp_count,
{ "Element Count", "wlccp.element_count",
FT_UINT8, BASE_DEC, NULL, 0,
"Element Count", HFILL }
NULL, HFILL }
},
{ &hf_wlccp_numframes,
@ -4024,68 +4024,68 @@ proto_register_wlccp(void)
{ &hf_wlccp_mfpcapability,
{ "MFP Capability", "wlccp.mfp_capability",
FT_UINT16, BASE_HEX, NULL, 0,
"MFP Capability", HFILL }
NULL, HFILL }
},
{ &hf_wlccp_mfpflags,
{ "MFP Flags", "wlccp.mfp_flags",
FT_UINT16, BASE_HEX, NULL, 0,
"MFP Flags", HFILL }
NULL, HFILL }
},
{ &hf_wlccp_mfpconfig,
{ "MFP Config", "wlccp.mfp_config",
FT_UINT16, BASE_HEX, NULL, 0,
"MFP Config", HFILL }
NULL, HFILL }
},
{ &hf_wlccp_clientmac,
{ "Client MAC", "wlccp.client_mac",
FT_ETHER, BASE_NONE, NULL, 0,
"Client MAC", HFILL }
NULL, HFILL }
},
{ &hf_reg_lifetime,
{ "Reg. LifeTime", "wlccp.reg_lifetime",
FT_UINT8, BASE_DEC, NULL, 0,
"Reg. LifeTime", HFILL }
NULL, HFILL }
},
{ &hf_time_elapsed,
{ "Elapsed Time", "wlccp.time_elapsed",
FT_UINT16, BASE_DEC, NULL, 0,
"Elapsed Time", HFILL }
NULL, HFILL }
},
{ &hf_wlccp_parent_ap_mac,
{ "Parent AP MAC", "wlccp.parent_ap_mac",
FT_ETHER, BASE_NONE, NULL, 0,
"Parent AP MAC", HFILL }
NULL, HFILL }
},
{ &hf_wlccp_auth_type,
{ "Authentication Type", "wlccp.auth_type",
FT_UINT8, BASE_HEX, NULL, 0,
"Authentication Type", HFILL }
NULL, HFILL }
},
{ &hf_wlccp_radius_user_name,
{ "RADIUS Username", "wlccp.radius_username",
FT_STRING, BASE_NONE, NULL,
0x0, "RADIUS Username", HFILL }
0x0, NULL, HFILL }
},
{ &hf_wds_reason,
{ "Reason Code", "wlccp.wds_reason",
FT_UINT8, BASE_HEX, NULL, 0,
"Reason Code", HFILL }
NULL, HFILL }
},
{ &hf_wlccp_tlv_unknown_value,
{ "Unknown TLV Contents", "wlccp.tlv_unknown_value",
FT_BYTES, BASE_HEX, NULL, 0,
"Unknown TLV Contents", HFILL }
FT_BYTES, BASE_NONE, NULL, 0,
NULL, HFILL }
}
}; /* hf_register_info hf */

2
epan/dissectors/packet-xml.c
View File

@ -757,7 +757,7 @@ static void add_xml_field(GArray* hfs, int* p_id, gchar* name, gchar* fqn) {
hfri.hfinfo.display = BASE_NONE;
hfri.hfinfo.strings = NULL;
hfri.hfinfo.bitmask = 0x0;
hfri.hfinfo.blurb = "";
hfri.hfinfo.blurb = NULL;
hfri.hfinfo.id = 0;
hfri.hfinfo.parent = 0;
hfri.hfinfo.ref_count = 0;

12
epan/gcp.h
View File

@ -210,11 +210,11 @@ extern gchar* gcp_msg_to_str(gcp_msg_t* m, gboolean persistent);
#define GCP_ETT_ARR_ELEMS(gi) &(gi.ett.ctx),&(gi.ett.ctx_cmds),&(gi.ett.ctx_terms),&(gi.ett.ctx_term)
#define GCP_HF_ARR_ELEMS(n,gi) \
{ &(gi.hf.ctx), { "Context", n ".ctx", FT_UINT32, BASE_HEX, NULL, 0, "", HFILL }}, \
{ &(gi.hf.ctx_term), { "Termination", n ".ctx.term", FT_STRING, BASE_NONE, NULL, 0, "", HFILL }}, \
{ &(gi.hf.ctx_term_type), { "Type", n ".ctx.term.type", FT_UINT32, BASE_HEX, VALS(gcp_term_types), 0, "", HFILL }}, \
{ &(gi.hf.ctx_term_bir), { "BIR", n ".ctx.term.bir", FT_STRING, BASE_HEX, NULL, 0, "", HFILL }}, \
{ &(gi.hf.ctx_term_nsap), { "NSAP", n ".ctx.term.nsap", FT_STRING, BASE_NONE, NULL, 0, "", HFILL }}, \
{ &(gi.hf.ctx_cmd), { "Command in Frame", n ".ctx.cmd", FT_FRAMENUM, BASE_DEC, NULL, 0, "", HFILL }}
{ &(gi.hf.ctx), { "Context", n ".ctx", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, \
{ &(gi.hf.ctx_term), { "Termination", n ".ctx.term", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }}, \
{ &(gi.hf.ctx_term_type), { "Type", n ".ctx.term.type", FT_UINT32, BASE_HEX, VALS(gcp_term_types), 0, NULL, HFILL }}, \
{ &(gi.hf.ctx_term_bir), { "BIR", n ".ctx.term.bir", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }}, \
{ &(gi.hf.ctx_term_nsap), { "NSAP", n ".ctx.term.nsap", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }}, \
{ &(gi.hf.ctx_cmd), { "Command in Frame", n ".ctx.cmd", FT_FRAMENUM, BASE_DEC, NULL, 0, NULL, HFILL }}
#endif