From: Scott V. Kamp Date: Tue, 7 Aug 2012 12:20:59 +0000 (+0000) Subject: [patchteam] Upgrade wing package to latest git revision - Roberto Riggio - 2012-08... X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=f8eff2b968f0cf802916a4f147b91966fa469185;p=openwrt%2Fsvn-archive%2Farchive.git [patchteam] Upgrade wing package to latest git revision - Roberto Riggio - 2012-08-06 20:16:45 SVN-Revision: 33033 --- diff --git a/net/wing/Makefile b/net/wing/Makefile index 333603d6a5..2e3b3548d7 100644 --- a/net/wing/Makefile +++ b/net/wing/Makefile @@ -8,9 +8,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:=wing -PKG_VERSION:=20120625 +PKG_VERSION:=20120805 PKG_RELEASE:=1 -PKG_REV:=ce245718dd01fad9a9bd78dd5792245b7cdd09aa +PKG_REV:=d189e36d111788a647cd784536137acbe7a92e17 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=git://github.com/rriggio/click.git @@ -67,7 +67,7 @@ define Build/Compile -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 RadiotapEncapHT -E SetTXRateHT \ + -E SetTXRateHT \ -E WINGETTMetric -E WINGETXMetric -E WINGHopCountMetric \ -E ProbeTXRate -E MadwifiRate -E AutoRateFallback -E Minstrel \ -E FairBuffer -E DeAggregator -E DWRRSched -E WFQSched -E WRRSched; \ diff --git a/net/wing/files/lib/netifd/proto/wing.sh b/net/wing/files/lib/netifd/proto/wing.sh index 18642f8bd2..f490422f9e 100644 --- a/net/wing/files/lib/netifd/proto/wing.sh +++ b/net/wing/files/lib/netifd/proto/wing.sh @@ -47,6 +47,7 @@ proto_wing_setup() { local profile rc ls metric prefix period tau debug + config_load network config_get profile $config profile "bulk" config_get rc $config rc "minstrel" config_get ls $config ls "fcfs" @@ -83,6 +84,8 @@ proto_wing_setup() { [ "$debug" == 0 ] && dbg="" || dbg="-d" + export CLICK_BACKTRACE=1 + /usr/bin/click_config -p $profile -r $rc -s $ls -l $metric \ -m "$hwmodes" -c "$freqs" -n "$ifnames" -a "$hwaddrs" $dbg \ | sed -e "s/__XR_IFNAME__/$link/g" \ @@ -111,13 +114,19 @@ proto_wing_setup() { ps | grep /usr/bin/click | grep -v grep | awk '{print $1}' > /var/run/$link.pid + uci_set_state network $config ifname "$iface" + uci_set_state network $config ipaddr "$ipaddr" + uci_set_state network $config netmask "$netmask" + uci_set_state network $config gateway "0.0.0.0" + env -i ACTION="ifup" INTERFACE="$config" DEVICE="$link" PROTO=wing /sbin/hotplug-call "link" & proto_init_update "$link" 1 - proto_add_ipv4_address "$ipaddr" "$netmasj" + proto_add_ipv4_address "$ipaddr" "$netmask" + proto_add_ipv4_route "$prefix.0.0.0" "255.0.0.0" "$iface" route -n | grep -q '^0.0.0.0' || { - proto_add_ipv4_route "0.0.0.0" 0 + proto_add_ipv4_route "0.0.0.0" "0" "$iface" } proto_send_update "$config" diff --git a/net/wing/files/usr/bin/wing_status b/net/wing/files/usr/bin/wing_status index dd63cacd19..eaddb99273 100755 --- a/net/wing/files/usr/bin/wing_status +++ b/net/wing/files/usr/bin/wing_status @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright (c) 2006, Roberto Riggio +# Copyright (c) 2012, Roberto Riggio # # All rights reserved. # @@ -37,6 +37,7 @@ LINKS=0 ARP=0 GATEWAY=0 PROBES=0 +INTERFACES=0 show_status() { @@ -58,6 +59,11 @@ show_status() { read_handler lt.hosts } + [ $INTERFACES = 1 ] && { + printf "\nInterfaces:\n" + read_handler lt.interfaces + } + [ $LINKS = 1 ] && { printf "\nLinks:\n" read_handler lt.links @@ -82,6 +88,8 @@ show_status() { for interface in $interfaces; do printf "\nBroadcast statistics ($interface):\n" read_handler wr/es/es_$interface.bcast_stats + printf "\nBroadcast statistics HT ($interface):\n" + read_handler wr/es/es_$interface.bcast_stats_ht done } @@ -97,9 +105,10 @@ if [ $# -eq 0 ]; then ARP=1 GATEWAY=1 PROBES=1 + INTERFACES=1 fi -while getopts "rshlagp" OPTVAL +while getopts "rshlagpi" OPTVAL do case $OPTVAL in r) ROUTES=1 @@ -110,6 +119,8 @@ do ;; l) LINKS=1 ;; + i) INTERFACES=1 + ;; a) ARP=1 ;; g) GATEWAY=1