From f3d90d30a49382db3955b9ece00d71fe12d54c49 Mon Sep 17 00:00:00 2001 From: Guy Harris Date: Thu, 18 May 2000 09:09:50 +0000 Subject: Remove the "union pseudo_header" from the "frame_data" structure; there's no need to keep it around in memory - when the frame data is read in when handing a frame, read in the information, if any, necessary to reconstruct the frame header, and reconstruct it. This saves some memory. This requires that the seek-and-read function be implemented inside Wiretap, and that the Wiretap handle remain open even after we've finished reading the file sequentially. This also points out that we can't really do X.25-over-Ethernet correctly, as we don't know where the direction (DTE->DCE or DCE->DTE) flag is stored; it's not clear how the Ethernet type 0x0805 for X.25 Layer 3 is supposed to be handled in any case. We eliminate X.25-over-Ethernet support (until we find out what we're supposed to do). svn path=/trunk/; revision=1975 --- capture.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'capture.c') diff --git a/capture.c b/capture.c index 5b39ea749c..ecbfc3b555 100644 --- a/capture.c +++ b/capture.c @@ -1,7 +1,7 @@ /* capture.c * Routines for packet capture windows * - * $Id: capture.c,v 1.101 2000/05/06 07:07:27 guy Exp $ + * $Id: capture.c,v 1.102 2000/05/18 09:05:25 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs @@ -951,7 +951,7 @@ capture_pcap_cb(u_char *user, const struct pcap_pkthdr *phdr, whdr.pkt_encap = ld->linktype; /* XXX - do something if this fails */ - wtap_dump(ld->pdh, &whdr, pd, &err); + wtap_dump(ld->pdh, &whdr, NULL, pd, &err); } /* Set the initial payload to the packet length, and the initial -- cgit v1.2.3