upstream/openvpn
1
0
Fork 0
mirror of https://github.com/OpenVPN/openvpn.git synced 2026-05-28 04:03:29 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

move macOS dns-updown common code into functions

Browse source 
Change-Id: Id6f70237c7205063b001528a40391678b0d093ac
Signed-off-by: Heiko Hund <heiko@ist.eigentlich.net>
Acked-by: Frank Lichtenheld <frank@lichtenheld.com>
Message-Id: <20250711100853.242102-1-frank@lichtenheld.com>
URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg32105.html
Signed-off-by: Gert Doering <gert@greenie.muc.de>
This commit is contained in:
Heiko Hund 2025-07-11 12:08:53 +02:00 committed by Gert Doering
parent 4848df2fb2
commit 022cd3e7fe
1 changed files with 40 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

85
distro/dns-scripts/macos-dns-updown.sh
View file

@ -104,7 +104,7 @@ function find_compat_profile {
n=$((n+1))
done
return $n
echo $n
}
function get_search_domains {
@ -157,41 +157,23 @@ function unset_search_domains {
echo -e "${cmds}" | /usr/sbin/scutil
}
function set_dns {
find_compat_profile
local n=$?
function addresses_string {
local n=$1
local i=1
local addrs=""
local addresses=""
while :; do
local addr_var=dns_server_${n}_address_${i}
local addr="${!addr_var}"
[ -n "$addr" ] || break
local port_var=dns_server_${n}_port_${i}
if [ -n "${!port_var}" ]; then
if [[ "$addr" =~ : ]]; then
addr="[$addr]"
fi
addrs+="${addr}:${!port_var}${sni} "
else
addrs+="${addr}${sni} "
fi
addresses+="${addr} "
i=$((i+1))
done
echo "$addresses"
}
i=1
local match_domains=""
while :; do
domain_var=dns_server_${n}_resolve_domain_${i}
[ -n "${!domain_var}" ] || break
# Add as match domain, if it doesn't already exist
[[ "$match_domains" =~ (^| )${!domain_var}( |$) ]] \
|| match_domains+="${!domain_var} "
i=$((i+1))
done
i=1
function search_domains_string {
local n=$1
local i=1
local search_domains=""
while :; do
domain_var=dns_search_domain_${i}
@ -201,11 +183,34 @@ function set_dns {
|| search_domains+="${!domain_var} "
i=$((i+1))
done
echo "$search_domains"
}
function match_domains_string {
local n=$1
local i=1
local match_domains=""
while :; do
domain_var=dns_server_${n}_resolve_domain_${i}
[ -n "${!domain_var}" ] || break
# Add as match domain, if it doesn't already exist
[[ "$match_domains" =~ (^| )${!domain_var}( |$) ]] \
|| match_domains+="${!domain_var} "
i=$((i+1))
done
echo "$match_domains"
}
function set_dns {
local n="$(find_compat_profile)"
local addresses="$(addresses_string $n)"
local search_domains="$(search_domains_string $n)"
local match_domains="$(match_domains_string $n)"
if [ -n "$match_domains" ]; then
local cmds=""
cmds+="d.init\n"
cmds+="d.add ServerAddresses * ${addrs}\n"
cmds+="d.add ServerAddresses * ${addresses}\n"
cmds+="d.add SupplementalMatchDomains * ${match_domains}\n"
cmds+="d.add SupplementalMatchDomainsNoSearch # 1\n"
cmds+="add ${itf_dns_key}\n"
@ -222,7 +227,7 @@ function set_dns {
cmds+="get $(primary_dns_key)\n"
cmds+="set ${dns_backup_key}\n"
cmds+="d.init\n"
cmds+="d.add ServerAddresses * ${addrs}\n"
cmds+="d.add ServerAddresses * ${addresses}\n"
cmds+="d.add SearchDomains * ${search_domains}\n"
cmds+="d.add SearchOrder # 5000\n"
cmds+="set $(primary_dns_key)\n"
@ -233,22 +238,12 @@ function set_dns {
}
function unset_dns {
find_compat_profile
local n=$?
local n="$(find_compat_profile)"
local addresses="$(addresses_string $n)"
local search_domains="$(search_domains_string $n)"
local match_domains="$(match_domains_string $n)"
local i=1
local search_domains=""
while :; do
domain_var=dns_search_domain_${i}
[ -n "${!domain_var}" ] || break
# Add as search domain, if it doesn't already exist
[[ "$search_domains" =~ (^| )${!domain_var}( |$) ]] \
|| search_domains+="${!domain_var} "
i=$((i+1))
done
domain_var=dns_server_${n}_resolve_domain_1
if [ -n "${!domain_var}" ]; then
if [ -n "$match_domains" ]; then
echo "remove ${itf_dns_key}" | /usr/sbin/scutil
unset_search_domains "$search_domains"
else