aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRonnie Sahlberg <ronnie_sahlberg@ozemail.com.au>2003-05-16 10:24:13 +0000
committerRonnie Sahlberg <ronnie_sahlberg@ozemail.com.au>2003-05-16 10:24:13 +0000
commitbe8c81fc8414bcc12a5a166566218c81d2c082ff (patch)
treed616e76350990bce0e08cd284f8d740086455250
parentb66de3ff980bef173a04057b2b5fd73b2c6f7001 (diff)
Tap SMB packets before we call the dissecotrs so that even if there
is an exception (i.e. short packet) the tap listener will still be alled. svn path=/trunk/; revision=7684
-rw-r--r--packet-smb.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/packet-smb.c b/packet-smb.c
index db5dabd9c1..a4bd300b92 100644
--- a/packet-smb.c
+++ b/packet-smb.c
@@ -3,7 +3,7 @@
* Copyright 1999, Richard Sharpe <rsharpe@ns.aus.com>
* 2001 Rewrite by Ronnie Sahlberg and Guy Harris
*
- * $Id: packet-smb.c,v 1.339 2003/05/15 02:14:00 tpot Exp $
+ * $Id: packet-smb.c,v 1.340 2003/05/16 10:24:13 sahlberg Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -16073,6 +16073,11 @@ dissect_smb(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
offset += 2;
pinfo->private_data = si;
+
+ /* tap the packet before the dissectors are called so we still get
+ the tap listener called even if there is an exception.
+ */
+ tap_queue_packet(smb_tap, pinfo, si);
dissect_smb_command(tvb, pinfo, offset, tree, si->cmd, TRUE);
/* Append error info from this packet to info string. */
@@ -16106,8 +16111,6 @@ dissect_smb(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
}
}
}
-
- tap_queue_packet(smb_tap, pinfo, si);
}
static gboolean