Changeset 558 for trunk

Timestamp:

11/23/10 22:36:12 (18 months ago)

Author:

JulioCP

Message:

Merged, nightwing directory files, from nightwing-backfire branch into trunk.

Location:

trunk/nightwing

Files:

• etc/CHANGELOG (modified) (1 diff)
• etc/config/wireless (modified) (1 diff)
• etc/init.d/nightwing (modified) (1 diff)
• etc/nightwing_version (modified) (1 diff)
• usr/bin/nw_conf (modified) (3 diffs)
• www/cgi-bin/clientDisconnect.awk (added)
• www/cgi-bin/clientOnLine.html (added)
• www/cgi-bin/fwupgrade.cgi (deleted)
• www/cgi-bin/info.html (modified) (6 diffs)
• www/cgi-bin/nw_config (added)
• www/cgi-bin/nw_config/basicSettings.cgi (added)
• www/cgi-bin/nw_config/basicSettingsFunctions.cgi (added)
• www/cgi-bin/nw_config/footer_html (added)
• www/cgi-bin/nw_config/header_html (added)
• www/cgi-bin/nw_config/nw_conf_web.html (added)
• www/cgi-bin/resetUsersSelected.cgi (added)
• www/cgi-bin/upgrade.html (deleted)
• www/index.html (modified) (1 diff)

trunk/nightwing/etc/CHANGELOG

@@ +1 @@
+Version 0.7.5
+* ADDED: Option in the Web Admin Interface to reset user's connection in the Public AP.
+* ADDED: Node configuration option in the Web Admin Interface.
+* ADDED: Show Nightwing's version in status of all nodes.
+* ADDED: Gateway IP info in nw_conf and in the web interface.
+* CHANGED: Change to OpenWRT Backfire.
+* CHANGED: bmxd version. Now it's used r1707.
+* CHANGED: Wifidog version. Now it's used r1458.
+* CHANGED: Replace httpd with uhttpd.
+* CHANGED: Web pages are adjusted to work with uhttpd
+* CHANGED: The default routing class is now 2.
+* DELETED: Upgrade from http.
+
 Version 0.7
 * ADDED: nw_ts: Traffic Shapping (TS) function.

trunk/nightwing/etc/config/wireless

@@ -11 +11 @@
 #       option distance   200
         option diversity 0
-        option txantenna 1
-        option rxantenna 1
-        option antenna  auto
+        option antenna  vertical
 
 # Mesh ad-hoc

trunk/nightwing/etc/init.d/nightwing

@@ -94 +94 @@
 
 ## Check if WiFiDog daemon is running, if so stop and disable it and change some configs.
-if  [ -f /etc/rc.d/S50wifidog ]; then
+if  [ -f /etc/rc.d/S65wifidog ]; then
     /etc/init.d/wifidog stop
     /etc/init.d/wifidog disable

trunk/nightwing/etc/nightwing_version

@@ -1 @@
-0.7
+0.7.5

trunk/nightwing/usr/bin/nw_conf

@@ -125 +125 @@
         echo -e "\033[1m Gateway Class:\033[0m $(uci_get $GATEWAY_CLASS)"
         echo -e "\033[1m Routing Class:\033[0m $(uci_get $ROUTING_CLASS)"
+if [ $(uci get bmx_mode.node.mode) == 'client' ]; then echo -e "\033[1m Gateway IP:\033[0m $(bmxd -c -d2 | grep "=>" | awk '{ print $2 }')"; fi
         echo -e "\033[1m Host Name:\033[0m $(uci_get $HOSTNAME)"
         echo -e "\033[1m Server Log IP:\033[0m $(uci_get $SERVERLOG)"
@@ -170 +171 @@
                 if [[ "${#HTTPPASS}" -gt 7 && "${#HTTPPASS}" -lt 64 ]];
                 then
-                        echo "/:$HTTPUSER:$(httpd -m $HTTPPASS)" > /etc/httpd.conf
+                        echo "/:$HTTPUSER:$(uhttpd -m $HTTPPASS)" > /etc/httpd.conf
                         HTTPD_CHANGE=1
                 else
@@ -425 +426 @@
                         echo "Do you want to change the Web access admin? [y/n]: "
                         case_httpd_access
-                        if  [ $HTTPD_CHANGE == "1" ]; then kill -9 $(pidof httpd);/etc/init.d/httpd start;fi
+                        if  [ $HTTPD_CHANGE == "1" ]; then /etc/init.d/uhttpd restart;fi
                         menu_2
                         ;;

trunk/nightwing/www/cgi-bin/info.html

@@ -1 +1 @@
 #!/bin/sh
 PATH=/bin:/usr/bin:/sbin:/usr/sbin
+
+echo -e "Content-type: text/html\n\n" 
 cat << EOF
 
@@ -23 +25 @@
         <li id="home"><a href="/">Home</a></li>
         <li id="info" class="activelink"><a href="#">Info</a></li>
-        <li id="up"><a href="upgrade.html">Upgrade</a></li>
+        <li id="cs"><a href="clientOnLine.html">Client Status</a></li>
+        <li id="nw_conf"> <a href="nw_config/nw_conf_web.html">Config</a></li>
       </ul>
     </div>
@@ -36 +39 @@
    let i=$i+1
    eval $(echo tmp=$(uci get $element))
-   eval VAR${i}=$(httpd -d $tmp)
+   eval VAR${i}=$(uhttpd -d $tmp)
 done
 cat << EOF
@@ -47 +50 @@
 <li><b>Gateway Class:</b> $VAR3</li>
 <li><b>Routing Class:</b> $VAR4</li>
+$(if [ $(uci get bmx_mode.node.mode) == 'client' ]; then echo "<li><b>Gateway IP:</b> $(bmxd -c -d2 | grep "=>" | awk '{ print $2 }')</li>"; fi)
 <li><b>Host Name:</b> $VAR5</li>
 <li><b>Server Log IP:</b> $VAR6</li>
@@ -54 +58 @@
 <li><b>Antenna Mode:</b> $VAR10</li>
 <li><b>Mesh BSSID:</b> $VAR11</li>
-<li><b>Node TS Mode:</b> $(if [ $VAR12 != "0" ];then echo "Enable";else echo "Disable";fi)</li>
+<li><b>Node TS Mode:</b> $(if [ $VAR12 != "0" ];then echo "Enabled";else echo "Disabled";fi)</li>
 <li><b>Share Rate:</b> $VAR13 kbps</li>
 <li><b>Public AP SSID:</b> $VAR14</li>
@@ -72 +76 @@
 </html>
 EOF
+

trunk/nightwing/www/index.html

@@ -20 +20 @@
         <li id="home" class="activelink"><a href="#">Home</a></li>
         <li id="info"> <a href="cgi-bin/info.html">Info</a></li>
-        <li id="up"> <a href="cgi-bin/upgrade.html">Upgrade</a></li>
+        <li id="cs"> <a href="cgi-bin/clientOnLine.html">Client Status</a></li>
+        <li id="nw_conf"> <a href="cgi-bin/nw_config/nw_conf_web.html">Config</a></li>
       </ul>
     </div>