diff options
| author | Guy Harris <guy@alum.mit.edu> | 2007-05-27 18:33:13 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2007-05-27 18:33:13 +0000 |
| commit | 01844e151ad3b5882ef36893aac6339d4ccfd0a7 (patch) | |
| tree | de9cddb64f954a8a5c63aa0fe2c5e32bfac6ed06 /plugins/wimax/msg_arq.c | |
| parent | d99b6c0a8b53bcfd1b857e259d4cb1632302e408 (diff) | |
Use tvb_reported_length() to get the amount of data we should look at;
the number of bytes in the packet or subset of the packet is the
reported length, tvb_length() just gives you the amount of that data
that was actually captured.
Include <glib.h>, not <gmodule.h>, even in plugins.
Fix the version numbers in the rc files.
svn path=/trunk/; revision=21960
Diffstat (limited to 'plugins/wimax/msg_arq.c')
| -rw-r--r-- | plugins/wimax/msg_arq.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/plugins/wimax/msg_arq.c b/plugins/wimax/msg_arq.c index 722b281a66..0b00609395 100644 --- a/plugins/wimax/msg_arq.c +++ b/plugins/wimax/msg_arq.c @@ -34,7 +34,7 @@ #include "moduleinfo.h" -#include <gmodule.h> +#include <glib.h> #include <epan/packet.h> #include <epan/prefs.h> #include "crc.h" @@ -371,8 +371,8 @@ void dissect_mac_mgmt_msg_arq_feedback_decoder(tvbuff_t *tvb, packet_info *pinfo if (tree) { /* we are being asked for details */ - /* Get the tvb length */ - tvb_len = tvb_length(tvb); + /* Get the tvb reported length */ + tvb_len = tvb_reported_length(tvb); /* display MAC payload type ARQ-Feedback */ arq_feedback_item = proto_tree_add_protocol_format(tree, proto_mac_mgmt_msg_arq_feedback_decoder, tvb, offset, tvb_len, "MAC Management Message, ARQ-Feedback (33)"); /* add MAC ARQ Feedback subtree */ @@ -458,8 +458,8 @@ void dissect_mac_mgmt_msg_arq_discard_decoder(tvbuff_t *tvb, packet_info *pinfo if (tree) { /* we are being asked for details */ - /* Get the tvb length */ - tvb_len = tvb_length(tvb); + /* Get the tvb reported length */ + tvb_len = tvb_reported_length(tvb); /* display MAC payload type ARQ-Discard */ arq_discard_item = proto_tree_add_protocol_format(tree, proto_mac_mgmt_msg_arq_discard_decoder, tvb, 0, tvb_len, "MAC Management Message, ARQ-Discard (34)"); /* add MAC ARQ Discard subtree */ @@ -490,8 +490,8 @@ void dissect_mac_mgmt_msg_arq_reset_decoder(tvbuff_t *tvb, packet_info *pinfo _U if (tree) { /* we are being asked for details */ - /* Get the tvb length */ - tvb_len = tvb_length(tvb); + /* Get the tvb reported length */ + tvb_len = tvb_reported_length(tvb); /* display MAC payload type ARQ-Reset */ arq_reset_item = proto_tree_add_protocol_format(tree, proto_mac_mgmt_msg_arq_reset_decoder, tvb, 0, tvb_len, "MAC Management Message, ARQ-Reset (35)"); /* add MAC ARQ Reset subtree */ |