From Jason Copenhaver: put the address fields in the Ethernet header in

the right order.

svn path=/trunk/; revision=7208

diff --git a/AUTHORS b/AUTHORS
index 687080ec3d70b17c0fd5d81921ab700bd2972d63..eed86588048727c7ce585bee4948e952b43d492e 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -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 88c8c1a4253d0345e3110fe8dacc7f95e49b5df6..086d45a08200619e40b60a999e893a0e431e0671 100644 (file)
--- 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 805e5ea93b8030ce1d20ddc32f2c7ec6686ae9c7..5a9d5ace537368627f6e161935411100bcac5be5 100644 (file)
--- 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;