-n [master]

   fixes in openwrt script from the lwds-lite lab as well
   as some cosmetic changes and updating other scripts to
   use two double quotes instead of two single quotes for
   empty zone ids.
   [rt29843]

diff --git a/RELNOTES b/RELNOTES
index 4caf76bbe5eeab8dc6c5201c599ef46463843a05..4f485f6c452274ed6d2d281941289b6a2280badc 100644 (file)
--- a/RELNOTES
+++ b/RELNOTES
@@ -111,6 +111,9 @@ work on other platforms. Please report any problems and suggested fixes to
   the release tarballs. To generate this documentation, please use
   make devel command in doc directory. [ISC-Bugs #32767]
 
+- Update client script for use with openwrt.
+  [ISC-Bugs #29843]
+
                        Changes since 4.2.4
 
 - Correct code to calculate timing values in client to compare

diff --git a/client/scripts/bsdos b/client/scripts/bsdos
index 2cbcdfbf3604f313637e0fade4c36adee570c2a5..d69d0d861d01a3bff1f37881b7090cf5c88c6485 100755 (executable)
--- a/client/scripts/bsdos
+++ b/client/scripts/bsdos
@@ -29,7 +29,7 @@ make_resolv_conf() {
       case $nameserver in
          fe80:*) zone_id="%$interface";;
          FE80:*) zone_id="%$interface";;
-         *)      zone_id='';;
+         *)      zone_id="";;
       esac
       echo nameserver ${nameserver}$zone_id >> /etc/resolv.conf.dhclient6
     done

diff --git a/client/scripts/freebsd b/client/scripts/freebsd
index 3f89dee9643df47f034c8cba0cb4ee3c1638aa58..6485cc7513ff92928f99f527ece253cc5efcbd6f 100755 (executable)
--- a/client/scripts/freebsd
+++ b/client/scripts/freebsd
@@ -64,7 +64,7 @@ make_resolv_conf() {
        case $nameserver in
            fe80:*) zone_id="%$interface";;
            FE80:*) zone_id="%$interface";;
-           *)      zone_id='';;
+           *)      zone_id="";;
        esac
        ( echo nameserver ${nameserver}$zone_id >> /etc/resolv.conf.dhclient6 )
        exit_status=$?

diff --git a/client/scripts/macos b/client/scripts/macos
index 8373820b13ac356eb10d7c89b0d5eeca0761c66b..cb6619215a388c4af770e76c85643a26d4f03dd7 100755 (executable)
--- a/client/scripts/macos
+++ b/client/scripts/macos
@@ -34,7 +34,7 @@ make_resolv_conf() {
        case $nameserver in
            fe80:*) zone_id="%$interface";;
            FE80:*) zone_id="%$interface";;
-          *)      zone_id='';;
+          *)      zone_id="";;
        esac
         ( echo nameserver ${nameserver}$zone_id >> /etc/resolv.conf.dhclient6 )
        exit_status=$?

diff --git a/client/scripts/netbsd b/client/scripts/netbsd
index 77b0fba2fb3ec71b471fbabfcf8c66a5097e7742..8a5007e74063e9863fec0b039a6923d4b0206d4e 100755 (executable)
--- a/client/scripts/netbsd
+++ b/client/scripts/netbsd
@@ -29,7 +29,7 @@ make_resolv_conf() {
       case $nameserver in
        fe80:*) zone_id="%$interface";;
        FE80:*) zone_id="%$interface";;
-       *)      zone_id='';;
+       *)      zone_id="";;
       esac
       echo nameserver ${nameserver}$zone_id >> /etc/resolv.conf.dhclient6
     done

diff --git a/client/scripts/openbsd b/client/scripts/openbsd
index ce22d753ad1bc25841c8e41a9f322e698f2f628e..f20d0ff6174f7f3c30ff6d14e8585f8a3c6cb513 100644 (file)
--- a/client/scripts/openbsd
+++ b/client/scripts/openbsd
@@ -29,7 +29,7 @@ make_resolv_conf() {
       case $nameserver in
        fe80:*) zone_id="%$interface";;
        FE80:*) zone_id="%$interface";;
