Ethereal-dev: Re: [ethereal-dev] BSD/OS and sundry patches...

Note: This archive is from the project's previous web site, ethereal.com. This list is no longer active.

Date Index Thread Index Other Months All Mailing Lists
Date Prev Date Next Thread Prev Thread Next
From: Guy Harris <guy@xxxxxxxxxx>
Date: Tue, 31 Aug 1999 15:56:16 -0700 (PDT)
>  - The MAC address byteswapping code doesn't compile on BSD/OS (probably
> fixed in
>    0.7.3, this patch is relative to 0.7.2).

I've checked an equivalent change into "wiretap/libpcap.c" (the
determination of "bit-swapped or not" is done by Wiretap in 0.7.3; the
FDDI code just does what it's told).

No changes to "packet-fddi.c" were made ("swap_mac_addr()" is always
supposed to bit-swap the MAC address, and "swaptab[]" is always included
in "packet-fddi.c").

The patch is:

Index: libpcap.c
===================================================================
RCS file: /usr/local/cvsroot/ethereal/wiretap/libpcap.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -c -r1.16 -r1.17
*** libpcap.c	1999/08/28 01:19:44	1.16
--- libpcap.c	1999/08/31 22:36:20	1.17
***************
*** 53,59 ****
  	  (((x)&0x00FF)<<8))
  
  /* On some systems, the FDDI MAC addresses are bit-swapped. */
! #if !defined(ultrix) && !defined(__alpha) && !defined(__bsdi)
  #define BIT_SWAPPED_MAC_ADDRS
  #endif
  
--- 53,59 ----
  	  (((x)&0x00FF)<<8))
  
  /* On some systems, the FDDI MAC addresses are bit-swapped. */
! #if !defined(ultrix) && !defined(__alpha) && !defined(__bsdi__)
  #define BIT_SWAPPED_MAC_ADDRS
  #endif