Fix build on DragonFly.

4 files changed, 131 insertions, 4 deletions

diff --git a/net/kismet/distinfo b/net/kismet/distinfo
index eb8eb2c2f15..24bfc9d3ab0 100644
--- a/net/kismet/distinfo
+++ b/net/kismet/distinfo
@@ -1,10 +1,12 @@
-$NetBSD: distinfo,v 1.1.1.1 2006/08/03 15:09:49 salo Exp $
+$NetBSD: distinfo,v 1.2 2006/10/09 18:48:35 joerg Exp $
 
 SHA1 (kismet-2006-04-R1.tar.gz) = e48ce08e96328bfdac98152df6b5759c27ed9169
 RMD160 (kismet-2006-04-R1.tar.gz) = b709256198820d5ac650ce40dea637716427a8b7
 Size (kismet-2006-04-R1.tar.gz) = 1005068 bytes
 SHA1 (patch-aa) = 4023dc19876daab6f7eeffe215f05e371eea0a36
 SHA1 (patch-ab) = a77adf2212909b18f7afb65cdfb19539ee3b2f0b
-SHA1 (patch-ac) = 1195cdb9ccc09ffd0bd4e987724da2859a6ae6ba
+SHA1 (patch-ac) = cb02c5d97b22a49e8c59ae2d62537a6cbdd899da
 SHA1 (patch-ad) = 6442e2f571cb266560eaa8dc5e6500ff1b9db4fb
 SHA1 (patch-ae) = d99c33d5db327c33024f316133c1da8c602ab508
+SHA1 (patch-af) = 960246131eda2d8b4a70711b751b1fce9609d2fa
+SHA1 (patch-ag) = 92f302f26abaa1882277c56af4a8c072d4f7db7d
diff --git a/net/kismet/patches/patch-ac b/net/kismet/patches/patch-ac
index 18e2cc3b354..926d5ee6e05 100644
--- a/net/kismet/patches/patch-ac
+++ b/net/kismet/patches/patch-ac
@@ -1,6 +1,6 @@
-$NetBSD: patch-ac,v 1.1.1.1 2006/08/03 15:09:49 salo Exp $
+$NetBSD: patch-ac,v 1.2 2006/10/09 18:48:35 joerg Exp $
 
---- pcapsource.cc.orig	2005-08-16 01:22:51.000000000 +0000
+--- pcapsource.cc.orig	2006-04-02 15:13:00.000000000 +0000
 +++ pcapsource.cc
 @@ -44,7 +44,9 @@ typedef unsigned long u64;
  #include <net/if_media.h>
@@ -12,3 +12,93 @@ $NetBSD: patch-ac,v 1.1.1.1 2006/08/03 15:09:49 salo Exp $
  
  #ifdef HAVE_RADIOTAP
  #include <net80211/ieee80211.h>
