From d939a63ae28c17f97ad6cc6bafb1e1ad7169272b Mon Sep 17 00:00:00 2001 From: guy Date: Tue, 3 Jul 2001 04:56:46 +0000 Subject: 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 --- packet-tr.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) (limited to 'packet-tr.c') 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 * - * $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 + * By Gerald Combs * 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) { -- cgit v1.2.3