fix conflict
This commit is contained in:
parent
80ecd172c7
commit
7bb5cc2c8f
|
@ -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,
|
||||
|
|
|
@ -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,
|
||||
|
|
Loading…
Reference in New Issue