From 1e90fbdc365a23b9dc6c1f5f37e113ec235799df Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Sat, 4 Feb 2012 19:59:27 +0000 Subject: [PATCH] [packages_10.03.2] horst: merge r29270 SVN-Revision: 30096 --- net/horst/Makefile | 8 +- net/horst/patches/001-endian_fixes.patch | 96 ----------------------- net/horst/patches/100-compile-fixes.patch | 12 ++- 3 files changed, 9 insertions(+), 107 deletions(-) delete mode 100644 net/horst/patches/001-endian_fixes.patch diff --git a/net/horst/Makefile b/net/horst/Makefile index 1f3f740a8d..a8a6028fe6 100644 --- a/net/horst/Makefile +++ b/net/horst/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=horst -PKG_VERSION:=2.0-rc1 -PKG_RELEASE:=2 +PKG_VERSION:=3.0 +PKG_RELEASE:=1 -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).zip +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://br1.einfach.org/horst_dl/ -PKG_MD5SUM:=7eb6f7ae819722b1fcdd86df98f7884d +PKG_MD5SUM:=076d836733fb6ce53a590eddf92ad358 PKG_BUILD_PARALLEL:=1 diff --git a/net/horst/patches/001-endian_fixes.patch b/net/horst/patches/001-endian_fixes.patch deleted file mode 100644 index 0c37c169f5..0000000000 --- a/net/horst/patches/001-endian_fixes.patch +++ /dev/null @@ -1,96 +0,0 @@ ---- a/protocol_parser.c -+++ b/protocol_parser.c -@@ -23,6 +23,7 @@ - #include - #include - #include -+#include - - #include "prism_header.h" - #include "ieee80211_radiotap.h" -@@ -166,6 +167,7 @@ parse_radiotap_header(unsigned char** bu - __le32 present; /* the present bitmap */ - unsigned char* b; /* current byte */ - int i; -+ int rt_len; - - DEBUG("RADIOTAP HEADER\n"); - -@@ -176,21 +178,22 @@ parse_radiotap_header(unsigned char** bu - - rh = (struct ieee80211_radiotap_header*)*buf; - b = *buf + sizeof(struct ieee80211_radiotap_header); -- present = rh->it_present; -+ present = __le32_to_cpu(rh->it_present); - - DEBUG("%08x\n", present); - -+ rt_len = __le16_to_cpu(rh->it_len); - /* check for header extension - ignore for now, just advance current position */ -- while (present & 0x80000000 && b - *buf < rh->it_len) { -+ while (present & 0x80000000 && b - *buf < rt_len) { - DEBUG("extension\n"); - b = b + 4; -- present = *(__le32*)b; -+ present = __le32_to_cpu(*(__le32*)b); - } -- present = rh->it_present; // in case it moved -+ present = __le32_to_cpu(rh->it_present); // in case it moved - - /* radiotap bitmap has 32 bit, but we are only interrested until - * bit 12 (IEEE80211_RADIOTAP_DB_ANTSIGNAL) => i<13 */ -- for (i = 0; i < 13 && b - *buf < rh->it_len; i++) { -+ for (i = 0; i < 13 && b - *buf < rt_len; i++) { - if ((present >> i) & 1) { - DEBUG("1"); - switch (i) { -@@ -252,7 +255,7 @@ parse_radiotap_header(unsigned char** bu - break; - case IEEE80211_RADIOTAP_CHANNEL: - /* channel & channel type */ -- current_packet.phy_freq = *(u_int16_t*)b; -+ current_packet.phy_freq = __le16_to_cpu(*(u_int16_t*)b); - DEBUG("[chan %d ", current_packet.phy_freq); - b = b + 2; - if (*(u_int16_t*)b & IEEE80211_CHAN_A) { -@@ -298,8 +301,8 @@ parse_radiotap_header(unsigned char** bu - DEBUG("noise: %d\n", current_packet.noise); - DEBUG("snr: %d\n", current_packet.snr); - -- *buf = *buf + rh->it_len; -- return len - rh->it_len; -+ *buf = *buf + rt_len; -+ return len - rt_len; - } - - -@@ -312,22 +315,25 @@ parse_80211_header(unsigned char** buf, - u8* sa = NULL; - u8* da = NULL; - u8* bssid = NULL; -+ u16 fc; - - if (len < 2) /* not even enough space for fc */ - return -1; - - wh = (struct ieee80211_hdr*)*buf; -- hdrlen = ieee80211_get_hdrlen(wh->frame_control); -+ fc = __le16_to_cpu(wh->frame_control); -+ hdrlen = ieee80211_get_hdrlen(fc); - - if (len < hdrlen) - return -1; - - current_packet.len = len; -- current_packet.wlan_type = (wh->frame_control & (IEEE80211_FCTL_FTYPE | IEEE80211_FCTL_STYPE)); -+ current_packet.wlan_type = (fc & (IEEE80211_FCTL_FTYPE | IEEE80211_FCTL_STYPE)); - -- DEBUG("wlan_type %x - type %x - stype %x\n", wh->frame_control, wh->frame_control & IEEE80211_FCTL_FTYPE, wh->frame_control & IEEE80211_FCTL_STYPE ); -+ DEBUG("wlan_type %x - type %x - stype %x\n", fc, -+ fc & IEEE80211_FCTL_FTYPE, fc & IEEE80211_FCTL_STYPE ); - -- DEBUG("%s\n", get_packet_type_name(wh->frame_control)); -+ DEBUG("%s\n", get_packet_type_name(fc)); - - bssid = ieee80211_get_bssid(wh, len); - diff --git a/net/horst/patches/100-compile-fixes.patch b/net/horst/patches/100-compile-fixes.patch index 7893a71935..29295b06f8 100644 --- a/net/horst/patches/100-compile-fixes.patch +++ b/net/horst/patches/100-compile-fixes.patch @@ -1,8 +1,6 @@ -Index: horst-2.0-rc1/Makefile -=================================================================== ---- horst-2.0-rc1.orig/Makefile 2010-11-02 16:26:44.449999688 +0100 -+++ horst-2.0-rc1/Makefile 2010-11-02 16:27:13.640982158 +0100 -@@ -28,9 +28,7 @@ +--- a/Makefile ++++ b/Makefile +@@ -34,9 +34,7 @@ CFLAGS+=-DPCAP LIBS+=-lpcap endif @@ -12,8 +10,8 @@ Index: horst-2.0-rc1/Makefile +all: $(NAME) # include dependencies - protocol_parser.o: protocol_parser.h ieee80211.h ieee80211_radiotap.h ieee80211_util.h \ -@@ -48,7 +46,3 @@ + average.o: average.h util.h +@@ -73,7 +71,3 @@ clean: -rm -f *.o *~ -rm -f $(NAME) -rm -f .build_* -- 2.30.2