+@@ -54,12 +56,15 @@ typedef unsigned long u64;
+ 
+ #endif
+ 
+-#ifdef SYS_FREEBSD
++#if defined(SYS_FREEBSD) || defined(__DragonFly__)
+ #include <sys/socket.h>
+ #include <net/if.h>
+ #include <net/if_media.h>
+ 
+-#ifdef HAVE_RADIOTAP
++#if defined(__DragonFly__)
++#include <netproto/802_11/ieee80211_ioctl.h>
++#include <netproto/802_11/ieee80211_radiotap.h>
++#elif defined HAVE_RADIOTAP
+ #include <net80211/ieee80211_ioctl.h>
+ #include <net80211/ieee80211_radiotap.h>
+ #endif
+@@ -185,7 +190,7 @@ int PcapSource::DatalinkType() {
+     datalink_type = pcap_datalink(pd);
+ 
+     // Blow up if we're not valid 802.11 headers
+-#if (defined(SYS_FREEBSD) || defined(SYS_OPENBSD)) || defined(SYS_NETBSD)
++#if (defined(SYS_FREEBSD) || defined(SYS_OPENBSD)) || defined(SYS_NETBSD) || defined(__DragonFly__)
+     if (datalink_type == DLT_EN10MB) {
+         fprintf(stderr, "WARNING:  pcap reports link type of EN10MB but we'll fake "
+                 "it on BSD.\n"
+@@ -983,7 +988,7 @@ int PcapSourceOpenBSDPrism::FetchChannel
+ }
+ #endif
+ 
+-#if (defined(HAVE_RADIOTAP) && (defined(SYS_NETBSD) || defined(SYS_OPENBSD) || defined(SYS_FREEBSD)))
++#if (defined(HAVE_RADIOTAP) && (defined(SYS_NETBSD) || defined(SYS_OPENBSD) || defined(SYS_FREEBSD) || defined(__DragonFly__)))
+ int PcapSourceRadiotap::OpenSource() {
+     // XXX this is a hack to avoid duplicating code
+     int s = PcapSource::OpenSource();
+@@ -1097,7 +1102,7 @@ KisPacketSource *pcapsource_openbsdprism
+ }
+ #endif
+ 
+-#if (defined(HAVE_RADIOTAP) && (defined(SYS_NETBSD) || defined(SYS_OPENBSD) || defined(SYS_FREEBSD)))
++#if (defined(HAVE_RADIOTAP) && (defined(SYS_NETBSD) || defined(SYS_OPENBSD) || defined(SYS_FREEBSD) || defined(__DragonFly__)))
+ KisPacketSource *pcapsource_radiotap_registrant(string in_name, string in_device,
+                                                      char *in_err) {
+     return new PcapSourceRadiotap(in_name, in_device);
+@@ -2698,7 +2703,7 @@ int chancontrol_openbsd_prism2(const cha
+ }
+ #endif
+ 
+-#if (defined(HAVE_RADIOTAP) && (defined(SYS_NETBSD) || defined(SYS_OPENBSD) || defined(SYS_FREEBSD)))
++#if (defined(HAVE_RADIOTAP) && (defined(SYS_NETBSD) || defined(SYS_OPENBSD) || defined(SYS_FREEBSD) || defined(__DragonFly__)))
+ RadiotapBSD::RadiotapBSD(const char *name) : ifname(name) {
+     s = -1;
+ }
+@@ -2849,7 +2854,7 @@ bool RadiotapBSD::set80211(int type, int
+     return true;
+ }
+ 
+-#elif defined(SYS_FREEBSD) /* FreeBSD has a generic 802.11 ioctl */
++#elif defined(SYS_FREEBSD) || defined(__DragonFly__) /* FreeBSD has a generic 802.11 ioctl */
+ 
+ bool RadiotapBSD::get80211(int type, int& val, int len, u_int8_t *data) {
+     struct ieee80211req ireq;
+@@ -2898,7 +2903,7 @@ bool RadiotapBSD::getifflags(int& flags)
+     }
+ #if defined(SYS_FREEBSD)
+     flags = (ifr.ifr_flags & 0xffff) | (ifr.ifr_flagshigh << 16);
+-#elif defined(SYS_OPENBSD) || defined(SYS_NETBSD)
++#elif defined(SYS_OPENBSD) || defined(SYS_NETBSD) || defined(__DragonFly__)
+     flags = ifr.ifr_flags;
+ #endif
+     return true;
+@@ -2915,7 +2920,7 @@ bool RadiotapBSD::setifflags(int flags) 
+ #if defined(SYS_FREEBSD)
+     ifr.ifr_flags = flags & 0xffff;
+     ifr.ifr_flagshigh = flags >> 16;
+-#elif defined(SYS_OPENBSD) || (SYS_NETBSD)
++#elif defined(SYS_OPENBSD) || (SYS_NETBSD) || defined(__DragonFly__)
+     ifr.ifr_flags = flags;
+ #endif
+     if (ioctl(s, SIOCSIFFLAGS, (caddr_t)&ifr) < 0) {
+@@ -2946,7 +2951,7 @@ bool RadiotapBSD::monitor_enable(int ini
+     }
+ #if defined(SYS_FREEBSD)
+     if (!setifflags(prev_flags | IFF_PPROMISC | IFF_UP)) {
+-#elif defined(SYS_OPENBSD) || defined(SYS_NETBSD)
++#elif defined(SYS_OPENBSD) || defined(SYS_NETBSD) || defined(__DragonFly__)
+     if (!setifflags(prev_flags | IFF_PROMISC | IFF_UP)) {
+ #endif
+ 	(void) set80211(IEEE80211_IOC_CHANNEL, prev_chan, 0, NULL);
diff --git a/net/kismet/patches/patch-af b/net/kismet/patches/patch-af
new file mode 100644
index 00000000000..32616c3ea6c
--- /dev/null
+++ b/net/kismet/patches/patch-af
@@ -0,0 +1,13 @@
+$NetBSD: patch-af,v 1.1 2006/10/09 18:48:35 joerg Exp $
+
+--- kis_packsources.cc.orig	2006-10-09 20:10:16.000000000 +0000
++++ kis_packsources.cc
+@@ -272,7 +272,7 @@ int RegisterKismetSources(Packetsourcetr
+     REG_EMPTY_CARD(sourcetracker, "prism2_openbsd");
+ #endif
+ 
+-#if (defined(HAVE_RADIOTAP) && defined(HAVE_LIBPCAP) && (defined(SYS_NETBSD) || defined(SYS_OPENBSD) || defined(SYS_FREEBSD)))
++#if (defined(HAVE_RADIOTAP) && defined(HAVE_LIBPCAP) && (defined(SYS_NETBSD) || defined(SYS_OPENBSD) || defined(SYS_FREEBSD) || defined(__DragonFly__)))
+     sourcetracker->RegisterPacketsource("radiotap_bsd_ab", 1, "IEEE80211ab", 6,
+                                         pcapsource_radiotap_registrant,
+                                         monitor_bsd, unmonitor_bsd,
diff --git a/net/kismet/patches/patch-ag b/net/kismet/patches/patch-ag
new file mode 100644
index 00000000000..69f768d2977
--- /dev/null
+++ b/net/kismet/patches/patch-ag
@@ -0,0 +1,22 @@
+$NetBSD: patch-ag,v 1.1 2006/10/09 18:48:35 joerg Exp $
+
+--- pcapsource.h.orig	2006-10-09 20:20:31.000000000 +0000
++++ pcapsource.h
+@@ -280,7 +280,7 @@ public:
+ };
+ #endif
+ 
+-#if (defined(HAVE_RADIOTAP) && (defined(SYS_NETBSD) || defined(SYS_OPENBSD) || defined(SYS_FREEBSD)))
++#if (defined(HAVE_RADIOTAP) && (defined(SYS_NETBSD) || defined(SYS_OPENBSD) || defined(SYS_FREEBSD) || defined(__DragonFly__)))
+ class RadiotapBSD {
+ public:
+     RadiotapBSD(const char *ifname);
+@@ -455,7 +455,7 @@ int chancontrol_openbsd_prism2(const cha
+                                void *in_ext);
+ #endif
+ 
+-#if (defined(HAVE_RADIOTAP) && (defined(SYS_NETBSD) || defined(SYS_OPENBSD) || defined(SYS_FREEBSD)))
++#if (defined(HAVE_RADIOTAP) && (defined(SYS_NETBSD) || defined(SYS_OPENBSD) || defined(SYS_FREEBSD) || defined(__DragonFly__)))
+ int monitor_bsd(const char *in_dev, int initch, char *in_err, void **in_if, void *in_ext);
+ int unmonitor_bsd(const char *in_dev, int initch, char *in_err, void **in_if, void *in_ext);
+ int chancontrol_bsd(const char *in_dev, int in_ch, char *in_err, void *in_ext);