aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAmitoj Setia <asetia@juniper.net>2016-07-08 09:42:50 -0700
committerMichael Mann <mmann78@netscape.net>2016-07-08 19:16:10 +0000
commit44c2560606405852bd417cc292025336801a0f2c (patch)
treec615853363b3e180500bb4790fe90ccf9a5fff8b
parent837b5347ba8fe1ad9de2315e20637ca3d1e0f6d7 (diff)
fixed some juniper vn dissector bugs
Change-Id: I67ea5df962266c1476d1d1b6234e831018138422 Reviewed-on: https://code.wireshark.org/review/16341 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
-rw-r--r--epan/dissectors/packet-juniper.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/epan/dissectors/packet-juniper.c b/epan/dissectors/packet-juniper.c
index 710f4eb..8f22edb 100644
--- a/epan/dissectors/packet-juniper.c
+++ b/epan/dissectors/packet-juniper.c
@@ -80,13 +80,13 @@ void proto_reg_handoff_juniper(void);
/* VN related defines */
#define VN_TLV_HDR_SIZE 2
-#define VN_FLAG_ALERT 0x00000001
-#define VN_FLAG_DROP 0x00000002
-#define VN_FLAG_DENY 0x00000004
-#define VN_FLAG_LOG 0x00000008
-#define VN_FLAG_PASS 0x00000010
-#define VN_FLAG_REJECT 0x00000020
-#define VN_FLAG_MIRROR 0x00000040
+#define VN_FLAG_ALERT 0x00000002
+#define VN_FLAG_DROP 0x00000004
+#define VN_FLAG_DENY 0x00000008
+#define VN_FLAG_LOG 0x00000010
+#define VN_FLAG_PASS 0x00000020
+#define VN_FLAG_REJECT 0x00000040
+#define VN_FLAG_MIRROR 0x00000080
#define VN_FLAG_DIRECTION 0x40000000
#define VN_FLAG_MASK 0xFFFFFFFF
enum {
@@ -1253,7 +1253,7 @@ static int dissect_juniper_vn(tvbuff_t* tvb, packet_info* pinfo, proto_tree* tre
offset, 4, ENC_BIG_ENDIAN);
break;
case VN_TLV_FLAGS:
- proto_tree_add_bitmask(tree, tvb, offset, hf_juniper_vn_flags, ett_juniper_vn_flags, vn_flags, ENC_BIG_ENDIAN);
+ proto_tree_add_bitmask(juniper_subtree, tvb, offset, hf_juniper_vn_flags, ett_juniper_vn_flags, vn_flags, ENC_BIG_ENDIAN);
break;
case VN_TLV_SRC_VN:
proto_tree_add_item(juniper_subtree, hf_juniper_vn_src, tvb, offset, tlv_len, ENC_NA|ENC_ASCII);