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

Fix some item label names with unbalanced parens/braces/brackets 

Spotted by new check added to check_typed_item_calls.py --label
This commit is contained in:
Martin Mathieson 2021-08-14 21:24:13 +01:00
parent cd899ce8d1
commit 545eab808e
6 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -9275,7 +9275,7 @@ void proto_register_gtpv2(void)
FT_BOOLEAN, 8, NULL, 0x01, NULL, HFILL}
},
{&hf_gtpv2_sqci,
{"SQCI (Subscribed QoS Change Indication", "gtpv2.sqci",
{"SQCI (Subscribed QoS Change Indication)", "gtpv2.sqci",
FT_BOOLEAN, 8, NULL, 0x80, NULL, HFILL}
},
{&hf_gtpv2_uimsi,
@ -9287,11 +9287,11 @@ void proto_register_gtpv2(void)
FT_BOOLEAN, 8, NULL, 0x20, NULL, HFILL}
},
{&hf_gtpv2_crsi,
{"CRSI (Change Reporting support indication):", "gtpv2.crsi",
{"CRSI (Change Reporting support indication)", "gtpv2.crsi",
FT_BOOLEAN, 8, NULL, 0x10, NULL, HFILL}
},
{&hf_gtpv2_ps,
{"PS (Piggybacking Supported).)", "gtpv2.ps",
{"PS (Piggybacking Supported)", "gtpv2.ps",
FT_BOOLEAN, 8, NULL, 0x08, NULL, HFILL}
},
{&hf_gtpv2_pt,
@ -9323,7 +9323,7 @@ void proto_register_gtpv2(void)
FT_BOOLEAN, 8, NULL, 0x10, NULL, HFILL}
},
{&hf_gtpv2_s4af,
{"S4AF (Static IPv4 Address Flag))", "gtpv2.s4af",
{"S4AF (Static IPv4 Address Flag)", "gtpv2.s4af",
FT_BOOLEAN, 8, NULL, 0x08, NULL, HFILL}
},
{&hf_gtpv2_mbmdt,
@ -10601,7 +10601,7 @@ void proto_register_gtpv2(void)
"Unlicensed Spectrum in the form of LAA or LWA/LWIP as Secondary RAT Not Allowed", HFILL}
},
{ &hf_gtpv2_mm_context_nrsrna,
{"NRSRNA((NR as Secondary RAT Not Allowed)", "gtpv2.mm_context_nrsrna",
{"NRSRNA(NR as Secondary RAT Not Allowed)", "gtpv2.mm_context_nrsrna",
FT_BOOLEAN, 8, NULL, 0x01,
NULL, HFILL}
},
@ -11329,7 +11329,7 @@ void proto_register_gtpv2(void)
NULL, HFILL }
},
{ &hf_gtpv2_ciot_support_ind_bit1,
{ "SGNIPDN (SGi Non-IP PDN Support", "gtpv2.ciot_support_ind.sgnipdn",
{ "SGNIPDN (SGi Non-IP PDN Support)", "gtpv2.ciot_support_ind.sgnipdn",
FT_BOOLEAN, 8, TFS(&tfs_set_notset), 0x01,
NULL, HFILL }
},

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

@ -12134,7 +12134,7 @@ proto_register_pfcp(void)
NULL, HFILL }
},
{ &hf_pfcp_pfcpsmreq_flags_b4_rumuc,
{ "RUMUC (Resume of Usage Measurement to Un-pause of Charging", "pfcp.smreq_flags.rumuc",
{ "RUMUC (Resume of Usage Measurement to Un-pause of Charging)", "pfcp.smreq_flags.rumuc",
FT_BOOLEAN, 8, NULL, 0x10,
NULL, HFILL }
},

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

@ -5565,7 +5565,7 @@ proto_register_reload(void)
}
},
{ &hf_reload_diagnosticinfo_instancesstored_info,
{ "InstancesStoredInfo)", "reload.diagnostic.info.instancesstored_info", FT_NONE,
{ "InstancesStoredInfo", "reload.diagnostic.info.instancesstored_info", FT_NONE,
BASE_NONE, NULL, 0x0, NULL, HFILL
}
},

6
epan/dissectors/packet-s7comm_szl_ids.c
View File

@ -2743,10 +2743,10 @@ s7comm_szl_0131_0003_register(int proto)
{ "anz (Maximum number of cyclic read jobs)", "s7comm.szl.0131.0003.anz", FT_UINT16, BASE_DEC, NULL, 0x0,
NULL, HFILL }},
{ &hf_s7comm_szl_0131_0003_per_min,
{ "per min (Minimum period for cyclic read jobs (n x 100 ms)", "s7comm.szl.0131.0003.per_min", FT_UINT16, BASE_DEC, NULL, 0x0,
{ "per min (Minimum period for cyclic read jobs (n x 100 ms))", "s7comm.szl.0131.0003.per_min", FT_UINT16, BASE_DEC, NULL, 0x0,
NULL, HFILL }},
{ &hf_s7comm_szl_0131_0003_per_max,
{ "per max (Maximum period for cyclic read jobs (n x 100 ms)", "s7comm.szl.0131.0003.per_max", FT_UINT16, BASE_DEC, NULL, 0x0,
{ "per max (Maximum period for cyclic read jobs (n x 100 ms))", "s7comm.szl.0131.0003.per_max", FT_UINT16, BASE_DEC, NULL, 0x0,
NULL, HFILL }},
{ &hf_s7comm_szl_0131_0003_res,
{ "res (Reserved)", "s7comm.szl.0131.0003.res", FT_BYTES, BASE_NONE, NULL, 0x0,
@ -4387,7 +4387,7 @@ s7comm_szl_0132_0004_register(int proto)
{ "key (Protection level for the key switch, possible values: 1,2 or 3)", "s7comm.szl.0132.0004.key", FT_UINT16, BASE_DEC, NULL, 0x0,
NULL, HFILL }},
{ &hf_s7comm_szl_0132_0004_param,
{ "param (Assigned protection level (possible values: 0, 1, 2 or 3)", "s7comm.szl.0132.0004.param", FT_UINT16, BASE_DEC, NULL, 0x0,
{ "param (Assigned protection level, possible values: 0, 1, 2 or 3)", "s7comm.szl.0132.0004.param", FT_UINT16, BASE_DEC, NULL, 0x0,
"param (Assigned protection level (possible values: 0, 1, 2 or 3;0 means: no password assigned, assigned protection level is not valid)", HFILL }},
{ &hf_s7comm_szl_0132_0004_real,
{ "real (Valid protection level of the CPU, possible values: 1, 2 or 3)", "s7comm.szl.0132.0004.real", FT_UINT16, BASE_DEC, NULL, 0x0,

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

@ -1856,7 +1856,7 @@ proto_register_uma(void)
NULL, HFILL }
},
{ &hf_uma_urr_gmsi,
{ "GMSI, GAN Mode Support Indicator)","uma.urr.gmsi",
{ "GMSI, GAN Mode Support Indicator","uma.urr.gmsi",
FT_UINT8,BASE_DEC, VALS(uma_gmsi_vals), 0x06,
"GMSI, GAN Mode Support Indicator", HFILL }
},

6
tools/check_typed_item_calls.py
View File

@ -237,7 +237,11 @@ class Item:
# Optionally check label.
if check_label:
if label.startswith(' ') or label.endswith(' '):
print('Warning: ' + filename + 'filter=' + filter + ' \"' + label + '\" begins or ends with a space')
print('Warning: ' + filename + ' filter "' + filter + '" label' + label + '" begins or ends with a space')
if (label.count('(') != label.count(')') or
label.count('[') != label.count(']') or
label.count('{') != label.count('}')):
print('Warning: ' + filename + ': - filter "' + filter + '" label', '"' + label + '"', 'has unbalanced parens/braces/brackets')
self.item_type = item_type
self.type_modifier = type_modifier