From 00ec496877453cc37ceec0633821a47f128d9f4f Mon Sep 17 00:00:00 2001
From: Yuxiang Zhu <vfreex@gmail.com>
Date: Mon, 14 Nov 2022 10:23:46 +0800
Subject: T4815: Fix various name server config issues

1. When a PPPoE session is connected, `pppd` will update
   `/etc/resolv.conf` regardless of `system name-server` option unless `no-peer-dns` is set.
   This is because `pppd` vendors scripts `/etc/ppp/ip-up.d/0000usepeerdns` and `/etc/ppp/ip-down.d/0000usepeerdns`,
   which updates `/etc/resolv.conf` on PPPoE connection and reverts the change on disconnection.
   This PR removes those scripts and adds custom scripts to update name server entries through `vyos-hostsd` instead.

2. There is a typo in `/etc/dhcp/dhclient-enter-hooks.d/04-vyos-resolvconf, which misspells variable name `new_dhcp6_name_servers` as `new_dhcpv6_name_servers`.
   This causes IPv6 name server entries in `vyos-hostsd` not updated
   when dhclient receives nameservers from DHCPv6.

3. Regular expressions in scripts under `/etc/dhcp/dhclient-enter-hooks.d` and
   `/etc/dhcp/dhclient-exit-hooks.d/` are not enclosed in `^$`, so those
   IPv4 related branches (like `BOUND`) could be mistakenly executed when an IPv6
   reason (like `BOUND6`) is given.
---
 .../ip-down.d/98-vyos-pppoe-cleanup-nameservers    | 15 ++++++++++++++
 .../ppp/ip-up.d/98-vyos-pppoe-setup-nameservers    | 24 ++++++++++++++++++++++
 2 files changed, 39 insertions(+)
 create mode 100644 src/etc/ppp/ip-down.d/98-vyos-pppoe-cleanup-nameservers
 create mode 100644 src/etc/ppp/ip-up.d/98-vyos-pppoe-setup-nameservers

(limited to 'src/etc/ppp')

diff --git a/src/etc/ppp/ip-down.d/98-vyos-pppoe-cleanup-nameservers b/src/etc/ppp/ip-down.d/98-vyos-pppoe-cleanup-nameservers
new file mode 100644
index 000000000..222c75f21
--- /dev/null
+++ b/src/etc/ppp/ip-down.d/98-vyos-pppoe-cleanup-nameservers
@@ -0,0 +1,15 @@
+#!/bin/bash
+### Autogenerated by interfaces-pppoe.py ###
+
+interface=$6
+if [ -z "$interface" ]; then
+    exit
+fi
+
+if ! /usr/bin/systemctl -q is-active vyos-hostsd; then
+    exit  # vyos-hostsd is not running
+fi
+
+hostsd_client="/usr/bin/vyos-hostsd-client"
+$hostsd_client --delete-name-servers --tag "dhcp-$interface"
+$hostsd_client --apply
diff --git a/src/etc/ppp/ip-up.d/98-vyos-pppoe-setup-nameservers b/src/etc/ppp/ip-up.d/98-vyos-pppoe-setup-nameservers
new file mode 100644
index 000000000..0fcedbedc
--- /dev/null
+++ b/src/etc/ppp/ip-up.d/98-vyos-pppoe-setup-nameservers
@@ -0,0 +1,24 @@
+#!/bin/bash
+### Autogenerated by interfaces-pppoe.py ###
+
+interface=$6
+if [ -z "$interface" ]; then
+    exit
+fi
+
+if ! /usr/bin/systemctl -q is-active vyos-hostsd; then
+    exit  # vyos-hostsd is not running
+fi
+
+hostsd_client="/usr/bin/vyos-hostsd-client"
+
+$hostsd_client --delete-name-servers --tag "dhcp-$interface"
+
+if [ "$USEPEERDNS" ] && [ -n "$DNS1" ]; then
+$hostsd_client --add-name-servers "$DNS1" --tag "dhcp-$interface"
+fi
+if [ "$USEPEERDNS" ] && [ -n "$DNS2" ]; then
+$hostsd_client --add-name-servers "$DNS2" --tag "dhcp-$interface"
+fi
+
+$hostsd_client --apply
-- 
cgit v1.2.3