Attachment 82348 Details for Bug 117803 – kismet-freebsd7.diff

[patch] kismet-freebsd7.diff

kismet-freebsd7.diff (text/x-patch), 3.00 KB, created by Tom McLaughlin on 2007-11-05 18:29:31 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tom McLaughlin

Created: 2007-11-05 18:29:31 UTC

Size: 3.00 KB

patch

obsolete

>? .build.out.swp
>? kismet-freebsd7.diff
>Index: Makefile
>===================================================================
>RCS file: /ncvs/ports/net-mgmt/kismet/Makefile,v
>retrieving revision 1.15
>diff -u -r1.15 Makefile
>--- Makefile	23 Oct 2007 23:54:09 -0000	1.15
>+++ Makefile	5 Nov 2007 18:27:01 -0000
>@@ -7,6 +7,7 @@
> 
> PORTNAME=	kismet
> PORTVERSION=	200710.r1
>+PORTREVISION=	1
> CATEGORIES=	net-mgmt
> MASTER_SITES=	http://www.kismetwireless.net/code/
> DISTNAME=	kismet-2007-10-R1
>Index: files/patch-pcapsource.cc
>===================================================================
>RCS file: files/patch-pcapsource.cc
>diff -N files/patch-pcapsource.cc
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ files/patch-pcapsource.cc	5 Nov 2007 18:27:01 -0000
>@@ -0,0 +1,44 @@
>+--- pcapsource.cc.orig	2007-10-06 17:09:03.000000000 -0400
>++++ pcapsource.cc	2007-11-05 13:10:18.825873000 -0500
>+@@ -837,15 +837,15 @@
>+ #define	IEEE80211_CHAN_T \
>+ 	(IEEE80211_CHAN_5GHZ | IEEE80211_CHAN_OFDM | IEEE80211_CHAN_TURBO)
>+ 
>+-#define	IEEE80211_IS_CHAN_FHSS(_flags) \
>++#define	KISMET_IEEE80211_IS_CHAN_FHSS(_flags) \
>+ 	((_flags & IEEE80211_CHAN_FHSS) == IEEE80211_CHAN_FHSS)
>+-#define	IEEE80211_IS_CHAN_A(_flags) \
>++#define	KISMET_IEEE80211_IS_CHAN_A(_flags) \
>+ 	((_flags & IEEE80211_CHAN_A) == IEEE80211_CHAN_A)
>+-#define	IEEE80211_IS_CHAN_B(_flags) \
>++#define	KISMET_IEEE80211_IS_CHAN_B(_flags) \
>+ 	((_flags & IEEE80211_CHAN_B) == IEEE80211_CHAN_B)
>+-#define	IEEE80211_IS_CHAN_PUREG(_flags) \
>++#define	KISMET_IEEE80211_IS_CHAN_PUREG(_flags) \
>+ 	((_flags & IEEE80211_CHAN_PUREG) == IEEE80211_CHAN_PUREG)
>+-#define	IEEE80211_IS_CHAN_G(_flags) \
>++#define	KISMET_IEEE80211_IS_CHAN_G(_flags) \
>+ 	((_flags & IEEE80211_CHAN_G) == IEEE80211_CHAN_G)
>+ #define	IEEE80211_IS_CHAN_T(_flags) \
>+ 	((_flags & IEEE80211_CHAN_T) == IEEE80211_CHAN_T)
>+@@ -972,15 +972,15 @@
>+             switch (bit) {
>+                 case IEEE80211_RADIOTAP_CHANNEL:
>+                     packet->channel = ieee80211_mhz2ieee(u.u16, u2.u16);
>+-                    if (IEEE80211_IS_CHAN_FHSS(u2.u16))
>++                    if (KISMET_IEEE80211_IS_CHAN_FHSS(u2.u16))
>+                         packet->carrier = carrier_80211dsss;
>+-                    else if (IEEE80211_IS_CHAN_A(u2.u16))
>++                    else if (KISMET_IEEE80211_IS_CHAN_A(u2.u16))
>+                         packet->carrier = carrier_80211a;
>+-                    else if (IEEE80211_IS_CHAN_B(u2.u16))
>++                    else if (KISMET_IEEE80211_IS_CHAN_B(u2.u16))
>+                         packet->carrier = carrier_80211b;
>+-                    else if (IEEE80211_IS_CHAN_PUREG(u2.u16))
>++                    else if (KISMET_IEEE80211_IS_CHAN_PUREG(u2.u16))
>+                         packet->carrier = carrier_80211g;
>+-                    else if (IEEE80211_IS_CHAN_G(u2.u16))
>++                    else if (KISMET_IEEE80211_IS_CHAN_G(u2.u16))
>+                         packet->carrier = carrier_80211g;
>+                     else if (IEEE80211_IS_CHAN_T(u2.u16))
>+                         packet->carrier = carrier_80211a;/*XXX*/

Actions: View | Diff

Attachments on bug 117803: 82347 | 82348