diff options
| author | Bill Meier <wmeier@newsguy.com> | 2012-03-06 16:58:09 +0000 |
|---|---|---|
| committer | Bill Meier <wmeier@newsguy.com> | 2012-03-06 16:58:09 +0000 |
| commit | 87cf82e0561555493917eb8d5acb593ad73214d9 (patch) | |
| tree | 8200697d203e7a7537f7aa02fd6a22c2b35f53ea /epan/dissectors/packet-mactelnet.c | |
| parent | 9cfb5a1ea8dd75c0b1af2bbe0ecf91081ccd8af7 (diff) | |
| download | wireshark-87cf82e0561555493917eb8d5acb593ad73214d9.tar.gz | |
Use tvb_new_subset_remaining() rather than tvb_new_subset();
#include <styring.h> not req'd (in a few cases);
Minor reformating & whitespace cleanup.
svn path=/trunk/; revision=41374
Diffstat (limited to 'epan/dissectors/packet-mactelnet.c')
| -rw-r--r-- | epan/dissectors/packet-mactelnet.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/epan/dissectors/packet-mactelnet.c b/epan/dissectors/packet-mactelnet.c index ebc6e94457..c048919a07 100644 --- a/epan/dissectors/packet-mactelnet.c +++ b/epan/dissectors/packet-mactelnet.c @@ -114,10 +114,10 @@ dissect_mactelnet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree *mactelnet_tree; proto_item *mactelnet_control_item; proto_tree *mactelnet_control_tree; - int foundping = -1; - int foundclient = -1; - int foundserver = -1; - guint16 type; + int foundping = -1; + int foundclient = -1; + int foundserver = -1; + guint16 type; /* Check that there's enough data */ if (tvb_length(tvb) < 18) @@ -216,7 +216,7 @@ dissect_mactelnet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (type == 1) { while(tvb_reported_length_remaining(tvb, offset) > 0) { if (tvb_reported_length_remaining(tvb, offset) > 4 && tvb_get_ntohl(tvb, offset) == control_packet) { - guint8 datatype; + guint8 datatype; guint32 datalength; /* Add subtree for control packet */ @@ -268,13 +268,13 @@ dissect_mactelnet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset += datalength; } else { /* Data packet, let wireshark handle it */ - tvbuff_t *next_client = tvb_new_subset(tvb, offset, -1, -1); + tvbuff_t *next_client = tvb_new_subset_remaining(tvb, offset); return call_dissector(data_handle, next_client, pinfo, mactelnet_tree); } } } else if (type == 4 || type == 5) { /* Data packet, let wireshark handle it */ - tvbuff_t *next_client = tvb_new_subset(tvb, offset, -1, -1); + tvbuff_t *next_client = tvb_new_subset_remaining(tvb, offset); return call_dissector(data_handle, next_client, pinfo, mactelnet_tree); } |