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_aas_beam.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_aas_beam.c')
| -rw-r--r-- | plugins/wimax/msg_aas_beam.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/plugins/wimax/msg_aas_beam.c b/plugins/wimax/msg_aas_beam.c index 3e0ab5e9c6..adbccb3cdb 100644 --- a/plugins/wimax/msg_aas_beam.c +++ b/plugins/wimax/msg_aas_beam.c @@ -34,7 +34,7 @@ #include "config.h" #endif -#include <gmodule.h> +#include <glib.h> #include <epan/packet.h> #include "wimax_mac.h" @@ -234,8 +234,8 @@ void dissect_mac_mgmt_msg_aas_beam_select_decoder(tvbuff_t *tvb, packet_info *pi /* ensure the message type is AAS-BEAM-SELECT */ if(payload_type != MAC_MGMT_MSG_AAS_BEAM_SELECT) return; - /* Get the tvb length */ - tvb_len = tvb_length(tvb); + /* Get the tvb reported length */ + tvb_len = tvb_reported_length(tvb); /* display MAC message type */ aas_beam_item = proto_tree_add_protocol_format(tree, proto_mac_mgmt_msg_aas_beam_decoder, tvb, offset, tvb_len, "AAS Beam Select (AAS-BEAM-SELECT) (%u bytes)", tvb_len); /* add subtree */ @@ -267,8 +267,8 @@ static void dissect_mac_mgmt_msg_aas_beam_req_decoder(tvbuff_t *tvb, packet_info /* ensure the message type is AAS-BEAM-REQ */ if(payload_type != MAC_MGMT_MSG_AAS_BEAM_REQ) return; - /* Get the tvb length */ - tvb_len = tvb_length(tvb); + /* Get the tvb reported length */ + tvb_len = tvb_reported_length(tvb); /* display MAC message type */ aas_beam_item = proto_tree_add_protocol_format(tree, proto_mac_mgmt_msg_aas_beam_decoder, tvb, offset, tvb_len, "AAS Beam Request (AAS-BEAM-REQ) (%u bytes)", tvb_len); /* add subtree */ @@ -312,8 +312,8 @@ static void dissect_mac_mgmt_msg_aas_beam_rsp_decoder(tvbuff_t *tvb, packet_info /* ensure the message type is AAS-BEAM-RSP */ if(payload_type != MAC_MGMT_MSG_AAS_BEAM_RSP) return; - /* Get the tvb length */ - tvb_len = tvb_length(tvb); + /* Get the tvb reported length */ + tvb_len = tvb_reported_length(tvb); /* display MAC message type */ aas_beam_item = proto_tree_add_protocol_format(tree, proto_mac_mgmt_msg_aas_beam_decoder, tvb, offset, tvb_len, "AAS Beam Response (AAS-BEAM-RSP) (%u bytes)", tvb_len); /* add subtree */ |