diff options
| author | guy <guy@f5534014-38df-0310-8fa8-9805f1628bb7> | 2001-07-03 04:56:46 +0000 |
|---|---|---|
| committer | guy <guy@f5534014-38df-0310-8fa8-9805f1628bb7> | 2001-07-03 04:56:46 +0000 |
| commit | d939a63ae28c17f97ad6cc6bafb1e1ad7169272b (patch) | |
| tree | 1243cf363092206a1a50c7212ed84fee958369b1 /packet-tr.c | |
| parent | 2e54d1cad358af56682577ca9178637a2c123d47 (diff) | |
Use the "pinfo" argument, rather than the global "pi", to refer to the
packet information in tvbuffified dissectors.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@3645 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'packet-tr.c')
| -rw-r--r-- | packet-tr.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/packet-tr.c b/packet-tr.c index af6add0ef2..31cf29975f 100644 --- a/packet-tr.c +++ b/packet-tr.c @@ -2,12 +2,11 @@ * Routines for Token-Ring packet disassembly * Gilbert Ramirez <gram@xiexie.org> * - * $Id: packet-tr.c,v 1.62 2001/06/18 02:17:53 guy Exp $ + * $Id: packet-tr.c,v 1.63 2001/07/03 04:56:46 guy Exp $ * * Ethereal - Network traffic analyzer - * By Gerald Combs <gerald@zing.org> + * By Gerald Combs <gerald@ethereal.com> * Copyright 1998 Gerald Combs - * * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -439,12 +438,12 @@ dissect_tr(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) ENDTRY; - /* XXX - copy it to some buffer associated with "pi", rather than + /* XXX - copy it to some buffer associated with "*pinfo", rather than just making "trn_shost_nonsr" static? */ - SET_ADDRESS(&pi.dl_src, AT_ETHER, 6, trn_shost_nonsr); - SET_ADDRESS(&pi.src, AT_ETHER, 6, trn_shost_nonsr); - SET_ADDRESS(&pi.dl_dst, AT_ETHER, 6, trn_dhost); - SET_ADDRESS(&pi.dst, AT_ETHER, 6, trn_dhost); + SET_ADDRESS(&pinfo->dl_src, AT_ETHER, 6, trn_shost_nonsr); + SET_ADDRESS(&pinfo->src, AT_ETHER, 6, trn_shost_nonsr); + SET_ADDRESS(&pinfo->dl_dst, AT_ETHER, 6, trn_dhost); + SET_ADDRESS(&pinfo->dst, AT_ETHER, 6, trn_dhost); /* protocol analysis tree */ if (tree) { |