From e39f2ead18c17fa4a8fdfe35437202fb202e983a Mon Sep 17 00:00:00 2001
From: zsdc <taras@vyos.io>
Date: Wed, 12 Feb 2020 13:52:12 +0200
Subject: dhclient-script: T1987: Multiple fixes in dhclient-script

This changeset contains multiple changes in structure, logic, and bugfixes for dhclient-script. It should provide better compatibility with new Debian versions and flexibility in controlling and changing VyOS-related functions.
1. Structure change:
   * All VyOS-related functionality was moved from dhclient-script itself to separated hook files.
   * Old vyatta-dhclient-hook was moved from vyatta-cfg to vyos-1x.
   * This change allows discard dhclient-script replacing and use the original one from Debian without any changes. So, we do not need to track all changes in upstream so carefully.
   * To provide compatibility between original dhclient-script and VyOS, two internal commands/functions are repaced in hooks: ip and make_resolv_conf. So, in all places where used ${ip} or make_resolv_conf, actually using VyOS-tuned functions instead original.
   * `ip` function is a wrapper, which automatically chooses what to use: transparently pass a command to /usr/sbin/ip, change a route in kernel table or FRRouting config via vtysh.
   * `make_resolv_conf` function main logic was copied from current VyOS implementation and use vyos-hostsd-client for making changes
2. Added:
   * Logging. Now is possible to log all changes, what is doing by dhclient-script. Logs can be saved to the journal and displayed in stderr (for debugging purposes). By default, logging to the journal is enabled (at least for some time) to provide a way to collect enough information in case if some bug in this new implementation will be found. This can be changed in the 01-vyos-logging file.
3. Fixed/Changed:
   * If DHCP lease was expired, released or dhclient was stopped, dhclient-script will try to delete default route from this lease.
   * Instead of blindly killing all dhclients in case if FRRouting daemon is not running, now used more intelligent logic:
     * dhclients are stopping natively (with all triggers processing), instead of killing;
     * dhclient-script will not kill parent dhclient process. This allows to fix the problem when systemd inform about failing to rise up interfaces at early boot stages (used in Cloud-init images);
     * dhclient-script will not touch dhclients, which are not related to the current interface or IP protocol version.
   * For getting FRRouting daemon status used native way via watchfrr.sh, instead of the previous trick with vtysh accessibility.
   * before adding a new route to FRRouting configuration, this route will be deleted from the kernel (if it is presented there). This allows to properly replace routes, added at early boot stages, when FRR not available.
   * Routes in FRRouting are adding with "tag 210". This allows protecting static routes, added via CLI, from deletion when old routes are deleting by DHCP.
   * DNS servers will be reconfigured only when $new_domain_name_servers are not the same as $old_domain_name_servers. Previously, this was done during each RENEW procedure.
   * Replacing MTU for preconfigured one was changed to Python (via vyos.config). The previous version with vyatta-interfaces.pl was obsoleted and seems to be broken.
---
 src/etc/dhcp/dhclient-exit-hooks.d/01-vyos-cleanup | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 src/etc/dhcp/dhclient-exit-hooks.d/01-vyos-cleanup

(limited to 'src/etc/dhcp/dhclient-exit-hooks.d/01-vyos-cleanup')

diff --git a/src/etc/dhcp/dhclient-exit-hooks.d/01-vyos-cleanup b/src/etc/dhcp/dhclient-exit-hooks.d/01-vyos-cleanup
new file mode 100644
index 000000000..ce846f6c3
--- /dev/null
+++ b/src/etc/dhcp/dhclient-exit-hooks.d/01-vyos-cleanup
@@ -0,0 +1,16 @@
+if [[ $reason =~ (EXPIRE|FAIL|RELEASE|STOP) ]]; then
+    # delete dynamic nameservers from a configuration if lease was deleted
+    logmsg info "Deleting nameservers with tag \"dhcp-${interface}\" via vyos-hostsd-client"
+    vyos-hostsd-client --delete-name-servers --tag dhcp-${interface}
+    # try to delete default ip route (NOTE: here we use 'ip' wrapper, therefore a route will be actually deleted via /usr/sbin/ip or vtysh, according to the system state)
+    for router in $old_routers; do
+        logmsg info "Deleting default route: via $router dev ${interface}"
+        ip -4 route del default via $router dev ${interface}
+    done
+fi
+
+if [[ $reason =~ (EXPIRE6|RELEASE6|STOP6) ]]; then
+    # delete dynamic nameservers from a configuration if lease was deleted
+    logmsg info "Deleting nameservers with tag \"dhcpv6-${interface}\" via vyos-hostsd-client"
+    vyos-hostsd-client --delete-name-servers --tag dhcpv6-${interface}
+fi
-- 
cgit v1.2.3