osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Check for item long text being 0 - prefer NULL

This commit is contained in:
Martin Mathieson 2024-01-29 10:05:41 +00:00 committed by Martin Mathieson
parent da8c8fc1cf
commit a8aebe5cf4
6 changed files with 69 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
epan/dissectors/packet-lldp.c
View File

@ -5038,39 +5038,39 @@ proto_register_lldp(void)
},
{ &hf_dcbx_feature_pgid_reserved,
{ "Reserved", "lldp.dcbx.feature.pg.reserved", FT_UINT8, BASE_HEX,
NULL, 0xFE, 0, HFILL }
NULL, 0xFE, NULL, HFILL }
},
{ &hf_dcbx_feature_pgid_prio_0,
{ "PGID for Prio 0", "lldp.dcbx.feature.pg.pgid_prio0", FT_UINT16, BASE_DEC,
NULL, 0xF000, 0, HFILL }
NULL, 0xF000, NULL, HFILL }
},
{ &hf_dcbx_feature_pgid_prio_1,
{ "PGID for Prio 1", "lldp.dcbx.feature.pg.pgid_prio1", FT_UINT16, BASE_DEC,
NULL, 0x0F00, 0, HFILL }
NULL, 0x0F00, NULL, HFILL }
},
{ &hf_dcbx_feature_pgid_prio_2,
{ "PGID for Prio 2", "lldp.dcbx.feature.pg.pgid_prio2", FT_UINT16, BASE_DEC,
NULL, 0x00F0, 0, HFILL }
NULL, 0x00F0, NULL, HFILL }
},
{ &hf_dcbx_feature_pgid_prio_3,
{ "PGID for Prio 3", "lldp.dcbx.feature.pg.pgid_prio3", FT_UINT16, BASE_DEC,
NULL, 0x000F, 0, HFILL }
NULL, 0x000F, NULL, HFILL }
},
{ &hf_dcbx_feature_pgid_prio_4,
{ "PGID for Prio 4", "lldp.dcbx.feature.pg.pgid_prio4", FT_UINT16, BASE_DEC,
NULL, 0xF000, 0, HFILL }
NULL, 0xF000, NULL, HFILL }
},
{ &hf_dcbx_feature_pgid_prio_5,
{ "PGID for Prio 5", "lldp.dcbx.feature.pg.pgid_prio5", FT_UINT16, BASE_DEC,
NULL, 0x0F00, 0, HFILL }
NULL, 0x0F00, NULL, HFILL }
},
{ &hf_dcbx_feature_pgid_prio_6,
{ "PGID for Prio 6", "lldp.dcbx.feature.pg.pgid_prio6", FT_UINT16, BASE_DEC,
NULL, 0x00F0, 0, HFILL }
NULL, 0x00F0, NULL, HFILL }
},
{ &hf_dcbx_feature_pgid_prio_7,
{ "PGID for Prio 7", "lldp.dcbx.feature.pg.pgid_prio7", FT_UINT16, BASE_DEC,
NULL, 0x000F, 0, HFILL }
NULL, 0x000F, NULL, HFILL }
},
{ &hf_dcbx_feature_pg_per_0,
{ "Bandwidth for PGID 0", "lldp.dcbx.feature.pg.per0", FT_UINT8, BASE_DEC,

4
epan/dissectors/packet-mswsp.c
View File

@ -7835,14 +7835,14 @@ proto_register_mswsp(void)
&hf_mswsp_msg_cpmgetrowsetnotify_changeditemstate,
{
"changedItemState", "mswsp.msg.cpmgetrowsetnotify.changeditemState",
FT_UINT8, BASE_DEC, NULL, 0, 0, HFILL
FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL
}
},
{
&hf_mswsp_msg_cpmgetrowsetnotify_rowsetevent,
{
"rowSetEvent", "mswsp.msg.cpmgetrowsetnotify.rowsetevent",
FT_UINT8, BASE_DEC, NULL, 0, 0, HFILL
FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL
}
},
{

62
epan/dissectors/packet-rtitcp.c
View File

@ -781,25 +781,25 @@ proto_register_rtitcp(void)
{ &hf_rtitcp_header_control_byte, {
"Control Byte", "rtitcp.header.control_byte",
FT_UINT16, BASE_HEX, NULL, 0,
0, HFILL }
NULL, HFILL }
},
{ &hf_rtitcp_header_message_length, {
"Message Length", "rtitcp.header.message_length",
FT_UINT16, BASE_DEC, NULL, 0,
0, HFILL }
NULL, HFILL }
},
{ &hf_rtitcp_header_magic_number, {
"Magic Cookie", "rtitcp.header.magic_cookie",
FT_UINT32, BASE_HEX, NULL, 0,
0, HFILL }
NULL, HFILL }
},
{ &hf_rtitcp_crc_magic_cookie, {
"CRC Magic Cookie", "rtitcp.header.crc_magic_cookie",
FT_UINT32, BASE_HEX, NULL, 0,
0, HFILL }
NULL, HFILL }
},
{ &hf_rtitcp_control_kind,
@ -811,19 +811,19 @@ proto_register_rtitcp(void)
{ &hf_rtitcp_control_magic_cookie, {
"Control Magic Cookie", "rtitcp.control.magic_cookie",
FT_UINT32, BASE_HEX, NULL, 0,
0, HFILL }
NULL, HFILL }
},
{ &hf_rtitcp_control_transaction_id, {
"Transaction ID", "rtitcp.control.transaction_id",
FT_BYTES, BASE_NONE, NULL, 0,
0, HFILL }
NULL, HFILL }
},
{ &hf_rtitcp_control_attribute_session_id, {
"Session ID", "rtitcp.control.attribute.session_id",
FT_BYTES, BASE_NONE, NULL, 0,
0, HFILL }
NULL, HFILL }
},
{ &hf_rtitcp_control_attribute_type,
@ -841,38 +841,37 @@ proto_register_rtitcp(void)
{ &hf_rtitcp_control_attribute_error_code_description, {
"Description", "rtitcp.control.attribute.error_code.description",
FT_STRING, BASE_NONE, NULL, 0,
0, HFILL }
NULL, HFILL }
},
{ &hf_rtitcp_control_attribute_connection_cookie, {
"Connection Cookie", "rtitcp.control.attribute.connection_cookie",
FT_BYTES, BASE_NONE, NULL, 0,
0, HFILL }
NULL, HFILL }
},
{ &hf_rtitcp_control_attribute_connection_type, {
"Class ID", "rtitcp.control_attribute.connection_type",
FT_UINT8, BASE_HEX, VALS(rtitcp_attribute_connection_type_vals), 0,
0, HFILL }
NULL, HFILL }
},
{ &hf_rtitcp_attributes_list_length, {
"Attributes list length", "rtitcp.attributes_list_length",
FT_UINT16, BASE_DEC, NULL, 0,
0,
HFILL }
NULL, HFILL }
},
{ &hf_rtitcp_control_attribute_length, {
"Attribute Length", "rtitcp.control.attribute.length",
FT_UINT16, BASE_DEC, NULL, 0,
0, HFILL }
NULL, HFILL }
},
{ &hf_rtitcp_control_attribute_port, {
"Port", "rtitcp.control.attribute_port",
FT_UINT32, BASE_DEC, NULL, 0,
0, HFILL }
NULL, HFILL }
},
{ &hf_rtitcp_locator_kind,
@ -899,30 +898,29 @@ proto_register_rtitcp(void)
NULL, HFILL }
},
{ &hf_rtitcp_control_crc_value, {
"CRC", "rtitcp.control.crc",
FT_UINT32, BASE_HEX, NULL, 0,
0, HFILL }
{ &hf_rtitcp_control_crc_value,
{ "CRC", "rtitcp.control.crc",
FT_UINT32, BASE_HEX, NULL, 0,
NULL, HFILL }
},
{ &hf_rtitcp_response_in, {
"Response In", "rtitcp.response_in",
FT_FRAMENUM, BASE_NONE, NULL, 0x0,
"The response to this RTITCP request is in this frame", HFILL }
{ &hf_rtitcp_response_in,
{ "Response In", "rtitcp.response_in",
FT_FRAMENUM, BASE_NONE, NULL, 0x0,
"The response to this RTITCP request is in this frame", HFILL }
},
{ &hf_rtitcp_response_to, {
"Request In", "rtitcp.response_to",
FT_FRAMENUM, BASE_NONE, NULL, 0x0,
"This is a response to the RTITCP request in this frame", HFILL }
},
{ &hf_rtitcp_response_time, {
"Response Time", "rtitcp.response_time",
FT_RELATIVE_TIME, BASE_NONE, NULL, 0x0,
"The time between the Request and the Reply", HFILL }
{ &hf_rtitcp_response_to,
{ "Request In", "rtitcp.response_to",
FT_FRAMENUM, BASE_NONE, NULL, 0x0,
"This is a response to the RTITCP request in this frame", HFILL }
},
{ &hf_rtitcp_response_time,
{ "Response Time", "rtitcp.response_time",
FT_RELATIVE_TIME, BASE_NONE, NULL, 0x0,
"The time between the Request and the Reply", HFILL }
}
};
static gint *ett[] = {

4
epan/dissectors/packet-rtps-processed.c
View File

@ -401,14 +401,14 @@ proto_register_rtps_processed(void)
&hf_rtpsproc_param_id,
{
"Parameter Identifier", "rtpsproc.param.id",
FT_UINT16, BASE_DEC, NULL, 0, 0, HFILL
FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL
},
},
{
&hf_rtpsproc_param_length,
{
"Parameter Length", "rtpsproc.param.length",
FT_UINT16, BASE_DEC, NULL, 0, 0, HFILL
FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL
}
},
};

40
epan/dissectors/packet-rtps-virtual-transport.c
View File

@ -1001,133 +1001,133 @@ proto_register_rtps_virtual_transport(void)
&hf_rtpsvt_version,
{
"Version", "rtpsvt.version",
FT_UINT16, BASE_HEX, NULL, 0, 0, HFILL
FT_UINT16, BASE_HEX, NULL, 0, NULL, HFILL
}
},
{
&hf_rtpsvt_version_major,
{
"Major", "rtpsvt.version.major",
FT_INT8, BASE_DEC, NULL, 0, 0, HFILL
FT_INT8, BASE_DEC, NULL, 0, NULL, HFILL
}
},
{
&hf_rtpsvt_version_minor,
{
"Minor", "rtpsvt.version.minor",
FT_INT8, BASE_DEC, NULL, 0, 0, HFILL
FT_INT8, BASE_DEC, NULL, 0, NULL, HFILL
}
},
{
&hf_rtpsvt_content_kind,
{
"Content kind", "rtpsvt.content.kind",
FT_INT8, BASE_DEC, NULL, 0, 0, HFILL
FT_INT8, BASE_DEC, NULL, 0, NULL, HFILL
}
},
{
&hf_rtpsvt_param_id,
{
"Parameter Identifier", "rtpsvt.param.id",
FT_UINT16, BASE_DEC, NULL, 0, 0, HFILL
FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL
},
},
{
&hf_rtpsvt_param_length,
{
"Parameter Length", "rtpsvt.param.length",
FT_UINT16, BASE_DEC, NULL, 0, 0, HFILL
FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL
}
},
{
&hf_rtpsvt_direction,
{
"Traffic Direction", "rtpsvt.direction",
FT_STRING, BASE_NONE, NULL, 0x0, 0, HFILL
FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL
}
},
{
&hf_rtpsvt_packet_identifier,
{
"Packet identifier", "rtpsvt.identifier",
FT_NONE, BASE_NONE, NULL, 0, 0, HFILL
FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL
}
},
{
&hf_rtpsvt_monitoring_guid,
{
"GUID", "rtpsvt.monitoring_guid",
FT_BYTES, BASE_NONE, NULL, 0, 0, HFILL
FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL
}
},
{
&hf_rtpsvt_monitoring_seqNr,
{
"SeqNum", "rtpsvt.seqNr",
FT_UINT64, BASE_DEC, NULL, 0x0, 0, HFILL
FT_UINT64, BASE_DEC, NULL, 0x0, NULL, HFILL
}
},
{
&hf_rtpsvt_information,
{
"Transport Information", "rtpsvt.information",
FT_NONE, BASE_NONE, NULL, 0x0, 0, HFILL
FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL
}
},
{
&hf_rtpsvt_source_port,
{
"Source Port", "rtpsvt.source_port",
FT_UINT32, BASE_DEC, NULL, 0x0, 0, HFILL
FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL
}
},
{
&hf_rtpsvt_source_address,
{
"Source address", "rtpsvt.source_address",
FT_STRING, BASE_NONE, NULL, 0, 0, HFILL
FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL
}
},
{
&hf_rtpsvt_source_pid,
{
"Source process ID", "rtpsvt.source_pid",
FT_STRING, BASE_NONE, NULL, 0, 0, HFILL
FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL
}
},
{
&hf_rtpsvt_destination_port,
{
"Destination Port", "rtpsvt.port",
FT_UINT32, BASE_DEC, NULL, 0x0, 0, HFILL
FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL
}
},
{
&hf_rtpsvt_destination_rtps_port,
{
"Destination RTPS Port", "rtpsvt.rtps_port",
FT_UINT32, BASE_DEC, NULL, 0x0, 0, HFILL
FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL
}
},
{
&hf_rtpsvt_destination_address,
{
"Destination address", "rtpsvt.destination_address",
FT_STRING, BASE_NONE, NULL, 0, 0, HFILL
FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL
}
},
{
&hf_rtpsvt_destination_pid,
{
"Destination process ID", "rtpsvt.destination_pid",
FT_STRING, BASE_NONE, NULL, 0, 0, HFILL
FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL
}
},
{
&hf_rtpsvt_class,
{
"Transport class", "rtpsvt.class",
FT_STRING, BASE_NONE, NULL, 0, 0, HFILL
FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL
}
},
{
@ -1135,7 +1135,7 @@ proto_register_rtps_virtual_transport(void)
&hf_rtpsvt_missing_messages,
{
"Packets lost", "rtpsvt.missing_messages",
FT_UINT64, BASE_DEC, NULL, 0x0, 0, HFILL
FT_UINT64, BASE_DEC, NULL, 0x0, NULL, HFILL
}
}
};

7
tools/check_typed_item_calls.py
View File

@ -824,7 +824,12 @@ class Item:
self.strings = strings
self.mask_exact_width = mask_exact_width
global warnings_found
global warnings_found, errors_found
if blurb == '0':
print('Error:', filename, hf, ': - filter "' + filter +
'" has blurb of 0 - if no string, please set NULL instead')
errors_found += 1
self.set_mask_value(macros)