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-lisp-data.c | |
parent | 9cfb5a1ea8dd75c0b1af2bbe0ecf91081ccd8af7 (diff) |
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-lisp-data.c')
-rw-r--r-- | epan/dissectors/packet-lisp-data.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/epan/dissectors/packet-lisp-data.c b/epan/dissectors/packet-lisp-data.c index 959b6cc657..cb25b1825e 100644 --- a/epan/dissectors/packet-lisp-data.c +++ b/epan/dissectors/packet-lisp-data.c @@ -82,10 +82,10 @@ static dissector_handle_t data_handle; static int dissect_lisp_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { - gint offset = 0; - guint8 flags; - guint8 ip_ver; - tvbuff_t *next_tvb; + gint offset = 0; + guint8 flags; + guint8 ip_ver; + tvbuff_t *next_tvb; proto_item *ti; proto_item *tif; proto_tree *lisp_data_tree; @@ -180,7 +180,7 @@ dissect_lisp_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* Check if there is stuff left in the buffer, and return if not */ /* Determine if encapsulated packet is IPv4 or IPv6, and call dissector */ - next_tvb = tvb_new_subset(tvb, LISP_DATA_HEADER_LEN, -1, -1); + next_tvb = tvb_new_subset_remaining(tvb, LISP_DATA_HEADER_LEN); ip_ver = tvb_get_bits8(next_tvb, 0, 4); switch (ip_ver) { case 4: |