summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
5f1ae47)
fixes at hostapd initskript (set madwifi specific command only if madwifi is configured)
fix setup use wrong macaddress for Wlan if it is an AP-mode
etc/ntp
etc/rc.d/init.d/snort
etc/ssh/moduli
etc/ntp
etc/rc.d/init.d/snort
etc/ssh/moduli
-VER = trunk-r3994-20090410
+VER = hal-testing-r4003-20090416
THISAPP = madwifi-$(VER)
DL_FILE = $(THISAPP).tar.gz
THISAPP = madwifi-$(VER)
DL_FILE = $(THISAPP).tar.gz
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 9dbd2c1fd3f1aa53f4bdc64531192587
+$(DL_FILE)_MD5 = f9c591f16746a4ac4988ccbfedfe1a85
CHANNEL="05"
TXPOWER="auto"
INTERFACE="blue0"
CHANNEL="05"
TXPOWER="auto"
INTERFACE="blue0"
+MACMODE="0"
+DRIVER="MADWIFI"
+
eval $(/usr/local/bin/readhash /var/ipfire/wlanap/settings)
case "${1}" in
start)
mkdir -p /var/run/hostapd
eval $(/usr/local/bin/readhash /var/ipfire/wlanap/settings)
case "${1}" in
start)
mkdir -p /var/run/hostapd
- if [ "$(/usr/sbin/iwconfig $INTERFACE | /bin/grep "Mode:Master")" == "" ]; then
-
- boot_mesg "Setting wlan $INTERFACE to Master mode... "
- # Set Atheros Cards to master mode
- if [ -d /proc/net/madwifi/ath0/ ]; then
- /usr/bin/wlanconfig ath0 destroy > /dev/null
+ if [ "$DRIVER" == "MADWIFI" ]; then
+ if [ "$(/usr/sbin/iwconfig $INTERFACE | /bin/grep "Mode:Master")" == "" ]; then
+ boot_mesg "Setting MADWIFI wlan $INTERFACE to Master mode... "
+ # Set Atheros Cards to master mode
+ /usr/bin/wlanconfig $INTERFACE destroy > /dev/null
+ /usr/bin/wlanconfig $INTERFACE create wlandev wifi0 wlanmode ap > /dev/null
+ fi
- /usr/bin/wlanconfig $INTERFACE destroy > /dev/null
- /usr/bin/wlanconfig $INTERFACE create wlandev wifi0 wlanmode ap > /dev/null
+ boot_mesg "Starting hostapd... "
+ /usr/sbin/iwconfig $INTERFACE channel $CHANNEL
+ /usr/sbin/iwconfig $INTERFACE txpower $TXPOWER
+ /usr/bin/hostapd -P /var/run/hostapd /etc/hostapd.conf </dev/tty12 >/dev/tty12 2>&1 &
+
+ if [ $DRIVER == "MADWIFI" ]; then
+
+ iwpriv $INTERFACE maccmd 3
+ if [ $MACMODE != 0 ]; then
+ FILE="/var/ipfire/wlanap/macfile"
+ exec < $FILE
+ while read LINE
+ do
+ iwpriv $INTERFACE addmac $LINE
+ done
- # Set other cards to master mode
- #/usr/sbin/iwconfig blue0 mode master
+ iwpriv $INTERFACE maccmd $MACMODE
+ fi
+ # Disable background scann
+ iwpriv $INTERFACE bgscan 0
+ # Set beacon interval to 500
+ iwpriv $INTERFACE bintval 500
fi
if [ "$(/usr/sbin/iwconfig $INTERFACE | /bin/grep "Mode:Master")" == "" ]; then
boot_mesg "Error! Can't set wlan master mode"
echo_failure;
fi
if [ "$(/usr/sbin/iwconfig $INTERFACE | /bin/grep "Mode:Master")" == "" ]; then
boot_mesg "Error! Can't set wlan master mode"
echo_failure;
else
# enable wlan module of collectd
sed -i -e "s|#LoadPlugin wireless|LoadPlugin wireless|g" /etc/collectd.conf
else
# enable wlan module of collectd
sed -i -e "s|#LoadPlugin wireless|LoadPlugin wireless|g" /etc/collectd.conf
-
- boot_mesg "Starting hostapd... "
- /usr/sbin/iwconfig $INTERFACE channel $CHANNEL
- /usr/sbin/iwconfig $INTERFACE txpower $TXPOWER
- /usr/bin/hostapd -P /var/run/hostapd /etc/hostapd.conf </dev/tty12 >/dev/tty12 2>&1 &
- evaluate_retval
- fi
-
- iwpriv $INTERFACE maccmd 3
- if [ $MACMODE != 0 ]; then
- FILE="/var/ipfire/wlanap/macfile"
- exec < $FILE
- while read LINE
- do
- iwpriv $INTERFACE addmac $LINE
- done
-
- iwpriv $INTERFACE maccmd $MACMODE
kudzu -qps -c NETWORK | egrep "desc|network.hwaddr|driver" > /var/ipfire/ethernet/scanned_nics 2>/dev/null
kudzu -qps -c NETWORK | egrep "desc|network.hwaddr|driver" > /var/ipfire/ethernet/scanned_nics 2>/dev/null
+# Revert Accesspoint marking at mac address
+sed -i 's|hwaddr: 06:|hwaddr: 00:|g' /var/ipfire/ethernet/scanned_nics
+