Changeset 27643


Ignore:
Timestamp:
2011-07-17T16:17:47+02:00 (7 years ago)
Author:
swalker
Message:

[packages] wing: update to 20110709 (#9722)

  • Signed-off-by: Roberto Riggio <roberto.riggio at create-net.org>
  • remove unrecognized configure options
  • remove trailing whitespace
Location:
packages/net/wing
Files:
3 added
3 edited

Legend:

Unmodified
Added
Removed
  • packages/net/wing/Makefile

    r26386 r27643  
    11# 
    2 # Copyright (C) 2006-2009 OpenWrt.org 
     2# Copyright (C) 2006-2011 OpenWrt.org 
    33# 
    44# This is free software, licensed under the GNU General Public License v2. 
     
    99 
    1010PKG_NAME:=wing 
    11 PKG_VERSION:=20110329 
    12 PKG_RELEASE:=2 
    13 PKG_REV:=4ef2a352b29c26ce76d8b3d7c6897d301362a101 
     11PKG_VERSION:=20110709 
     12PKG_RELEASE:=1 
     13PKG_REV:=6aaea18b8e199781dc600681882cb2648f43ec38 
    1414 
    1515PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 
     
    1818PKG_SOURCE_VERSION:=$(PKG_REV) 
    1919PKG_SOURCE_PROTO:=git 
    20  
    21 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) 
    2220 
    2321PKG_BUILD_DEPENDS:=wing/host 
     
    3533endef 
    3634 
    37 define Package/wing/Description  
     35define Package/wing/Description 
    3836        Wing is a wireless mesh routing software. The routing protocol 
    39         is derived from Roofnet. It supports multiple radio interfaces  
     37        is derived from Roofnet. It supports multiple radio interfaces 
    4038        and link quality routing using the ETX, ETT, or WCETT metric. 
    41 endef  
     39endef 
    4240 
    4341EXTRA_CFLAGS=-MD 
     
    4745        --enable-userlevel \ 
    4846        --enable-wifi \ 
    49         --enable-wing \ 
    50         --enable-diffserv \ 
    5147        --disable-linuxmodule \ 
    5248        --disable-dynamic-linking \ 
     
    5551        --enable-userlevel \ 
    5652        --enable-wifi \ 
    57         --enable-diffserv \ 
    58         --enable-wing \ 
    5953        --disable-linuxmodule \ 
    6054 
     
    6761                $(STAGING_DIR_HOST)/bin/click-mkmindriver -p $(PKG_NAME) -C $(STAGING_DIR_HOST) \ 
    6862                -f $(PKG_BUILD_DIR)/conf/wing/sample.click \ 
    69                 -A --all -E Discard -E Print -E PrintWifi -E Null \ 
     63                -A --all -E Discard -E Print -E PrintWifi -E Strip -E Null \ 
    7064                -E InfiniteSource -E RatedSource -E EtherEncap -E UDPIPEncap \ 
     65                -E RadiotapEncapHT -E SetTXRateHT \ 
    7166                -E WINGETTMetric -E WINGETXMetric -E WINGHopCountMetric \ 
    7267                -E ProbeTXRate -E MadwifiRate -E AutoRateFallback -E Minstrel \ 
  • packages/net/wing/files/etc/uci-defaults/wing

    r26386 r27643  
     1uci delete network.mesh 
    12uci set network.mesh=interface 
    23uci set network.mesh.proto=wing 
    3 uci set network.mesh.profile=bulk 
    44uci set network.mesh.rc=minstrel 
    55uci set network.mesh.ls=fcfs 
     
    1010uci set network.mesh.debug=false 
    1111 
    12 cfg=$(uci add firewall zone) 
    13 uci set firewall.$cfg.name="mesh" 
    14 uci set firewall.$cfg.input="ACCEPT" 
    15 uci set firewall.$cfg.output="ACCEPT" 
    16 uci set firewall.$cfg.forward="REJECT" 
    17 uci set firewall.$cfg.masq="1" 
     12uci add firewall zone 
     13uci set firewall.@zone[-1].name="mesh" 
     14uci set firewall.@zone[-1].input="ACCEPT" 
     15uci set firewall.@zone[-1].output="ACCEPT" 
     16uci set firewall.@zone[-1].forward="REJECT" 
     17uci set firewall.@zone[-1].masq="1" 
    1818 
    19 cfg=$(uci add firewall forwarding) 
    20 uci set firewall.$cfg.src="lan" 
    21 uci set firewall.$cfg.dest="mesh" 
     19uci add firewall forwarding 
     20uci set firewall.@forwarding[-1].src="lan" 
     21uci set firewall.@forwarding[-1].dest="mesh" 
    2222 
    23 cfg=$(uci add firewall forwarding) 
    24 uci set firewall.$cfg.src="mesh" 
    25 uci set firewall.$cfg.dest="wan" 
     23uci add firewall forwarding 
     24uci set firewall.@forwarding[-1].src="mesh" 
     25uci set firewall.@forwarding[-1].dest="wan" 
    2626 
  • packages/net/wing/files/lib/network/wing.sh

    r26386 r27643  
    3030        config_load wireless 
    3131        config_foreach wing_list_interfaces wifi-iface 
    32          
     32 
    3333        # start click router 
    3434        if [ "$hwmodes" = "" -o "$freqs" = "" -o "$ifnames" = "" -o "$hwaddrs" = "" ]; then 
     
    5050        local hwaddr=$(echo $hwaddrs | sed 's/ .*//'); 
    5151        local ipaddr=$(printf "$prefix.%d.%d.%d" $(echo $hwaddr | awk -F: '{printf "0x%s 0x%s 0x%s",$4,$5,$6}')) 
     52        local bcast="$prefix.255.255.255" 
    5253        local netmask=255.0.0.0 
    5354 
     
    7879                | sed -e "s/__XR_IFNAME__/$iface/g" \ 
    7980                | sed -e "s/__XR_IP__/$ipaddr/g" \ 
     81                | sed -e "s/__XR_BCAST__/$bcast/g" \ 
    8082                | sed -e "s/__XR_NM__/$netmask/g" \ 
    8183                | sed -e "s/__XR_PERIOD__/$period/g" \ 
     
    105107        ps | grep /usr/bin/click | grep -v grep | awk '{print $1}' > /var/run/$iface.pid 
    106108 
    107         ifconfig "$iface" "$ipaddr" netmask "$netmask"  
     109        ifconfig "$iface" "$ipaddr" netmask "$netmask" 
     110        route add default dev "$iface" 
     111 
     112        uci_set_state network $config ifname "$iface" 
    108113        uci_set_state network $config ipaddr "$ipaddr" 
    109114        uci_set_state network $config netmask "$netmask" 
     115        uci_set_state network $config gateway "0.0.0.0" 
    110116 
    111117        env -i ACTION="ifup" INTERFACE="$config" DEVICE="$iface" PROTO=wing /sbin/hotplug-call "iface" & 
    112118 
    113 }  
     119} 
    114120 
    115121wing_template_available() { # prefix, template, default 
    116         local template="/etc/wing/$1.$2.click"  
     122        local template="/etc/wing/$1.$2.click" 
    117123        [ ! -f $template ] && { 
    118124                return 1 
     
    133139                logger -t "$device" "Channel not specified. Ignoring." 
    134140                return 0 
    135         }                
     141        } 
    136142        freq=$(iwlist $ifname freq | sed -n "s/^.*Channel 0*$channel : \([0-9.]*\).*/\1/p" | awk '{print $1*1000}') 
    137143        hwaddr=$(/sbin/ifconfig $ifname 2>&1 | sed -n 's/^.*HWaddr \([0-9A-Za-z\-]*\).*/\1/p' | sed -e 's/\-/:/g' | cut -c1-17) 
Note: See TracChangeset for help on using the changeset viewer.