Changeset 30129


Ignore:
Timestamp:
2012-02-04T21:41:27+01:00 (6 years ago)
Author:
jow
Message:

[packages_10.03.2] wing: merge r27643, r29373

Location:
branches/packages_10.03.2/net/wing
Files:
1 deleted
3 edited
1 copied

Legend:

Unmodified
Added
Removed
  • branches/packages_10.03.2/net/wing/Makefile

    r26386 r30129  
    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:=20111103 
     12PKG_RELEASE:=1 
     13PKG_REV:=23e6455a1cfe0877334f0d18068a3fb47425b8a4 
    1414 
    1515PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 
     
    1919PKG_SOURCE_PROTO:=git 
    2020 
    21 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) 
    22  
    2321PKG_BUILD_DEPENDS:=wing/host 
    2422 
     
    2725 
    2826define Package/wing 
    29         TITLE:=Wireless mesh networking toolkit 
    3027        SECTION:=net 
    3128        CATEGORY:=Network 
     29        SUBMENU:=Routing and Redirection 
     30        TITLE:=Wireless mesh networking toolkit 
    3231        MAINTAINER:=Roberto Riggio <roberto.riggio@create-net.org> 
    3332        DEPENDS:=+kmod-tun +libpcap +libstdcpp 
     
    3534endef 
    3635 
    37 define Package/wing/Description  
     36define Package/wing/Description 
    3837        Wing is a wireless mesh routing software. The routing protocol 
    39         is derived from Roofnet. It supports multiple radio interfaces  
     38        is derived from Roofnet. It supports multiple radio interfaces 
    4039        and link quality routing using the ETX, ETT, or WCETT metric. 
    41 endef  
     40endef 
    4241 
    4342EXTRA_CFLAGS=-MD 
     
    5554        --enable-userlevel \ 
    5655        --enable-wifi \ 
     56        --enable-wing \ 
    5757        --enable-diffserv \ 
    58         --enable-wing \ 
    5958        --disable-linuxmodule \ 
    6059 
     
    6766                $(STAGING_DIR_HOST)/bin/click-mkmindriver -p $(PKG_NAME) -C $(STAGING_DIR_HOST) \ 
    6867                -f $(PKG_BUILD_DIR)/conf/wing/sample.click \ 
    69                 -A --all -E Discard -E Print -E PrintWifi -E Null \ 
     68                -A --all -E Discard -E Print -E PrintWifi -E Strip -E Null \ 
    7069                -E InfiniteSource -E RatedSource -E EtherEncap -E UDPIPEncap \ 
     70                -E AggregateWingPacketType -E AggregateCounter \ 
     71                -E RadiotapEncapHT -E SetTXRateHT \ 
    7172                -E WINGETTMetric -E WINGETXMetric -E WINGHopCountMetric \ 
    7273                -E ProbeTXRate -E MadwifiRate -E AutoRateFallback -E Minstrel \ 
  • branches/packages_10.03.2/net/wing/files/etc/uci-defaults/wing

    r26386 r30129  
     1uci delete network.mesh 
    12uci set network.mesh=interface 
    23uci set network.mesh.proto=wing 
    3 uci set network.mesh.profile=bulk 
    4 uci set network.mesh.rc=minstrel 
    5 uci set network.mesh.ls=fcfs 
    6 uci set network.mesh.metric=wcett 
    7 uci set network.mesh.prefix=6 
    8 uci set network.mesh.period=10000 
    9 uci set network.mesh.tau=100000 
    10 uci set network.mesh.debug=false 
    114 
    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" 
     5uci add firewall zone 
     6uci set firewall.@zone[-1].name="mesh" 
     7uci set firewall.@zone[-1].input="ACCEPT" 
     8uci set firewall.@zone[-1].output="ACCEPT" 
     9uci set firewall.@zone[-1].forward="REJECT" 
     10uci set firewall.@zone[-1].masq="1" 
    1811 
    19 cfg=$(uci add firewall forwarding) 
    20 uci set firewall.$cfg.src="lan" 
    21 uci set firewall.$cfg.dest="mesh" 
     12uci add firewall forwarding 
     13uci set firewall.@forwarding[-1].src="lan" 
     14uci set firewall.@forwarding[-1].dest="mesh" 
    2215 
    23 cfg=$(uci add firewall forwarding) 
    24 uci set firewall.$cfg.src="mesh" 
    25 uci set firewall.$cfg.dest="wan" 
     16uci add firewall forwarding 
     17uci set firewall.@forwarding[-1].src="mesh" 
     18uci set firewall.@forwarding[-1].dest="wan" 
    2619 
  • branches/packages_10.03.2/net/wing/files/lib/network/wing.sh

    r26386 r30129  
    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 -n | grep -q '^0.0.0.0' || { 
     111        route add default dev "$iface" 
     112       } 
     113 
     114        uci_set_state network $config ifname "$iface" 
    108115        uci_set_state network $config ipaddr "$ipaddr" 
    109116        uci_set_state network $config netmask "$netmask" 
     117        uci_set_state network $config gateway "0.0.0.0" 
    110118 
    111119        env -i ACTION="ifup" INTERFACE="$config" DEVICE="$iface" PROTO=wing /sbin/hotplug-call "iface" & 
    112120 
    113 }  
     121} 
    114122 
    115123wing_template_available() { # prefix, template, default 
    116         local template="/etc/wing/$1.$2.click"  
     124        local template="/etc/wing/$1.$2.click" 
    117125        [ ! -f $template ] && { 
    118126                return 1 
     
    133141                logger -t "$device" "Channel not specified. Ignoring." 
    134142                return 0 
    135         }                
     143        } 
    136144        freq=$(iwlist $ifname freq | sed -n "s/^.*Channel 0*$channel : \([0-9.]*\).*/\1/p" | awk '{print $1*1000}') 
    137145        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.