From c85a7472cbcac252b30e2dc9dc5e041ba85c28eb Mon Sep 17 00:00:00 2001 From: guy Date: Thu, 27 Feb 2003 02:31:00 +0000 Subject: [PATCH] From Jason Copenhaver: put the address fields in the Ethernet header in the right order. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@7208 f5534014-38df-0310-8fa8-9805f1628bb7 --- AUTHORS | 1 + doc/ethereal.pod.template | 1 + text2pcap.c | 4 ++-- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/AUTHORS b/AUTHORS index 687080ec3d..eed8658804 100644 --- a/AUTHORS +++ b/AUTHORS @@ -1626,6 +1626,7 @@ And assorted fixes and enhancements by the people listed above and by: Pavel Roskin Laurent Meyer Georgi Guninski + Jason Copenhaver Alain Magloire was kind enough to give his permission to use his version of snprintf.c. diff --git a/doc/ethereal.pod.template b/doc/ethereal.pod.template index 88c8c1a425..086d45a082 100644 --- a/doc/ethereal.pod.template +++ b/doc/ethereal.pod.template @@ -1729,6 +1729,7 @@ B. Pavel Roskin Laurent Meyer Georgi Guninski + Jason Copenhaver Alain Magloire was kind enough to give his permission to use his version of snprintf.c. diff --git a/text2pcap.c b/text2pcap.c index 805e5ea93b..5a9d5ace53 100644 --- a/text2pcap.c +++ b/text2pcap.c @@ -6,7 +6,7 @@ * * (c) Copyright 2001 Ashok Narayanan * - * $Id: text2pcap.c,v 1.24 2002/10/17 20:02:00 guy Exp $ + * $Id: text2pcap.c,v 1.25 2003/02/27 02:30:59 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs @@ -211,8 +211,8 @@ static const char *token_str[] = {"", /* ----- Skeleton Packet Headers --------------------------------------------------*/ typedef struct { - guint8 src_addr[6]; guint8 dest_addr[6]; + guint8 src_addr[6]; guint16 l3pid; } hdr_ethernet_t; -- 2.34.1