diff options
| author | Guy Harris <guy@alum.mit.edu> | 2000-12-02 08:41:08 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2000-12-02 08:41:08 +0000 |
| commit | 0ab8e159b913cf0537df6b407c4cabac9fe196e7 (patch) | |
| tree | 459183fb6c07494e3982e6837363d3e4b8f2ba19 /packet-tftp.c | |
| parent | 75acffe70c5a17c20324094c15397ff60a8641de (diff) | |
| download | wireshark-0ab8e159b913cf0537df6b407c4cabac9fe196e7.tar.gz wireshark-0ab8e159b913cf0537df6b407c4cabac9fe196e7.tar.bz2 wireshark-0ab8e159b913cf0537df6b407c4cabac9fe196e7.zip | |
Some tvbuffified dissectors weren't setting "pinfo->current_proto", so
that if they threw an exception, the wrong protocol would be blamed.
Add the missing assignments.
Clean up the extraction of the null-encapsulation header.
svn path=/trunk/; revision=2730
Diffstat (limited to 'packet-tftp.c')
| -rw-r--r-- | packet-tftp.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/packet-tftp.c b/packet-tftp.c index cf43f262e7..5161344e6d 100644 --- a/packet-tftp.c +++ b/packet-tftp.c @@ -5,7 +5,7 @@ * Craig Newell <CraigN@cheque.uq.edu.au> * RFC2347 TFTP Option Extension * - * $Id: packet-tftp.c,v 1.18 2000/11/19 08:54:09 guy Exp $ + * $Id: packet-tftp.c,v 1.19 2000/12/02 08:41:08 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -100,6 +100,8 @@ dissect_tftp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) CHECK_DISPLAY_AS_DATA(proto_tftp, tvb, pinfo, tree); + pinfo->current_proto = "TFTP"; + /* * The first TFTP packet goes to the TFTP port; the second one * comes from some *other* port, but goes back to the same |