starts ifup/ifdown directly

git-svn-id: file:///home/lennart/svn/public/waproamd/trunk@70 022f378f-78c4-0310-b860-d162c87e6274

2 files changed, 13 insertions, 10 deletions

diff --git a/conf/default.in b/conf/default.in
index 39d32d7..07c237c 100755
--- a/conf/default.in
+++ b/conf/default.in
@@ -42,25 +42,25 @@ done
 
 case "$1.$METHOD" in
     start.aes)
-        aeswepd -i $IFACE -w -F "$KEYDIR/$FILE.aes"
-        iwconfig $IFACE key on
+        aeswepd -i "$IFACE" -w -F "$KEYDIR/$FILE.aes"
+        iwconfig "$IFACE" key on 2> /dev/null
         ;;
 
     stop.aes)
-        aeswepd -i $IFACE -kW
-        iwconfig $IFACE key off
+        aeswepd -i "$IFACE" -kW
+        iwconfig "$IFACE" key off 2> /dev/null
         ;;
     
     start.wep)
         KEY="$(cat $KEYDIR/$FILE.wep)"
-	iwconfig $IFACE key "$KEY"
-        iwconfig $IFACE key [1] 2> /dev/null
-	iwconfig $IFACE key restricted 2> /dev/null
-        iwconfig $IFACE key on 2> /dev/null
+        iwconfig "$IFACE" key "$KEY"
+        iwconfig "$IFACE" key [1] 2> /dev/null
+        iwconfig "$IFACE" key restricted 2> /dev/null
+        iwconfig "$IFACE" key on 2> /dev/null
         ;;
 
     *.open|stop.wep)
-        iwconfig $IFACE key off
+        iwconfig "$IFACE" key off 2> /dev/null
         ;;
     *)
         echo "Unknown command\n" > /dev/stderr
@@ -68,4 +68,7 @@ case "$1.$METHOD" in
         ;;
 esac
 
+[ "$1" = "start" ] && exec /sbin/ifup "$IFACE"
+[ "$1" = "stop" ] && exec /sbin/ifdown "$IFACE"
+
 exit 0
diff --git a/conf/waproamd.conf b/conf/waproamd.conf
index 35d1ee1..cc1b7fd 100644
--- a/conf/waproamd.conf
+++ b/conf/waproamd.conf
@@ -29,7 +29,7 @@ INTERFACES="wlan0"
 
 # Additional parameters for waproamd.
 # (Run "waproamd -h" for further information.)
-ARGS="-wM"
+ARGS="-wMU"
 
 # Additional parameters for waproamd for the specified interface.  Note
 # that $ARGS is ignored, when a variable like this is set for an