Attachment 826866 Details for Bug 1032809 – Assign lease time to addresses added by dhclient-script

[patch] Assign lease time to addresses added by dhclient-script

dhclient-script-lifetimes.patch (text/plain), 2.83 KB, created by Dan Williams on 2013-11-20 21:53:42 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dan Williams

Created: 2013-11-20 21:53:42 UTC

Size: 2.83 KB

patch

obsolete

>diff --git a/dhclient-script b/dhclient-script
>index 41fd26f..a6092f9 100644
>--- a/dhclient-script
>+++ b/dhclient-script
>@@ -350,15 +350,16 @@ dhconfig() {
>     if [ "${reason}" = "BOUND" ] || [ "${reason}" = "REBOOT" ] ||
>        [ ! "${old_ip_address}" = "${new_ip_address}" ] ||
>        [ ! "${old_subnet_mask}" = "${new_subnet_mask}" ] ||
>        [ ! "${old_network_number}" = "${new_network_number}" ] ||
>        [ ! "${old_broadcast_address}" = "${new_broadcast_address}" ] ||
>        [ ! "${old_routers}" = "${new_routers}" ] ||
>        [ ! "${old_interface_mtu}" = "${new_interface_mtu}" ]; then
>-        ip -4 addr add ${new_ip_address}/${new_prefix} broadcast ${new_broadcast_address} dev ${interface} >/dev/null 2>&1
>+        ip -4 addr add ${new_ip_address}/${new_prefix} broadcast ${new_broadcast_address} dev ${interface} \
>+        	valid_lft ${new_dhcp_lease_time} preferred_lft ${new_dhcp_lease_time} >/dev/null 2>&1
>         ip link set dev ${interface} up
> 
>         # The 576 MTU is only used for X.25 and dialup connections
>         # where the admin wants low latency.  Such a low MTU can cause
>         # problems with UDP traffic, among other things.  As such,
>         # disallow MTUs from 576 and below by default, so that broken
>         # MTUs are ignored, but higher stuff is allowed (1492, 1500, etc).
>@@ -542,15 +543,16 @@ dhconfig() {
> 
> # Section 18.1.8. (Receipt of Reply Messages) of RFC 3315 says:
> # The client SHOULD perform duplicate address detection on each of
> # the addresses in any IAs it receives in the Reply message before
> # using that address for traffic.
> add_ipv6_addr_with_DAD() {
>             ip -6 addr add ${new_ip6_address}/${new_ip6_prefixlen} \
>-                dev ${interface} scope global
>+                dev ${interface} scope global valid_lft ${new_dhcp_lease_time} \
>+                preferred_lft ${new_dhcp_lease_time}
> 
>             # repeatedly test whether newly added address passed
>             # duplicate address detection (DAD)
>             for i in $(seq 5); do
>                 sleep 1 # give the DAD some time
> 
>                 # tentative flag == DAD is still not complete
>@@ -766,15 +768,16 @@ case "${reason}" in
> 
>     TIMEOUT)
>         if [ -n "${new_routers}" ]; then
>             if [ -n "${alias_ip_address}" ]; then
>                 ip -4 addr flush dev ${interface} label ${interface}:0 >/dev/null 2>&1
>             fi
> 
>-            ip -4 addr add ${new_ip_address}/${new_prefix} broadcast ${new_broadcast_address} dev ${interface}
>+            ip -4 addr add ${new_ip_address}/${new_prefix} broadcast ${new_broadcast_address} dev ${interface} \
>+            	valid_lft ${new_dhcp_lease_time} preferred_lft ${new_dhcp_lease_time}
>             set ${new_routers}
> 
>             if ping -q -c 1 -w 10 -I ${interface} ${1}; then
>                 dhconfig
>                 exit_with_hooks 0
>             fi
>

Actions: View | Diff

Attachments on bug 1032809: 826866 | 827184