projects
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
remove unnecessary linux config include (it broke 'make download')
[openwrt.git]
/
package
/
madwifi
/
files
/
lib
/
wifi
/
madwifi.sh
diff --git
a/package/madwifi/files/lib/wifi/madwifi.sh
b/package/madwifi/files/lib/wifi/madwifi.sh
index
69874b5
..
41a25a4
100755
(executable)
--- a/
package/madwifi/files/lib/wifi/madwifi.sh
+++ b/
package/madwifi/files/lib/wifi/madwifi.sh
@@
-14,7
+14,7
@@
scan_atheros() {
config_get mode "$vif" mode
case "$mode" in
config_get mode "$vif" mode
case "$mode" in
- adhoc|sta|ap)
+ adhoc|
ahdemo|
sta|ap)
append $mode "$vif"
;;
wds)
append $mode "$vif"
;;
wds)
@@
-35,6
+35,7
@@
scan_atheros() {
case "${adhoc:+1}:${sta:+1}:${ap+1}" in
# valid mode combinations
1::) wds="";;
case "${adhoc:+1}:${sta:+1}:${ap+1}" in
# valid mode combinations
1::) wds="";;
+ 1::1);;
:1:1)config_set "$device" nosbeacon 1;; # AP+STA, can't use beacon timers for STA
:1:);;
::1);;
:1:1)config_set "$device" nosbeacon 1;; # AP+STA, can't use beacon timers for STA
:1:);;
::1);;
@@
-42,13
+43,14
@@
scan_atheros() {
*) echo "$device: Invalid mode combination in config"; return 1;;
esac
*) echo "$device: Invalid mode combination in config"; return 1;;
esac
- config_set "$device" vifs "${ap:+$ap }${adhoc:+$adhoc }${sta:+$sta }${wds:+$wds }"
+ config_set "$device" vifs "${ap:+$ap }${adhoc:+$adhoc }${
ahdemo:+$ahdemo }${
sta:+$sta }${wds:+$wds }"
}
disable_atheros() (
local device="$1"
}
disable_atheros() (
local device="$1"
+ set_wifi_down "$device"
# kill all running hostapd and wpa_supplicant processes that
# are running on atheros vifs
for pid in `pidof hostapd wpa_supplicant`; do
# kill all running hostapd and wpa_supplicant processes that
# are running on atheros vifs
for pid in `pidof hostapd wpa_supplicant`; do
@@
-69,10
+71,10
@@
disable_atheros() (
)
enable_atheros() {
)
enable_atheros() {
+ local device="$1"
config_get channel "$device" channel
config_get vifs "$device" vifs
config_get channel "$device" channel
config_get vifs "$device" vifs
- disable_atheros "$device"
local first=1
for vif in $vifs; do
nosbeacon=
local first=1
for vif in $vifs; do
nosbeacon=
@@
-92,7
+94,7
@@
enable_atheros() {
[ "$first" = 1 ] && {
# only need to change freq band and channel on the first vif
[ "$first" = 1 ] && {
# only need to change freq band and channel on the first vif
- config_get agmode "$device" mode
+ config_get agmode "$device"
ag
mode
pureg=0
case "$agmode" in
*b) agmode=11b;;
pureg=0
case "$agmode" in
*b) agmode=11b;;
@@
-101,16
+103,20
@@
enable_atheros() {
*a) agmode=11a;;
*) agmode=auto;;
esac
*a) agmode=11a;;
*) agmode=auto;;
esac
- iwconfig "$ifname" channel
0
>/dev/null 2>/dev/null
+ iwconfig "$ifname" channel
"$channel"
>/dev/null 2>/dev/null
ifconfig "$ifname" up
ifconfig "$ifname" up
+ sleep 1
iwpriv "$ifname" mode "$agmode"
iwpriv "$ifname" pureg "$pureg"
iwconfig "$ifname" channel "$channel" >/dev/null 2>/dev/null
}
iwpriv "$ifname" mode "$agmode"
iwpriv "$ifname" pureg "$pureg"
iwconfig "$ifname" channel "$channel" >/dev/null 2>/dev/null
}
- config_get_bool hidden "$vif" hidden
+ config_get_bool hidden "$vif" hidden
0
iwpriv "$ifname" hide_ssid "$hidden"
iwpriv "$ifname" hide_ssid "$hidden"
+ config_get_bool ff "$vif" ff 0
+ iwpriv "$ifname" ff "$ff"
+
config_get wds "$vif" wds
case "$wds" in
1|on|enabled) wds=1;;
config_get wds "$vif" wds
case "$wds" in
1|on|enabled) wds=1;;
@@
-142,21
+148,17
@@
enable_atheros() {
config_get addr "$vif" bssid
iwpriv "$ifname" wds_add "$addr"
;;
config_get addr "$vif" bssid
iwpriv "$ifname" wds_add "$addr"
;;
- *)
- config_get ssid "$vif" ssid
- ;;
- adhoc)
+ adhoc|ahdemo)
config_get addr "$vif" bssid
[ -z "$addr" ] || {
iwconfig "$ifname" ap "$addr"
}
;;
esac
config_get addr "$vif" bssid
[ -z "$addr" ] || {
iwconfig "$ifname" ap "$addr"
}
;;
esac
+ config_get ssid "$vif" ssid
- [ "$mode" = "sta" ] && {
- config_get_bool bgscan "$vif" bgscan 1
- iwpriv "$ifname" bgscan "$bgscan"
- }
+ config_get_bool bgscan "$vif" bgscan 0
+ iwpriv "$ifname" bgscan "$bgscan"
config_get_bool antdiv "$device" diversity 1
sysctl -w dev."$device".diversity="$antdiv" >&-
config_get_bool antdiv "$device" diversity 1
sysctl -w dev."$device".diversity="$antdiv" >&-
@@
-181,6
+183,16
@@
enable_atheros() {
iwconfig "$ifname" txpower "${txpwr%%.*}"
fi
iwconfig "$ifname" txpower "${txpwr%%.*}"
fi
+ config_get frag "$vif" frag
+ if [ -n "$frag" ]; then
+ iwconfig "$ifname" frag "${frag%%.*}"
+ fi
+
+ config_get rts "$vif" rts
+ if [ -n "$rts" ]; then
+ iwconfig "$ifname" rts "${rts%%.*}"
+ fi
+
ifconfig "$ifname" up
iwconfig "$ifname" channel "$channel" >/dev/null 2>/dev/null
ifconfig "$ifname" up
iwconfig "$ifname" channel "$channel" >/dev/null 2>/dev/null
@@
-192,8
+204,12
@@
enable_atheros() {
start_net "$ifname" "$net_cfg"
}
iwconfig "$ifname" essid "$ssid"
start_net "$ifname" "$net_cfg"
}
iwconfig "$ifname" essid "$ssid"
+ set_wifi_up "$vif" "$ifname"
case "$mode" in
ap)
case "$mode" in
ap)
+ config_get_bool isolate "$vif" isolate 0
+ iwpriv "$ifname" ap_bridge "$((isolate^1))"
+
if eval "type hostapd_setup_vif" 2>/dev/null >/dev/null; then
hostapd_setup_vif "$vif" madwifi || {
echo "enable_atheros($device): Failed to set up wpa for interface $ifname" >&2
if eval "type hostapd_setup_vif" 2>/dev/null >/dev/null; then
hostapd_setup_vif "$vif" madwifi || {
echo "enable_atheros($device): Failed to set up wpa for interface $ifname" >&2
@@
-209,10
+225,15
@@
enable_atheros() {
PSK|psk|PSK2|psk2)
case "$enc" in
PSK|psk)
PSK|psk|PSK2|psk2)
case "$enc" in
PSK|psk)
- proto='proto=WPA';;
+ proto='proto=WPA'
+ passphrase="${key}"
+ ;;
PSK2|psk2)
PSK2|psk2)
- proto='proto=RSN';;
+ proto='proto=RSN'
+ passphrase=`wpa_passphrase ${ssid} "${key}" | grep psk | grep -v \#| cut -d= -f2`
+ ;;
esac
esac
+
cat > /var/run/wpa_supplicant-$ifname.conf <<EOF
ctrl_interface=/var/run/wpa_supplicant
network={
cat > /var/run/wpa_supplicant-$ifname.conf <<EOF
ctrl_interface=/var/run/wpa_supplicant
network={
@@
-220,7
+241,7
@@
network={
ssid="$ssid"
key_mgmt=WPA-PSK
$proto
ssid="$ssid"
key_mgmt=WPA-PSK
$proto
- psk="$
key
"
+ psk="$
passphrase
"
}
EOF
;;
}
EOF
;;
@@
-228,7
+249,7
@@
EOF
#add wpa_supplicant calls here
;;
esac
#add wpa_supplicant calls here
;;
esac
- [ -z "$proto" ] || wpa_supplicant ${bridge:+ -b $bridge} -B
w
-D wext -i "$ifname" -c /var/run/wpa_supplicant-$ifname.conf
+ [ -z "$proto" ] || wpa_supplicant ${bridge:+ -b $bridge} -B -D wext -i "$ifname" -c /var/run/wpa_supplicant-$ifname.conf
;;
esac
first=0
;;
esac
first=0
@@
-246,24
+267,16
@@
detect_atheros() {
config wifi-device $dev
option type atheros
option channel 5
config wifi-device $dev
option type atheros
option channel 5
-# option diversity 1
-# option txantenna 0
-# option rxantenna 0
-# option distance 2000
-# disable radio to prevent an open ap after reflashing:
- option disabled 1
+ # REMOVE THIS LINE TO ENABLE WIFI:
+ option disabled 1
config wifi-iface
option device $dev
option network lan
option mode ap
option ssid OpenWrt
config wifi-iface
option device $dev
option network lan
option mode ap
option ssid OpenWrt
- option hidden 0
-# option txpower 15
-# option bgscan enable
option encryption none
option encryption none
-
EOF
done
}
EOF
done
}
This page took
0.026581 seconds
and
4
git commands to generate.
projects / openwrt.git / blobdiff