Skip to content

Commit

Permalink
dnsmasq: add support for RA option 31
Browse files Browse the repository at this point in the history
The option 31 in the RA specifies the DNS search list, the support
to configure this via UCI is missing in case dnsmasq-dhcpv6 is used.

This commit uses the uci option domain (same as is done by odhcpd) to
read and pass the DNS search list to dnsmasq, which is then used by RA.

Hence, with this commit, we are able to configure DNS search list for the
RA messages via the uci config when dnsmsaq-dhcpv6 is used.

Signed-off-by: Rahul Thakur <[email protected]>
  • Loading branch information
rthakur33 authored and coolsnowwolf committed Oct 24, 2023
1 parent eded1ca commit 2d8ac40
Showing 1 changed file with 8 additions and 0 deletions.
8 changes: 8 additions & 0 deletions package/network/services/dnsmasq/files/dnsmasq.init
Original file line number Diff line number Diff line change
Expand Up @@ -562,6 +562,7 @@ dhcp_add() {
config_get ra_management "$cfg" ra_management
config_get ra_preference "$cfg" ra_preference
config_get dns "$cfg" dns
config_get dns_sl "$cfg" domain

config_list_foreach "$cfg" "interface_name" append_interface_name "$ifname"

Expand Down Expand Up @@ -646,6 +647,13 @@ dhcp_add() {
fi

dhcp_option_append "option6:dns-server,$dnss" "$networkid"

if [ -n "$dns_sl" ]; then
ddssl=""
for dd in $dns_sl; do append ddssl "$dd" ","; done
fi

dhcp_option_append "option6:domain-search,$ddssl" "$networkid"
fi

dhcp_option_add "$cfg" "$networkid" 0
Expand Down

0 comments on commit 2d8ac40

Please sign in to comment.