1997-01-14 05:06:33 +00:00
|
|
|
--- support/ethertalk/bpfiltp.c.orig Tue Jan 14 11:15:34 1997
|
|
|
|
|
+++ support/ethertalk/bpfiltp.c Tue Jan 14 13:18:36 1997
|
|
|
|
|
@@ -41,6 +41,14 @@
|
1997-01-08 23:11:44 +00:00
|
|
|
#include <net/if.h>
|
|
|
|
|
#include <net/bpf.h>
|
|
|
|
|
#include <netinet/in.h>
|
1997-01-14 05:06:33 +00:00
|
|
|
+#ifdef __FreeBSD__
|
1996-12-01 12:08:47 +00:00
|
|
|
+#if __FreeBSD__ >= 2
|
|
|
|
|
+#include <osreldate.h>
|
|
|
|
|
+#endif
|
1997-02-21 08:48:03 +00:00
|
|
|
+#if __FreeBSD_version >= 300000
|
1997-01-14 05:06:33 +00:00
|
|
|
+#include <net/if_var.h>
|
|
|
|
|
+#endif
|
|
|
|
|
+#endif /*__FreeBSD__*/
|
|
|
|
|
#include <netinet/if_ether.h>
|
|
|
|
|
#include <netdb.h>
|
|
|
|
|
#include <ctype.h>
|
|
|
|
|
@@ -785,7 +793,7 @@
|
1996-12-01 12:08:47 +00:00
|
|
|
|
|
|
|
|
bcopy(eaddr, &eh.ether_dhost, 6);
|
|
|
|
|
#ifdef PHASE2
|
|
|
|
|
-#ifdef __FreeBSD__
|
|
|
|
|
+#if defined(__FreeBSD__) && __FreeBSD_version <= 199607
|
|
|
|
|
/* This should really be fixed in the kernel. */
|
|
|
|
|
eh.ether_type = buflen;
|
|
|
|
|
#else
|
1997-01-14 05:06:33 +00:00
|
|
|
@@ -806,7 +814,7 @@
|
1996-12-01 12:08:47 +00:00
|
|
|
*q++ = (eph->protocol >> 8) & 0xff;
|
|
|
|
|
*q++ = (eph->protocol & 0xff);
|
|
|
|
|
#else PHASE2
|
|
|
|
|
-#ifdef __FreeBSD__
|
|
|
|
|
+#if defined(__FreeBSD__) && __FreeBSD_version <= 199607
|
|
|
|
|
/* This should really be fixed in the kernel. */
|
|
|
|
|
eh.ether_type = eph->protocol;
|
|
|
|
|
#else
|
