aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJörg Mayer <jmayer@loplof.de>2009-06-19 06:14:29 +0000
committerJörg Mayer <jmayer@loplof.de>2009-06-19 06:14:29 +0000
commit4be57a71e652715cef21d9251fdd2666d610a9a4 (patch)
tree31b01d8997be762c242095b64e193bc5cc6367aa
parentb3e10e559aba9f14711ac221255ed59047ba9b01 (diff)
The previous patch fixed only part of the problem,
as offset was only increased inside the if statement. Get rid of offset and put in the numeric value. svn path=/trunk/; revision=28778
-rw-r--r--epan/dissectors/packet-glbp.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/epan/dissectors/packet-glbp.c b/epan/dissectors/packet-glbp.c
index 4535639527..596d1bf781 100644
--- a/epan/dissectors/packet-glbp.c
+++ b/epan/dissectors/packet-glbp.c
@@ -142,7 +142,6 @@ dissect_glbp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
proto_item *ti = NULL;
guint32 type2;
guint32 length2;
- int offset = 0;
type2 = tvb_get_guint8(tvb, 12);
@@ -164,7 +163,6 @@ dissect_glbp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
proto_tree_add_item(glbp_tree, hf_glbp_unknown1, tvb, 2, 2, FALSE);
proto_tree_add_item(glbp_tree, hf_glbp_unknown2, tvb, 4, 2, FALSE);
proto_tree_add_item(glbp_tree, hf_glbp_somemac, tvb, 6, 6, FALSE);
- offset += 12;
proto_tree_add_item(glbp_tree, hf_glbp_type2, tvb, 12, 1, FALSE);
proto_tree_add_item(glbp_tree, hf_glbp_length2, tvb, 13, 1, FALSE);
@@ -193,7 +191,7 @@ dissect_glbp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
}
}
- return offset + length2;
+ return 12 + length2;
}
static gboolean