diff options
| author | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2023-02-24 13:50:16 +0000 |
|---|---|---|
| committer | Gilbert Ramirez <gilbertr@gmail.com> | 2023-02-24 13:50:16 +0000 |
| commit | 7bb5cc2c8fbdf893400f8f926bf7dae02fbc06b0 (patch) | |
| tree | d3fccd9feff6a18f27e34435c61148ed66109271 | |
| parent | 80ecd172c7221d815105ad78c57e914976598ab1 (diff) | |
fix conflict
| -rw-r--r-- | epan/dissectors/packet-rtps.c | 2 | ||||
| -rw-r--r-- | epan/dissectors/packet-shicp.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/epan/dissectors/packet-rtps.c b/epan/dissectors/packet-rtps.c index 5b27b77ae1..c5cb277081 100644 --- a/epan/dissectors/packet-rtps.c +++ b/epan/dissectors/packet-rtps.c @@ -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, diff --git a/epan/dissectors/packet-shicp.c b/epan/dissectors/packet-shicp.c index 535130fed8..38a652ef14 100644 --- a/epan/dissectors/packet-shicp.c +++ b/epan/dissectors/packet-shicp.c @@ -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, |