From f1038652c63e86c84c19c07bd018fb56e5c985e9 Mon Sep 17 00:00:00 2001 From: Alexis La Goutte Date: Sun, 21 Dec 2014 16:15:10 +0100 Subject: RSVP: RECORD_ROUTE IPv4 Subobject Flags field incorrect decoding The Flags field within RSVP RECORD_ROUTE IPv4_Subobject is decoded incorrectly. Wireshark thinks that 0x10 bit represents Node-ID, but actually the Node-ID is encoded by bit 0x20 (per RFC 4561) Issue reported by Alexander Okonnikov Bug:10799 Change-Id: I48f6aa35c08945aacf8f2bb871a72b5927511948 Reviewed-on: https://code.wireshark.org/review/5944 Reviewed-by: Anders Broman --- epan/dissectors/packet-rsvp.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'epan/dissectors') diff --git a/epan/dissectors/packet-rsvp.c b/epan/dissectors/packet-rsvp.c index 75559c4617..66a7a6db81 100644 --- a/epan/dissectors/packet-rsvp.c +++ b/epan/dissectors/packet-rsvp.c @@ -4426,7 +4426,7 @@ dissect_rsvp_ero_rro_subobjects(proto_tree *ti, packet_info* pinfo, proto_tree * } if (rsvp_class == RSVP_CLASS_RECORD_ROUTE) { flags = tvb_get_guint8(tvb, offset+l+7); - if (flags&0x10) { + if (flags&0x20) { proto_item_append_text(ti, " (Node-id)"); proto_item_append_text(ti2, " (Node-id)"); } @@ -4469,7 +4469,7 @@ dissect_rsvp_ero_rro_subobjects(proto_tree *ti, packet_info* pinfo, proto_tree * } if (rsvp_class == RSVP_CLASS_RECORD_ROUTE) { flags = tvb_get_guint8(tvb, offset+l+19); - if (flags&0x10) { + if (flags&0x20) { proto_item_append_text(ti, " (Node-id)"); proto_item_append_text(ti2, " (Node-id)"); } @@ -8250,7 +8250,7 @@ proto_register_rsvp(void) {&hf_rsvp_rro_flags_node_address, { "Address Specifies a Node-id Address", "rsvp.rro.flags.node_address", - FT_BOOLEAN, 8, TFS(&tfs_yes_no), 0x10, + FT_BOOLEAN, 8, TFS(&tfs_yes_no), 0x20, NULL, HFILL } }, -- cgit v1.2.3