[pisa-src] r933 - trunk/tools

Author: biurrun
Date: Fri Sep  4 17:03:09 2009
New Revision: 933

Log:
Add two new parameters for dhcp and route commands.

Modified:
   trunk/tools/switch-ip

Modified: trunk/tools/switch-ip
==============================================================================
--- trunk/tools/switch-ip       Fri Sep  4 15:47:00 2009        (r932)
+++ trunk/tools/switch-ip       Fri Sep  4 17:03:09 2009        (r933)
@@ -11,11 +11,7 @@
 IFWLAN="wlan0"
 IFDUMMY="dummy0"
 
-#DHCPC="udhcpc"
-DHCPC="dhclient"
-
-#DHCPCMD="$DHCPC -i $IFWLAN"
-DHCPCMD="$DHCPC -q $IFWLAN"
+DHCP_CMD="dhclient -q"
 
 # my IP address (host part)
 MYIP1="10.0.11.101"
@@ -89,6 +85,8 @@
        echo " --apmac2=xx:xx:xx:xx:xx:xx : MAC address of the 2nd access point"
        echo " --apssid1=<ssid1> : SSID of the 1st access point"
        echo " --apssid2=<ssid2> : SSID of the 2nd access point"
+       echo " --dhcp_cmd=<command> : DHCP command to use"
+       echo " --route_extra_cmd=<command> : extra route command to use"
        echo " --nowep : associate without WEP keys for access points"
        echo " -h : this help message"
 }
@@ -177,6 +175,16 @@
       APSSID2=${optarr[$(($i+1))]}
       i=$(($i+2))
       ;;
+    --dhcp_cmd )
+      echo "DHCP command = ${optarr[$(($i+1))]}"
+      DHCP_CMD=${optarr[$(($i+1))]}
+      i=$(($i+2))
+      ;;
+    --route_extra_cmd )
+      echo "extra route command = ${optarr[$(($i+1))]}"
+      ROUTE_EXTRA_CMD=${optarr[$(($i+1))]}
+      i=$(($i+2))
+      ;;
     --nowep ) echo "Running without WEP keys..."; USEWEPKEYS=0; i=$(($i+1));;
     -- ) i=$(($i+1)); break;;
     * ) usage; exit 1;;
@@ -234,8 +242,10 @@
 # arp -s $AP_IP $NEW_MAC_ADR
 
  echo "route del -net $DESTINATION netmask $NETMASK"
+ echo $ROUTE_EXTRA_CMD
  echo "route add -net $DESTINATION netmask $NETMASK gw $AP_IP"
  route del -net $DESTINATION netmask $NETMASK 2> /dev/null
+ $ROUTE_EXTRA_CMD
  route add -net $DESTINATION netmask $NETMASK gw $AP_IP 2> /dev/null
 
 # echo "ip -6 route del $DEST_IPV6 dev $IFDUMMY"
@@ -246,15 +256,15 @@
  echo "iwconfig $IFWLAN essid $NEW_SSID ap $NEW_MAC_ADR"
  iwconfig $IFWLAN essid "$NEW_SSID" ap "$NEW_MAC_ADR"
 
- echo "killall $DHCPC"
- killall $DHCPC
+ echo "killall $DHCP_CMD"
+ killall $DHCP_CMD
 
  echo "Deleting routing table entries for $IFWLAN..."
  delroute
 
  echo "Getting a new IP configuration for $IFWLAN via DHCP..."
- echo "$DHCPCMD"
- $DHCPCMD
+ echo $DHCP_CMD $IFWLAN
+ $DHCP_CMD $IFWLAN
 
  echo "route add -net $DESTINATION netmask $NETMASK gw $AP_IP"
  route add -net $DESTINATION netmask $NETMASK gw $AP_IP

Other related posts:

  • » [pisa-src] r933 - trunk/tools - Diego Biurrun