diff options
author | IWASE Yusuke <iwase.yusuke0@gmail.com> | 2016-04-26 16:58:32 +0900 |
---|---|---|
committer | Guy Harris <guy@alum.mit.edu> | 2016-04-27 01:01:28 +0000 |
commit | e899c3eb610b4f546dfced6c41ae4e166b9c729e (patch) | |
tree | 90ac3d5cb1e12587676de2a0a9ce7bf4959ef965 /epan/dissectors/packet-openflow_v5.c | |
parent | 657c54a993adfa865c2f7f86e49b159f2de56c36 (diff) |
OpenFlow: fix flow_monitor_request dissector
This patch fixes:
- offset calculation
- monitor_id field description
Change-Id: I9568b8897ca9ebbc6203db6640b88e1b1676448d
Reviewed-on: https://code.wireshark.org/review/15128
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'epan/dissectors/packet-openflow_v5.c')
-rw-r--r-- | epan/dissectors/packet-openflow_v5.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/epan/dissectors/packet-openflow_v5.c b/epan/dissectors/packet-openflow_v5.c index b9a4e5a04b..1822f673c5 100644 --- a/epan/dissectors/packet-openflow_v5.c +++ b/epan/dissectors/packet-openflow_v5.c @@ -3918,6 +3918,7 @@ dissect_openflow_flow_monitor_request_v5(tvbuff_t *tvb, packet_info *pinfo _U_, /* uint32_t monitor_id; */ proto_tree_add_item(tree, hf_openflow_v5_flow_monitor_request_monitor_id, tvb, offset, 4, ENC_BIG_ENDIAN); + offset+=4; /* uint32_t out_port; */ if (tvb_get_ntohl(tvb, offset) <= OFPP_MAX) { @@ -3946,7 +3947,7 @@ dissect_openflow_flow_monitor_request_v5(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree_add_item(flags_tree, hf_openflow_v5_flow_monitor_request_flags_instructions, tvb, offset, 2, ENC_BIG_ENDIAN); proto_tree_add_item(flags_tree, hf_openflow_v5_flow_monitor_request_flags_no_abbrev, tvb, offset, 2, ENC_BIG_ENDIAN); proto_tree_add_item(flags_tree, hf_openflow_v5_flow_monitor_request_flags_only_own, tvb, offset, 2, ENC_BIG_ENDIAN); - offset+=4; + offset+=2; /* uint8_t table_id; */ if (tvb_get_guint8(tvb, offset) <= OFPTT_MAX) { @@ -3958,6 +3959,7 @@ dissect_openflow_flow_monitor_request_v5(tvbuff_t *tvb, packet_info *pinfo _U_, /* uint8_t command; */ proto_tree_add_item(tree, hf_openflow_v5_flow_monitor_request_command, tvb, offset, 1, ENC_BIG_ENDIAN); + offset+=1; /* struct ofp_match match; */ dissect_openflow_match_v5(tvb, pinfo, tree, offset, length); @@ -8018,7 +8020,7 @@ proto_register_openflow_v5(void) NULL, HFILL } }, { &hf_openflow_v5_flow_monitor_request_monitor_id, - { "Queue ID", "openflow_v5.flow_monitor_request.monitor_id", + { "Monitor ID", "openflow_v5.flow_monitor_request.monitor_id", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } }, |