[prev in list] [next in list] [prev in thread] [next in thread] 

List:       freewrt-commits
Subject:    [FreeWRT-commits] r3836 - in branches/freewrt_1_0:
From:       tg () freewrt ! org
Date:       2009-01-19 11:08:02
Message-ID: 20090119110802.E052A1C00B () frozenfish ! freewrt ! org
[Download RAW message or body]

Author: tg
Date: 2009-01-19 12:08:01 +0100 (Mon, 19 Jan 2009)
New Revision: 3836

Modified:
   branches/freewrt_1_0/package/broadcom-wl-util/Makefile
   branches/freewrt_1_0/package/broadcom-wl-util/files/wireless-broadcom.up
   branches/freewrt_1_0/target/linux/brcm-2.4/files/etc/network/interfaces
Log:
fix WDS:
• wireless-mode must be "wds" not "ap"
• it was impossible to use WDS in bridging mode due to abuse of
  the 「bridge-ifaces」 variable in the script, which did not
  allow for more than one value: introduce a new custom variable
  「wireless-wds-interface」 to contain "eth2" or similar ONLY,
  thus allowing 「bridge-ifaces」 to contain "eth0.X eth2"

This does not break existing configurations:
• when 「wireless-wds-interface」 is not set, let it default to
  the value of 「bridge-ifaces」

This commit sponsored by tarent GmbH


Modified: branches/freewrt_1_0/package/broadcom-wl-util/Makefile
===================================================================
--- branches/freewrt_1_0/package/broadcom-wl-util/Makefile	2009-01-15 11:45:40 UTC \
                (rev 3835)
+++ branches/freewrt_1_0/package/broadcom-wl-util/Makefile	2009-01-19 11:08:01 UTC \
(rev 3836) @@ -8,7 +8,7 @@
 
 PKG_NAME:=		broadcom-wl-util
 PKG_VERSION:=		1.0
-PKG_RELEASE:=		5
+PKG_RELEASE:=		6
 PKG_MD5SUM:=		ea7009c695ef16a7eb755eced42c3d2c
 PKG_SOURCE_URL:=	http://www.freewrt.org/distfiles
 

Modified: branches/freewrt_1_0/package/broadcom-wl-util/files/wireless-broadcom.up
===================================================================
--- branches/freewrt_1_0/package/broadcom-wl-util/files/wireless-broadcom.up	2009-01-15 \
                11:45:40 UTC (rev 3835)
+++ branches/freewrt_1_0/package/broadcom-wl-util/files/wireless-broadcom.up	2009-01-19 \
11:08:01 UTC (rev 3836) @@ -39,7 +39,11 @@
   		;;
   esac
   wl ssid $IF_WIRELESS_SSID
-  /usr/sbin/nas -P /var/run/nas.lan.pid -l $IF_WIRELESS_WDS_BRIDGE -H 34954 -i \
$IF_BRIDGE_IFACES -A -m $auth -k "$IF_WIRELESS_WPA_KEY" -s $IF_WIRELESS_SSID -w \
$crypto_num -g $gtk_rekey & +
+  # backwards compatibility hack for 1.0-stabke
+  [ -z "$IF_WIRELESS_WDS_INTERFACE" ] && IF_WIRELESS_WDS_INTERFACE=$IF_BRIDGE_IFACES
+
+  /usr/sbin/nas -P /var/run/nas.lan.pid -l $IF_WIRELESS_WDS_BRIDGE -H 34954 -i \
$IF_WIRELESS_WDS_INTERFACE -A -m $auth -k "$IF_WIRELESS_WPA_KEY" -s $IF_WIRELESS_SSID \
-w $crypto_num -g $gtk_rekey &  [ "$IF_WIRELESS_WDS_SECURITY" = "wpa-psk" ] && {
   	sleep 10 && 
 	for i in $(ip link show|awk -F : '/wds/ {print $2}'); do /usr/sbin/nas4not lan $i \
up auto $IF_WIRELESS_WDS_ENCRYPTION psk "$IF_WIRELESS_WDS_WPA_KEY" \
$IF_WIRELESS_SSID;done &

Modified: branches/freewrt_1_0/target/linux/brcm-2.4/files/etc/network/interfaces
===================================================================
--- branches/freewrt_1_0/target/linux/brcm-2.4/files/etc/network/interfaces	2009-01-15 \
                11:45:40 UTC (rev 3835)
+++ branches/freewrt_1_0/target/linux/brcm-2.4/files/etc/network/interfaces	2009-01-19 \
11:08:01 UTC (rev 3836) @@ -129,15 +129,20 @@
 
 # WLAN with WDS, add the peers to wireless-wds
 # real wlan interfaces and wds interfaces will be added to bridge br0
+# when using WDS, there is *no* "auto @FWRT_WLAN@" and "iface @FWRT_WLAN@ …" \
stanza  #auto br0
 #iface br0 inet static
+#	# only one of the following: routing or bridging
 #	bridge-ifaces @FWRT_WLAN@
+#	bridge-ifaces @FWRT_WLAN@ @FWRT_LAN@
+#	# network configuration
 #	address 192.168.10.1
 #	netmask 255.255.255.0
 #	broadcast +
+#	#gateway x.x.x.x
 #	wireless-type broadcom
 #	wireless-country DE
-#	wireless-mode ap
+#	wireless-mode wds
 #	wireless-ssid FreeWRT-WDS
 #	wireless-channel 11
 #	wireless-security wpa-psk
@@ -147,6 +152,7 @@
 #	wireless-wpa-key MyWlanSecret
 #	wireless-lazywds 1
 #       wireless-wds-bridge br0
+#	wireless-wds-interface @FWRT_WLAN@
 #	# MAC addresses of the peer
 #	wireless-wds 00:01:02:03:04:05
 #	wireless-wds-security wpa-psk

_______________________________________________
freewrt-commits mailing list
freewrt-commits@freewrt.org
https://www.freewrt.org/lists/listinfo/freewrt-commits


[prev in list] [next in list] [prev in thread] [next in thread]