Changeset 621 for branches

Timestamp:

10/16/11 19:21:52 (7 months ago)

Author:

JulioCP

Message:

nightwing-wa: Allow to make optional to display the node's ID in the SSID.

Location:

branches/nightwing-wa/nightwing

Files:

• etc/config/nwnode (modified) (1 diff)
• etc/init.d/nightwing (modified) (1 diff)
• usr/bin/nw_conf (modified) (6 diffs)

branches/nightwing-wa/nightwing/etc/config/nwnode

@@ -8 +8 @@
 config node nodeid
         option id
+        option display  1
 
 # AP Public

branches/nightwing-wa/nightwing/etc/init.d/nightwing

@@ -94 +94 @@
 NODE_ID=$(uci get nwnode.nodeid.id)
 
+## Display node's id in SSID?
+DISPLAY_NODE_ID=$(uci get nwnode.nodeid.display)
+
 if [ ! "$NODE_ID" ];
 then
   let NODE_ID=0x$(echo $LAN_MAC| awk -F: '{print $5$6}')
   PUBLIC_SSID=$(uci get nwnode.public.ssid)
-  uci set wireless.public.ssid=${PUBLIC_SSID}-${NODE_ID}
+
+  if [ "$DISPLAY_NODE_ID" == 0 ]; then
+          SSID="${PUBLIC_SSID}"
+  else                     
+          SSID="${PUBLIC_SSID}-${NODE_ID}"
+  fi 
+
+  uci set wireless.public.ssid="$SSID"  
   uci set nwnode.nodeid.id=$NODE_ID
   uci commit wireless
   uci commit nwnode
-  $IWCONFIG $PUBLIC_AP_IFACE essid ${PUBLIC_SSID}-${NODE_ID}
+  $IWCONFIG $PUBLIC_AP_IFACE essid "$SSID"
 fi
 

branches/nightwing-wa/nightwing/usr/bin/nw_conf

@@ -37 +37 @@
 SHARE_RATE="nwnode.ts.share_rate"
 NODE_ID=$(uci get nwnode.nodeid.id)
+PUBLIC_SSID=$(uci get nwnode.public.ssid)
 NODE_TS="nwnode.ts.status"
 RESOLV_CONF="/etc/resolv.conf.default"
@@ -532 +533 @@
         esac
 }
+
+case_displ_id_ssid()
+{
+        read VAL
+        case $VAL in
+                y|Y)
+                        if [ $1 == 0 ]; then
+                          uci set nwnode.nodeid.display=1
+                          uci commit nwnode
+                          SSID="${PUBLIC_SSID}-${NODE_ID}"
+                        else
+                          uci set nwnode.nodeid.display=0
+                          uci commit nwnode
+                          SSID="${PUBLIC_SSID}"
+                        fi
+                        uci set wireless.public.ssid="$SSID"
+                        uci commit wireless
+                        ;;
+                n|N)
+                        echo $NOCHANGED_MSG
+                        sleep 2
+                        ;;
+                *)
+                        echo "$VAL is not a valid option"
+                        echo "[y/n]: "
+                        case_displ_id_ssid $DISPLAYING
+                        ;;
+        esac
+}
+
 case_back_to_default_conf()
 {
@@ -604 +635 @@
 echo -e "\033[1m e.\033[0m Change DNS"
 echo -e "\033[1m f.\033[0m Change Public AP SSID"
-echo -e "\033[1m g.\033[0m Change Visualisation Server"
-echo -e "\033[1m h. Return to Factory Default\033[0m "
-echo -e "\033[1m i.\033[0m Back to main menu"
+echo -e "\033[1m g.\033[0m Display Node ID in SSID"
+echo -e "\033[1m h.\033[0m Change Visualisation Server"
+echo -e "\033[1m i. Return to Factory Default\033[0m "
+echo -e "\033[1m j.\033[0m Back to main menu"
 echo -n "Select an option [a - i]: "
 read val3
@@ -645 +677 @@
                 menu_3
                 ;;
-        g|G)    
+        g|G)
+                DISPLAYING=$(uci get nwnode.nodeid.display)
+                if [ $DISPLAYING == 0 ]; then
+                  echo "The node's ID is NOT been displayed in the SSID."
+                else
+                  echo "The node's ID is been displayed in the SSID."
+                fi
+                echo $YESNO_MSG
+                case_displ_id_ssid $DISPLAYING
+                menu_3
+                ;;
+
+
+        h|H)    
                 echo "The current Visualisation Server IP is: $(uci_get $VIS_SRV)"
                 echo $YESNO_MSG
@@ -651 +696 @@
                 menu_3
                 ;;
-        h|H)    
+        i|I)    
                 echo -e "\033[1m - WARNING: THIS RESETS TO DEFAULT CONFIG - \033[0m"
                 echo -e "\033[1m   ARE YOU SURE??? [y/n]: \033[0m"
@@ -657 +702 @@
                 menu_3
                 ;;
-        i|I)
+        j|J)
                 ;;
         *)