Changeset e6cc60e in freewrt for package/broadcom-wl-util

Timestamp:

Mar 15, 2007, 2:30:20 PM (19 years ago)

Author:

Ralph Paßgang <tha@…>

Branches:

freewrt_1_0, freewrt_2_0

Children:

7f36318

Parents:

f8ea8a1

Message:

Bugfix for bridged wireless lan setups:

• updated handbook.tex for the new interface option "wireless-bridge-if".
• now the nas-daemon will be restarted after a bridge with an wifi interface attached has been configured.

I know this bugfix is quite ugly, that's why it's just for the 1.0 branch.
The network script in trunk will get rewritten soon anyways.
Wbx agreed in just commiting this in branch.

This closes bug #236.

git-svn-id: ​svn://www.freewrt.org/branches/freewrt_1_0@2167 afb5a338-a214-0410-bd46-81f09a774fd1

File:

• package/broadcom-wl-util/files/wireless-broadcom.pre-up (modified) (4 diffs)

package/broadcom-wl-util/files/wireless-broadcom.pre-up

@@ -22 +22 @@
 
 # get interface name if bridged
-brctl show 2>&- | grep "$IFACE" >&- 2>&- && ifname=br0
+[ "$IF_WIRELESS_BRIDGE_IF" ] && ifname=$IF_WIRELESS_BRIDGE_IF
 
 #
@@ -254 +254 @@
     }
     /usr/sbin/nas -P /var/run/nas.lan.pid ${ifname:+ -l $ifname} -H 34954 -i $IFACE $nas_auth -m $auth -k "$IF_WIRELESS_WPA_KEY" -s "$IF_WIRELESS_SSID" -w $crypto_num -g $gtk_rekey &
+    [ "$IF_WIRELESS_BRIDGE_IF" ] && echo "/usr/sbin/nas -P /var/run/nas.lan.pid ${ifname:+ -l $ifname} -H 34954 -i $IFACE $nas_auth -m $auth -k \"$IF_WIRELESS_WPA_KEY\" -s \"$IF_WIRELESS_SSID\" -w $crypto_num -g $gtk_rekey &" >/var/run/nas.lan.cmd
 
     exit 0
@@ -266 +267 @@
             wl wpa_auth 0
             /usr/sbin/nas -P /var/run/nas.lan.pid ${ifname:+ -l ${ifname}} -H 34954 -i $IFACE &
+            [ "$IF_WIRELESS_BRIDGE_IF" ] && echo "/usr/sbin/nas -P /var/run/nas.lan.pid ${ifname:+ -l ${ifname}} -H 34954 -i $IFACE &" >/var/run/nas.lan.cmd
             exit 0
             ;;
@@ -281 +283 @@
 
     /usr/sbin/nas -P /var/run/nas.lan.pid ${ifname:+ -l $ifname} -H 34954 -i $IFACE -A -m $auth -r "$IF_WIRELESS_RADIUS_KEY" -h $IF_WIRELESS_RADIUS_IPADDR -p ${IF_WIRELESS_RADIUS_PORT:-1812} -t 36000 -s "$IF_WIRELESS_SSID" -w $crypto_num -g $gtk_rekey &
+    [ "$IF_WIRELESS_BRIDGE_IF" ] && echo "/usr/sbin/nas -P /var/run/nas.lan.pid ${ifname:+ -l $ifname} -H 34954 -i $IFACE -A -m $auth -r \"$IF_WIRELESS_RADIUS_KEY\" -h $IF_WIRELESS_RADIUS_IPADDR -p ${IF_WIRELESS_RADIUS_PORT:-1812} -t 36000 -s \"$IF_WIRELESS_SSID\" -w $crypto_num -g $gtk_rekey &" >/var/run/nas.lan.cmd
     exit 0
 }