Changeset 1713

Timestamp:

02/26/07 16:38:55 (23 months ago)

Author:

aturner

Message:

more win32 fixes, and fix pcap_sendpacket() support. refs #110

Location:

trunk/src

Files:

• common/sendpacket.c (modified) (2 diffs)
• defines.h.in (modified) (1 diff)

trunk/src/common/sendpacket.c

@@ -70 +70 @@
 #include "sendpacket.h"
 
+#if (defined HAVE_WINPCAP && defined HAVE_PCAP_INJECT)
+#undef HAVE_PCAP_INJECT /* configure returns true for some odd reason */
+#endif
+
 #if !defined HAVE_PCAP_INJECT && !defined HAVE_PCAP_SENDPACKET && !defined HAVE_LIBNET && !defined HAVE_PF_PACKET && !defined HAVE_BPF
 #error You need pcap_inject() or pcap_sendpacket() from libpcap, libnet 1.1.3+, Linux's PF_PACKET or *BSD's BPF
@@ -129 +133 @@
 #endif /* HAVE_LIBNET */
 
-#if (defined HAVE_PCAP_INJECT || defined HAVE_PACKET_SENDPACKET)
-#include <pcap.h>
+#if (defined HAVE_PCAP_INJECT || defined HAVE_PCAP_SENDPACKET)
 static sendpacket_t *sendpacket_open_pcap(const char *, char *) __attribute__((unused));
 static struct tcpr_ether_addr *sendpacket_get_hwaddr_pcap(sendpacket_t *) __attribute__((unused));

trunk/src/defines.h.in

@@ -191 +191 @@
 
 
+/* Win32 doesn't know about PF_INET6 */
+#ifndef PF_INET6
+#ifdef AF_INET6
+#define PF_INET6 AF_INET6
+#else
+#define PF_INET6 30 /* stolen from OS/X */
+#endif
+#endif
 
 #endif /* DEFINES */