diff options
author | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2019-01-20 15:22:33 +0000 |
---|---|---|
committer | Anders Broman <a.broman58@gmail.com> | 2019-04-10 13:27:42 +0000 |
commit | d3aca2e02543ae9c3d65bb9df1597b574f85e383 (patch) | |
tree | 53d69aaf9b0fbcef99b5ed54e1fa5920e1c26ed9 | |
parent | b86346eaa0b793974c713036d3e09b9a16e32fe1 (diff) |
rtps: fix conflict on value_string
Field 'parameterId' (rtps.param.id) has a conflicting entry in its value_string: 15 is at indices 67 (PID_DOMAIN_ID) and 74 (PID_IS_RELIABLE [deprecated])
Change-Id: I34081c099da808d85236d9e255d6fe256fdf9cf7
Reviewed-on: https://code.wireshark.org/review/31632
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
-rw-r--r-- | epan/dissectors/packet-rtps.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/epan/dissectors/packet-rtps.c b/epan/dissectors/packet-rtps.c index eae83c70b2..9da4d184f7 100644 --- a/epan/dissectors/packet-rtps.c +++ b/epan/dissectors/packet-rtps.c @@ -816,7 +816,6 @@ static const value_string parameter_id_vals[] = { { PID_DEFAULT_UNICAST_IPADDRESS, "PID_DEFAULT_UNICAST_IPADDRESS" }, { PID_METATRAFFIC_UNICAST_PORT, "PID_METATRAFFIC_UNICAST_PORT" }, { PID_DEFAULT_UNICAST_PORT, "PID_DEFAULT_UNICAST_PORT" }, - { PID_IS_RELIABLE, "PID_IS_RELIABLE [deprecated]" }, { PID_EXPECTS_ACK, "PID_EXPECTS_ACK" }, { PID_MULTICAST_IPADDRESS, "PID_MULTICAST_IPADDRESS" }, { PID_MANAGER_KEY, "PID_MANAGER_KEY [deprecated]" }, |