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

fix conflict

This commit is contained in:
Alexis La Goutte 2023-02-24 13:50:16 +00:00 committed by Gilbert Ramirez
parent 80ecd172c7
commit 7bb5cc2c8f
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -16705,7 +16705,7 @@ void proto_register_rtps(void) {
VALS(class_id_enum_names), 0x0, NULL, HFILL }
},
{ &hf_rtps_encapsulation_options_compression_plugin_class_id,
{ "Compression class Id", "rtps.param.compression_class_id", FT_INT8, BASE_DEC,
{ "Compression class Id", "rtps.param.plugin.compression_class_id", FT_INT8, BASE_DEC,
VALS(class_id_enum_names), 0x0, NULL, HFILL }
},
{ &hf_rtps_padding_bytes,

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

@ -596,7 +596,7 @@ proto_register_shicp(void)
/* Setup protocol expert items */
static ei_register_info ei[] = {
{ &ei_shicp_error,
{ "shicp.error", PI_RESPONSE_CODE, PI_NOTE,
{ "shicp.expert.error", PI_RESPONSE_CODE, PI_NOTE,
"Message contains an error code", EXPFILL }
},
{ &ei_shicp_malformed,