Changeset 602 for trunk

Timestamp:

08/17/11 03:11:45 (9 months ago)

Author:

JulioCP

Message:

Allow optional Private AP configuration in nw_conf and show current state in info.

Files:

• trunk/nightwing/usr/bin/nw_conf (modified) (5 diffs)

trunk/nightwing/usr/bin/nw_conf

@@ -46 +46 @@
 RESOLV_CONF="/etc/resolv.conf.default"
 VERSION="/etc/nightwing_version"
+PRI_AP_ACT="nwnode.private.activate"
 
 ## Message
@@ -129 +130 @@
         echo -e "\033[1m Server Log IP:\033[0m $(uci_get $SERVERLOG)"
         echo -e "\033[1m Visualisation Server:\033[0m $(uci get $VIS_SRV)"
+        echo -e "\033[1m Public AP is $(if [ $(uci_get $PRI_AP_ACT) == 0 ]; then echo -e "\033[1mnot activated."; else echo -e "\033[1mactivated."; fi)"
         echo -e "\033[1m Node Channel:\033[0m $(uci_get $CHANNEL)"
         echo -e "\033[1m Wireless Mode:\033[0m $(uci_get $WMODE)"
@@ -399 +401 @@
 esac
 }
+
+case_pri_ap(){
+        read VAL
+        case $VAL in
+                y|Y)
+                        if [ $(uci get $PRI_AP_ACT) == 0 ]; then uci set $PRI_AP_ACT=1; else uci set $PRI_AP_ACT=0; fi
+                        uci commit
+                        echo -e "The Private AP has been $(if [ $(uci_get $PRI_AP_ACT) == 0 ]; then echo -e "\033[1mdeactivated."; else echo -e "\033[1mactivated."; fi)"
+                        ;;
+                n|N)
+                        echo $NOCHANGED_MSG
+                        ;;
+                *)
+                        echo "$VAL is not a valid option"
+                        echo "[y/n]: "
+                        case_pri_ap
+                        ;;
+        esac 
+        sleep 2
+}
+
+
+
 clear
 echo -e "\033[1m **************** Basic Config *****************\033[0m"
@@ -409 +434 @@
 echo -e "\033[1m f.\033[0m Change Wireless mode"
 echo -e "\033[1m g.\033[0m Change Traffic Shaping Configuration"
-echo -e "\033[1m h.\033[0m Back to main menu"
-echo -n "Select an option [a - h]: "
+echo -e "\033[1m h.\033[0m Change Private AP Activation"
+echo -e "\033[1m i.\033[0m Back to main menu"
+echo -n "Select an option [a - i]: "
 read val2
        case $val2 in
@@ -450 +476 @@
                         menu_2
                         ;;
-                h|H)
+                h|H) 
+                        echo -e "The Private AP is $(if [ $(uci_get $PRI_AP_ACT) == 0 ]; then echo -e "\033[1mnot activated."; else echo -e "\033[1mactivated."; fi)"
+                        echo $YESNO_MSG
+                        case_pri_ap
+                        menu_2
+                        ;;
+                i|I)
                         ;;
                 *)