This patch upgrades the wing package to the latest git revision. It also
removes a patch that has been merged upstream.
Signed-off-by: Roberto Riggio <[email protected]>
--
Index: net/wing/files/lib/network/wing.sh
===================================================================
--- net/wing/files/lib/network/wing.sh (revision 28730)
+++ net/wing/files/lib/network/wing.sh (working copy)
@@ -107,7 +107,9 @@
ps | grep /usr/bin/click | grep -v grep | awk '{print $1}' >
/var/run/$iface.pid
ifconfig "$iface" "$ipaddr" netmask "$netmask"
- route add default dev "$iface"
+ route -n | grep -q '^0.0.0.0' || {
+ route add default dev "$iface"
+ }
uci_set_state network $config ifname "$iface"
uci_set_state network $config ipaddr "$ipaddr"
Index: net/wing/files/etc/uci-defaults/wing
===================================================================
--- net/wing/files/etc/uci-defaults/wing (revision 28730)
+++ net/wing/files/etc/uci-defaults/wing (working copy)
@@ -1,13 +1,6 @@
uci delete network.mesh
uci set network.mesh=interface
uci set network.mesh.proto=wing
-uci set network.mesh.rc=minstrel
-uci set network.mesh.ls=fcfs
-uci set network.mesh.metric=wcett
-uci set network.mesh.prefix=6
-uci set network.mesh.period=10000
-uci set network.mesh.tau=100000
-uci set network.mesh.debug=false
uci add firewall zone
uci set firewall.@zone[-1].name="mesh"
Index: net/wing/patches/010-libc-compat.patch
===================================================================
--- net/wing/patches/010-libc-compat.patch (revision 28730)
+++ net/wing/patches/010-libc-compat.patch (working copy)
@@ -1,20 +0,0 @@
---- a/lib/radiotap.c
-+++ b/lib/radiotap.c
-@@ -16,6 +16,17 @@
- #include <click/radiotap_iter.h>
- #include <click/platform.h>
-
-+#if !defined(le32toh) || !defined(le16toh)
-+# if BYTE_ORDER == LITTLE_ENDIAN
-+# define le32toh(x) (x)
-+# define le16toh(x) (x)
-+# else
-+# include <byteswap.h>
-+# define le32toh(x) bswap_32(x)
-+# define le16toh(x) bswap_16(x)
-+# endif
-+#endif
-+
- /* function prototypes and related defs are in radiotap_iter.h */
-
- static const struct radiotap_align_size rtap_namespace_sizes[] = {
Index: net/wing/Makefile
===================================================================
--- net/wing/Makefile (revision 28730)
+++ net/wing/Makefile (working copy)
@@ -8,9 +8,9 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=wing
-PKG_VERSION:=20110709
+PKG_VERSION:=20111103
PKG_RELEASE:=1
-PKG_REV:=6aaea18b8e199781dc600681882cb2648f43ec38
+PKG_REV:=23e6455a1cfe0877334f0d18068a3fb47425b8a4
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=git://github.com/rriggio/click.git
@@ -24,12 +24,13 @@
include $(INCLUDE_DIR)/host-build.mk
define Package/wing
- TITLE:=Wireless mesh networking toolkit
- SECTION:=net
- CATEGORY:=Network
- MAINTAINER:=Roberto Riggio <[email protected]>
- DEPENDS:=+kmod-tun +libpcap +libstdcpp
- URL:=http://www.wing-project.org/
+ SECTION:=net
+ CATEGORY:=Network
+ SUBMENU:=Routing and Redirection
+ TITLE:=Wireless mesh networking toolkit
+ MAINTAINER:=Roberto Riggio <[email protected]>
+ DEPENDS:=+kmod-tun +libpcap +libstdcpp
+ URL:=http://www.wing-project.org/
endef
define Package/wing/Description
@@ -44,12 +45,16 @@
--enable-tools=host \
--enable-userlevel \
--enable-wifi \
+ --enable-wing \
+ --enable-diffserv \
--disable-linuxmodule \
--disable-dynamic-linking \
HOST_CONFIGURE_ARGS += \
--enable-userlevel \
--enable-wifi \
+ --enable-wing \
+ --enable-diffserv \
--disable-linuxmodule \
define Host/Compile
@@ -62,6 +67,7 @@
-f $(PKG_BUILD_DIR)/conf/wing/sample.click \
-A --all -E Discard -E Print -E PrintWifi -E Strip -E Null \
-E InfiniteSource -E RatedSource -E EtherEncap -E UDPIPEncap \
+ -E AggregateWingPacketType -E AggregateCounter \
-E RadiotapEncapHT -E SetTXRateHT \
-E WINGETTMetric -E WINGETXMetric -E WINGHopCountMetric \
-E ProbeTXRate -E MadwifiRate -E AutoRateFallback -E Minstrel \
_______________________________________________
openwrt-devel mailing list
[email protected]
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
