Changeset 567 for branches

Timestamp:

11/30/10 02:17:33 (18 months ago)

Author:

JulioCP

Message:

Updated Nightwing-WA. Added the posibility to specify a fixed IP to return for any query not answered from /etc/hosts, only in client mode.

Location:

branches/nightwing-wa/nightwing

Files:

• etc/config/nwnode (modified) (1 diff)
• etc/init.d/nightwing (modified) (3 diffs)
• usr/bin/nw_check (modified) (2 diffs)

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

@@ -21 +21 @@
 config node check
         option ip '192.33.4.12 128.8.10.90 193.0.14.129 198.41.0.4 192.228.79.201 192.5.5.241 192.36.148.17 192.58.128.30'
+
+config node dnsmasq
+    option address ' '

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

@@ -37 +37 @@
 IPCHECK=$(uci get nwnode.check.ip)
 CLIENTWITHIP=0
+ADDRESS=$(uci get nwnode.dnsmasq.address)
 
 ## Parameters for B.A.T.M.A.N.-Experimental
@@ -241 +242 @@
                     echo "dhcp-option=lan,3,"$IP_LAN    >> $DNSMASQ_CONF
                     echo "interface="$LAN_IFACE         >> $DNSMASQ_CONF
+  
+                    if [ $ADDRESS ]; then
+                        echo "address=/#/"$ADDRESS      >> $DNSMASQ_CONF
+                    else
+                        echo "#address=/#/"$ADDRESS     >> $DNSMASQ_CONF
+                    fi
                 fi
 
@@ -269 +276 @@
                 
                 logger -s -t  "nightwing" "Gateway node found"
+
+                if [ $ADDRESS ]; then
+                        sed -i s/address=/#address=/ $DNSMASQ_CONF
+                        killall dnsmasq
+                        $DNSMASQ -C $DNSMASQ_CONF
+                        logger -s -t  "nightwing" " DNSMasq rearranged"
+                fi
 
                 ## Masquerade tun iface

branches/nightwing-wa/nightwing/usr/bin/nw_check

@@ -26 +26 @@
 IPTABLES=/usr/sbin/iptables
 IPCHECK=$(uci get nwnode.check.ip)
+DNSMASQ=/usr/sbin/dnsmasq
+DNSMASQ_CONF=/tmp/dnsmasq.conf
+ADDRESS=$(uci get nwnode.dnsmasq.address)
 
 if [ $BMX_MODE == "gateway" ]; then
@@ -71 +74 @@
 else 
     {
+    
+    if [ $ADDRESS ]; then
+        bgw=$(bmxd -c -d 2 | grep = | awk '{print $2}')
+        numeral=$(grep "#address=" $DNSMASQ_CONF | wc -l)
+            
+        if [ -z $bgw ]; then
+        {
+                if [ $numeral -gt 0 ]; then
+                        sed -i s/#address=/address=/ $DNSMASQ_CONF
+                        killall dnsmasq
+                        $DNSMASQ -C $DNSMASQ_CONF
+                        logger -s -t  "nightwing" "I don't have a gateway, so correct DNSMasq configuration."
+                        
+                fi
+        }
+        else
+        {
+                if [ $numeral -lt 1 ]; then
+                        sed -i s/address=/#address=/ $DNSMASQ_CONF
+                        killall dnsmasq 
+                        $DNSMASQ -C $DNSMASQ_CONF
+                        logger -s -t  "nightwing" "I have a gateway, so correct DNSMasq configuration."
+                fi
+        }
+        fi
+    fi
+
     BMX_CLIENWITHIP=$(uci get bmx_mode.node.clientwithip)
     if [ $BMX_CLIENWITHIP == "1" ]; then