diff options
| author | Guy Harris <guy@alum.mit.edu> | 2003-02-27 02:31:00 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2003-02-27 02:31:00 +0000 |
| commit | 1697aac42993aeee85cb4fa51ee50c06a806e7d9 (patch) | |
| tree | 097717028bbacaabbe228631d9b245f9a7c3c69b | |
| parent | dd4aa69e832a4dfa3fdf2ba57f3f1913a3b8eac5 (diff) | |
| download | wireshark-1697aac42993aeee85cb4fa51ee50c06a806e7d9.tar.gz | |
From Jason Copenhaver: put the address fields in the Ethernet header in
the right order.
svn path=/trunk/; revision=7208
| -rw-r--r-- | AUTHORS | 1 | ||||
| -rw-r--r-- | doc/ethereal.pod.template | 1 | ||||
| -rw-r--r-- | text2pcap.c | 4 |
3 files changed, 4 insertions, 2 deletions
@@ -1626,6 +1626,7 @@ And assorted fixes and enhancements by the people listed above and by: Pavel Roskin <proski [AT] gnu.org> Laurent Meyer <laurent.meyer [AT] thales-avionics.com> Georgi Guninski <guninski [AT] guninski.com> + Jason Copenhaver <jcopenha [AT] typedef.org> Alain Magloire <alainm[AT]rcsm.ece.mcgill.ca> 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<http://www.ethereal.com>. Pavel Roskin <proski [AT] gnu.org> Laurent Meyer <laurent.meyer [AT] thales-avionics.com> Georgi Guninski <guninski [AT] guninski.com> + Jason Copenhaver <jcopenha [AT] typedef.org> Alain Magloire <alainm[AT]rcsm.ece.mcgill.ca> 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 <ashokn@cisco.com> * - * $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 <gerald@ethereal.com> @@ -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; |