diff options
| author | Jaap Keuter <jaap.keuter@xs4all.nl> | 2016-06-07 23:09:26 +0200 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2016-06-08 10:22:18 +0000 |
| commit | eb3781942ce482c24f773b5b758e6b32afe9ba1f (patch) | |
| tree | 9b55aad57ebdb3dae402987863a325bee427ada3 /epan/dissectors/packet-rsvp.c | |
| parent | c1a38296e79ecaa2a23707a7672097ac91205ebb (diff) | |
Allow for vendor private use RRO subobject
ERO subobjects have subobjects 0..127, while RRO have subobjects
0..255. Make this distinction when retreiving the subobject ID.
See RFC 3936, section 2.3.1.
Change-Id: Iae061c259c59b1cf585ce99d02dd0f6ca09a49c3
Reviewed-on: https://code.wireshark.org/review/15772
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/packet-rsvp.c')
| -rw-r--r-- | epan/dissectors/packet-rsvp.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/epan/dissectors/packet-rsvp.c b/epan/dissectors/packet-rsvp.c index fcbf292cf5..d8c6cb8811 100644 --- a/epan/dissectors/packet-rsvp.c +++ b/epan/dissectors/packet-rsvp.c @@ -4598,7 +4598,8 @@ dissect_rsvp_ero_rro_subobjects(proto_tree *ti, packet_info* pinfo, proto_tree * } for (i=1, l = 0; l < obj_length - 4; i++) { - j = tvb_get_guint8(tvb, offset+l) & 0x7f; + j = tvb_get_guint8(tvb, offset+l); + if (rsvp_class == RSVP_CLASS_EXPLICIT_ROUTE) j &= 0x7f; switch(j) { case 1: /* IPv4 */ k = tvb_get_guint8(tvb, offset+l) & 0x80; |