-       *)      zone_id='';;
+       *)      zone_id="";;
       esac
       echo nameserver ${nameserver}$zone_id >> /etc/resolv.conf.dhclient6
     done

diff --git a/client/scripts/openwrt b/client/scripts/openwrt
index 9d434ad389c43ecf7ec097bd32cd2f12942f786d..8c3059a09a278d06dc835920bf541b2743d18032 100755 (executable)
--- a/client/scripts/openwrt
+++ b/client/scripts/openwrt
@@ -1,5 +1,8 @@
 #!/bin/sh
 
+# 'ip' just looks too weird.  /sbin/ip looks less weird.
+ip=/usr/sbin/ip
+
 make_resolv_conf() {
   if [ x"$new_domain_name_servers" != x ]; then
     cat /dev/null > /etc/resolv.conf.dhclient
@@ -30,7 +33,7 @@ make_resolv_conf() {
       case $nameserver in
        fe80:*) zone_id="%$interface";;
        FE80:*) zone_id="%$interface";;
-       *)      zone_id='';;
+       *)      zone_id="";;
       esac
       echo nameserver ${nameserver}$zone_id >> /etc/resolv.conf.dhclient6
     done
@@ -39,7 +42,7 @@ make_resolv_conf() {
   fi
 }
 
-# Must be used on exit.   Invokes the local dhcp client exit hooks, if any.
+# Must be used on exit. Invokes the local dhcp client exit hooks, if any.
 exit_with_hooks() {
   exit_status=$1
   if [ -f /etc/dhclient-exit-hooks ]; then
@@ -73,9 +76,9 @@ fi
 if [ x$alias_subnet_mask != x ]; then
   alias_subnet_arg="netmask $alias_subnet_mask"
 fi
- if [ x$new_interface_mtu != x ]; then
-   mtu_arg="mtu $new_interface_mtu"
- fi
+if [ x$new_interface_mtu != x ]; then
+  mtu_arg="mtu $new_interface_mtu"
+fi
 if [ x$IF_METRIC != x ]; then
   metric_arg="metric $IF_METRIC"
 fi
@@ -101,7 +104,7 @@ fi
 if [ x$reason = xARPCHECK ] || [ x$reason = xARPSEND ]; then
   exit_with_hooks 0
 fi
-  
+
 if [ x$reason = xBOUND ] || [ x$reason = xRENEW ] || \
    [ x$reason = xREBIND ] || [ x$reason = xREBOOT ]; then
   current_hostname=`hostname`
@@ -112,13 +115,14 @@ if [ x$reason = xBOUND ] || [ x$reason = xRENEW ] || \
       hostname $new_host_name
     fi
   fi
-    
+
   if [ x$old_ip_address != x ] && [ x$alias_ip_address != x ] && \
                [ x$alias_ip_address != x$old_ip_address ]; then
     # Possible new alias. Remove old alias.
     ifconfig $interface:0- 0.0.0.0
   fi
-  if [ x$old_ip_address != x ] && [ x$old_ip_address != x$new_ip_address ]; then
+  if [ x$old_ip_address != x ] && \
+               [ x$old_ip_address != x$new_ip_address ]; then
     # IP address changed. Bringing down the interface will delete all routes,
     # and clear the ARP cache.
     ifconfig $interface 0.0.0.0 down
@@ -128,27 +132,27 @@ if [ x$reason = xBOUND ] || [ x$reason = xRENEW ] || \
      [ x$reason = xBOUND ] || [ x$reason = xREBOOT ]; then
 
     ifconfig $interface $new_ip_address $new_subnet_arg \
-                               $new_broadcast_arg $mtu_arg $metric_arg
+                                       $new_broadcast_arg $mtu_arg
     for router in $new_routers; do
       if [ "x$new_subnet_mask" = "x255.255.255.255" ] ; then
        route add -host $router dev $interface
       fi
-      route add default gw $router
+      route add default gw $router $metric_arg dev $interface
     done
-  else                                                                        
-    # we haven't changed the address, have we changed other options           
+  else
+    # we haven't changed the address, have we changed other options
     # that we wish to update?
     if [ x$new_routers != x ] && [ x$new_routers != x$old_routers ] ; then
       # if we've changed routers delete the old and add the new.
       $LOGGER "New Routers: $new_routers"
       for router in $old_routers; do
-        route delete default $router
+       route del default gw $router
       done
       for router in $new_routers; do
        if [ "x$new_subnet_mask" = "x255.255.255.255" ] ; then
          route add -host $router dev $interface
        fi
-       route add default gw $router
+       route add default gw $router $metric_arg dev $interface
       done
     fi
   fi
@@ -184,7 +188,7 @@ if [ x$reason = xTIMEOUT ]; then
     ifconfig $interface:0- 0.0.0.0
   fi
   ifconfig $interface $new_ip_address $new_subnet_arg \
-                               $new_broadcast_arg $mtu_arg $metric_arg
+                                       $new_broadcast_arg $mtu_arg
   set $new_routers
   if ping -q -c 1 $1; then
     if [ x$new_ip_address != x$alias_ip_address ] && \
@@ -196,7 +200,7 @@ if [ x$reason = xTIMEOUT ]; then
       if [ "x$new_subnet_mask" = "x255.255.255.255" ] ; then
        route add -host $router dev $interface
       fi
-      route add default gw $router
+      route add default gw $router $metric_arg dev $interface
     done
     make_resolv_conf
     exit_with_hooks 0
@@ -211,10 +215,10 @@ fi
 
 if [ x$reason = xPREINIT6 ]; then
   # Ensure interface is up.
-  ifconfig ${interface} up
+  ${ip} link set ${interface} up
 
   # Remove any stale addresses from aborted clients.
-  ip -f inet6 addr flush dev ${interface} scope global
+  ${ip} -f inet6 addr flush dev ${interface} scope global permanent
 
   exit_with_hooks 0
 fi
@@ -230,7 +234,8 @@ if [ x$reason = xBOUND6 ]; then
     exit_with_hooks 2;
   fi
 
-  ifconfig ${interface} inet6 ${new_ip6_address}/${new_ip6_prefixlen} alias
+  ${ip} -f inet6 addr add ${new_ip6_address}/${new_ip6_prefixlen} \
+       dev ${interface} scope global
 
   # Check for nameserver options.
   make_resolv_conf
@@ -243,7 +248,8 @@ if [ x$reason = xRENEW6 ] || [ x$reason = xREBIND6 ]; then
     exit_with_hooks 2;
   fi
 
-  ifconfig ${interface} inet6 ${new_ip6_address}/${new_ip6_prefixlen} alias
+  ${ip} -f inet6 addr add ${new_ip6_address}/${new_ip6_prefixlen} \
+       dev ${interface} scope global
 
   # Make sure nothing has moved around on us.
 
@@ -257,11 +263,12 @@ if [ x$reason = xRENEW6 ] || [ x$reason = xREBIND6 ]; then
 fi
 
 if [ x$reason = xDEPREF6 ]; then
-  if [ x${new_ip6_address} = x ] ; then
+  if [ x${new_ip6_prefixlen} = x ] ; then
     exit_with_hooks 2;
   fi
 
-  ifconfig ${interface} inet6 ${new_ip6_address} deprecated
+  ${ip} -f inet6 addr change ${new_ip6_address}/${new_ip6_prefixlen} \
+       dev ${interface} scope global preferred_lft 0
 
   exit_with_hooks 0
 fi
@@ -271,7 +278,8 @@ if [ x$reason = xEXPIRE6 -o x$reason = xRELEASE6 -o x$reason = xSTOP6 ]; then
     exit_with_hooks 2;
   fi
 
-  ifconfig ${interface} inet6 ${old_ip6_address}/${old_ip6_prefixlen} -alias
+  ${ip} -f inet6 addr del ${old_ip6_address}/${old_ip6_prefixlen} \
+       dev ${interface}
 
   exit_with_hooks 0
 fi