aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2008-08-02 21:59:33 +0000
committerGuy Harris <guy@alum.mit.edu>2008-08-02 21:59:33 +0000
commitea4fbda062c37643112842b07dc19b2144dfc2c7 (patch)
treee39e1ad89bbdac5f75f73f7b86dbc9529a2d4177
parent38ac8519580c0f026da04c39b90966ec36d2239c (diff)
Don't fetch data until you need it.
svn path=/trunk/; revision=25907
-rw-r--r--epan/dissectors/packet-netflow.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/epan/dissectors/packet-netflow.c b/epan/dissectors/packet-netflow.c
index 2250c8edfb..ff56b276f7 100644
--- a/epan/dissectors/packet-netflow.c
+++ b/epan/dissectors/packet-netflow.c
@@ -2665,15 +2665,16 @@ dissect_v9_template(proto_tree * pdutree, tvbuff_t * tvb, int offset, int len, h
guint16 type, length;
guint32 pen = 0;
+ field_item = proto_tree_add_text(template_tree, tvb,
+ offset, 4, "Field (%u/%u)", i, count);
+ field_tree = proto_item_add_subtree(field_item, ett_field);
+
type = tvb_get_ntohs(tvb, offset);
length = tvb_get_ntohs(tvb, offset + 2);
if (type & 0x8000) {
pen = tvb_get_ntohl(tvb, offset + 4);
}
- field_item = proto_tree_add_text(template_tree, tvb,
- offset, 4, "Field (%u/%u)", i, count);
- field_tree = proto_item_add_subtree(field_item, ett_field);
if ((type & 0x8000) && (pen != REVPEN)) { /* except reverse pen */
proto_tree_add_text(field_tree,
tvb, offset, 2,