aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors
diff options
context:
space:
mode:
authorJuanjo Martin <juanjo@rti.com>2015-10-20 17:05:42 +0200
committerMichael Mann <mmann78@netscape.net>2015-11-02 03:48:47 +0000
commite52931bab0553d3e51b1b10e70838a34c603b019 (patch)
tree1d1e7216213ef6ab4ddf13b302b926121d5a9994 /epan/dissectors
parentf015c85317a8fc134902addab48ec3a1eeceab3e (diff)
RTPS: added new encoding to proto.c and used it in the rtps dissector
RTPS uses NTP encoding with a BASETIME equal to 0. Also, changed "magic" by "Magic" Change-Id: I2512176f2018396edaa6b2a1478facd26118cb13 Reviewed-on: https://code.wireshark.org/review/11184 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors')
-rw-r--r--epan/dissectors/packet-rtps.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/epan/dissectors/packet-rtps.c b/epan/dissectors/packet-rtps.c
index 3e4f7bbed6..73946c7a8c 100644
--- a/epan/dissectors/packet-rtps.c
+++ b/epan/dissectors/packet-rtps.c
@@ -1723,8 +1723,9 @@ void rtps_util_add_ntp_time(proto_tree *tree,
gboolean little_endian,
int hf_time) {
+ /* ENC_TIME_NTP_BASE_ZERO applies the BASETIME specified by the standard (zero)*/
proto_tree_add_item(tree, hf_time, tvb, offset, 8,
- ENC_TIME_NTP|(little_endian ? ENC_LITTLE_ENDIAN : ENC_BIG_ENDIAN));
+ ENC_TIME_NTP_BASE_ZERO|(little_endian ? ENC_LITTLE_ENDIAN : ENC_BIG_ENDIAN));
}
@@ -7642,7 +7643,7 @@ void proto_register_rtps(void) {
static hf_register_info hf[] = {
{ &hf_rtps_magic, {
- "magic",
+ "Magic",
"rtps.magic",
FT_STRING,
BASE_NONE,