aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-fcswils.c
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2008-12-19 17:39:52 +0000
committerGerald Combs <gerald@wireshark.org>2008-12-19 17:39:52 +0000
commit6d04f793f019b456f8d8c81f231152fbba24da8b (patch)
tree647f2501114c1f15b0c01fc84cbb6cdad96a3580 /epan/dissectors/packet-fcswils.c
parent8e53f726885fe5ce2ae8422867299d2da09518cc (diff)
Back out r27047 and r27053.
svn path=/trunk/; revision=27062
Diffstat (limited to 'epan/dissectors/packet-fcswils.c')
-rw-r--r--epan/dissectors/packet-fcswils.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/epan/dissectors/packet-fcswils.c b/epan/dissectors/packet-fcswils.c
index 4c74774f95..c9584e9c98 100644
--- a/epan/dissectors/packet-fcswils.c
+++ b/epan/dissectors/packet-fcswils.c
@@ -756,7 +756,7 @@ dissect_swils_elp (tvbuff_t *tvb, proto_tree *elp_tree, guint8 isreq _U_)
flags="Class F Invld";
}
proto_tree_add_bytes_format (elp_tree, hf_swils_elp_clsf_svcp, tvb, offset, 6,
- "Class F Svc Parameters: (%s)", flags);
+ &elp.clsf_svcparm[0], "Class F Svc Parameters: (%s)", flags);
offset += 6;
proto_tree_add_item (elp_tree, hf_swils_elp_clsf_rcvsz, tvb, offset, 2, 0);
@@ -800,6 +800,7 @@ dissect_swils_elp (tvbuff_t *tvb, proto_tree *elp_tree, guint8 isreq _U_)
}
proto_tree_add_bytes_format (elp_tree, hf_swils_elp_cls1_svcp, tvb, offset, 2,
+ tvb_get_ptr (tvb, offset, 2),
"Class 1 Svc Parameters: (%s)", flags);
offset += 2;
if (elp.cls1_svcparm[0] & 0x80) {
@@ -821,6 +822,7 @@ dissect_swils_elp (tvbuff_t *tvb, proto_tree *elp_tree, guint8 isreq _U_)
}
proto_tree_add_bytes_format (elp_tree, hf_swils_elp_cls2_svcp, tvb, offset, 2,
+ &elp.cls2_svcparm[0],
"Class 2 Svc Parameters: (%s)", flags);
offset += 2;
@@ -842,6 +844,7 @@ dissect_swils_elp (tvbuff_t *tvb, proto_tree *elp_tree, guint8 isreq _U_)
flags="Class 3 Invld";
}
proto_tree_add_bytes_format (elp_tree, hf_swils_elp_cls3_svcp, tvb, offset, 2,
+ &elp.cls3_svcparm[0],
"Class 3 Svc Parameters: (%s)", flags);
offset += 2;