osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

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>
This commit is contained in:
Jaap Keuter 2016-06-07 23:09:26 +02:00 committed by Michael Mann
parent c1a38296e7
commit eb3781942c
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
epan/dissectors/packet-rsvp.c
View File

@ -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;