From: "cron2 (Code Review)" Date: Tue, 15 Jul 2025 11:22:51 +0000 In-Reply-To: References: Reply-To: gert@...1296..., arne-openvpn@...1227..., heiko@...515..., openvpn-devel@lists.sourceforge.net, frank@...2641... Message-ID: <13baba59d8156b339405e7e3d11c71fcf58a7c2b-EmailReplacePatchSet-HTML@...2715...> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Disposition: inline Content-Type: multipart/alternative; boundary="SniaG5E6UAg="; charset=UTF-8 Subject: [Openvpn-devel] [M] Change in openvpn[master]: move macOS dns-updown common code into functions List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: d12fk , plaisthos , flichtenheld Cc: openvpn-devel --SniaG5E6UAg= Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable cron2 has uploaded a new patch set (#4) to the change originally created by= d12fk. ( http://gerrit.openvpn.net/c/openvpn/+/1074?usp=3Demail ) The following approvals got outdated and were removed: Code-Review+2 by flichtenheld Change subject: move macOS dns-updown common code into functions ...................................................................... move macOS dns-updown common code into functions Change-Id: Id6f70237c7205063b001528a40391678b0d093ac Signed-off-by: Heiko Hund Acked-by: Frank Lichtenheld Message-Id: <20250711100853.242102-1-frank@...2641...> URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg32= 105.html Signed-off-by: Gert Doering --- M distro/dns-scripts/macos-dns-updown.sh 1 file changed, 40 insertions(+), 45 deletions(-) git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/74/1074/4 diff --git a/distro/dns-scripts/macos-dns-updown.sh b/distro/dns-scripts/ma= cos-dns-updown.sh index f0640ee..56f1009 100644 --- a/distro/dns-scripts/macos-dns-updown.sh +++ b/distro/dns-scripts/macos-dns-updown.sh @@ -104,7 +104,7 @@ n=3D$((n+1)) done - return $n + echo $n } function get_search_domains { @@ -157,41 +157,23 @@ echo -e "${cmds}" | /usr/sbin/scutil } -function set_dns { - find_compat_profile - local n=3D$? - +function addresses_string { + local n=3D$1 local i=3D1 - local addrs=3D"" + local addresses=3D"" while :; do local addr_var=3Ddns_server_${n}_address_${i} local addr=3D"${!addr_var}" [ -n "$addr" ] || break - - local port_var=3Ddns_server_${n}_port_${i} - if [ -n "${!port_var}" ]; then - if [[ "$addr" =3D~ : ]]; then - addr=3D"[$addr]" - fi - addrs+=3D"${addr}:${!port_var}${sni} " - else - addrs+=3D"${addr}${sni} " - fi + addresses+=3D"${addr} " i=3D$((i+1)) done + echo "$addresses" +} - i=3D1 - local match_domains=3D"" - while :; do - domain_var=3Ddns_server_${n}_resolve_domain_${i} - [ -n "${!domain_var}" ] || break - # Add as match domain, if it doesn't already exist - [[ "$match_domains" =3D~ (^| )${!domain_var}( |$) ]] \ - || match_domains+=3D"${!domain_var} " - i=3D$((i+1)) - done - - i=3D1 +function search_domains_string { + local n=3D$1 + local i=3D1 local search_domains=3D"" while :; do domain_var=3Ddns_search_domain_${i} @@ -201,11 +183,34 @@ || search_domains+=3D"${!domain_var} " i=3D$((i+1)) done + echo "$search_domains" +} + +function match_domains_string { + local n=3D$1 + local i=3D1 + local match_domains=3D"" + while :; do + domain_var=3Ddns_server_${n}_resolve_domain_${i} + [ -n "${!domain_var}" ] || break + # Add as match domain, if it doesn't already exist + [[ "$match_domains" =3D~ (^| )${!domain_var}( |$) ]] \ + || match_domains+=3D"${!domain_var} " + i=3D$((i+1)) + done + echo "$match_domains" +} + +function set_dns { + local n=3D"$(find_compat_profile)" + local addresses=3D"$(addresses_string $n)" + local search_domains=3D"$(search_domains_string $n)" + local match_domains=3D"$(match_domains_string $n)" if [ -n "$match_domains" ]; then local cmds=3D"" cmds+=3D"d.init\n" - cmds+=3D"d.add ServerAddresses * ${addrs}\n" + cmds+=3D"d.add ServerAddresses * ${addresses}\n" cmds+=3D"d.add SupplementalMatchDomains * ${match_domains}\n" cmds+=3D"d.add SupplementalMatchDomainsNoSearch # 1\n" cmds+=3D"add ${itf_dns_key}\n" @@ -222,7 +227,7 @@ cmds+=3D"get $(primary_dns_key)\n" cmds+=3D"set ${dns_backup_key}\n" cmds+=3D"d.init\n" - cmds+=3D"d.add ServerAddresses * ${addrs}\n" + cmds+=3D"d.add ServerAddresses * ${addresses}\n" cmds+=3D"d.add SearchDomains * ${search_domains}\n" cmds+=3D"d.add SearchOrder # 5000\n" cmds+=3D"set $(primary_dns_key)\n" @@ -233,22 +238,12 @@ } function unset_dns { - find_compat_profile - local n=3D$? + local n=3D"$(find_compat_profile)" + local addresses=3D"$(addresses_string $n)" + local search_domains=3D"$(search_domains_string $n)" + local match_domains=3D"$(match_domains_string $n)" - local i=3D1 - local search_domains=3D"" - while :; do - domain_var=3Ddns_search_domain_${i} - [ -n "${!domain_var}" ] || break - # Add as search domain, if it doesn't already exist - [[ "$search_domains" =3D~ (^| )${!domain_var}( |$) ]] \ - || search_domains+=3D"${!domain_var} " - i=3D$((i+1)) - done - - domain_var=3Ddns_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 -- To view, visit http://gerrit.openvpn.net/c/openvpn/+/1074?usp=3Demail To unsubscribe, or for help writing mail filters, visit http://gerrit.openv= pn.net/settings Gerrit-Project: openvpn Gerrit-Branch: master Gerrit-Change-Id: Id6f70237c7205063b001528a40391678b0d093ac Gerrit-Change-Number: 1074 Gerrit-PatchSet: 4 Gerrit-Owner: d12fk Gerrit-Reviewer: flichtenheld Gerrit-Reviewer: plaisthos Gerrit-CC: openvpn-devel Gerrit-MessageType: newpatchset --SniaG5E6UAg= Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable

cron2 uploaded patch set #4 to the change originally cr= eated by d12fk.

View Change

The following approvals got outdated an= d were removed: Code-Review+2 by flichtenheld

move macOS dns-updown common code into functi=
ons

Change-Id: Id6f70237c7205063b001528a40391678b0d093ac
Signed-o= ff-by: Heiko Hund <heiko@...2662...>
Acked-by: Frank Lichtenheld &= lt;frank@...2641...>
Message-Id: <20250711100853.242102-1-frank@...1186...= .2641...>
URL: https://www.mail-archive.com/openvpn-devel@...1011...= eforge.net/msg32105.html
Signed-off-by: Gert Doering <gert@...1296...= >
---
M distro/dns-scripts/macos-dns-updown.sh
1 file changed, = 40 insertions(+), 45 deletions(-)

git pull ssh://gerrit.openvpn.n=
et:29418/openvpn refs/changes/74/1074/4
diff --git a/distro/dns-scr=
ipts/macos-dns-updown.sh b/distro/dns-scripts/macos-dns-updown.shindex f0640ee..56f1009 100644
--- a/distro/dns-scrip= ts/macos-dns-updown.sh
+++ b/distro/dns-scripts/macos-dns-u= pdown.sh
@@ -104,7 +104,7 @@

n=3D$((n+1))
done
- return $n
+ echo $n
}
<= /span>
function get_search_domains {
@@ -157,41 += 157,23 @@
echo -e "${cmds}" | /usr/sbin/scut= il
}

-function set_dns {
- find_compat_profile
- local n=3D$?
-
+functio= n addresses_string {
= + local n=3D$1
local i=3D1
- local addrs=3D""
+ local addresses=3D""<= /span>
while :; do
local addr_var=3D= dns_server_${n}_address_${i}
local addr=3D"${= !addr_var}"
[ -n "$addr" ] || break=
-
- local port_var=3Ddns_server_${n}_p= ort_${i}
- if [ = -n "${!port_var}" ]; then
- if [[ "$addr" =3D~ : ]]; then- addr=3D"[$= addr]"
- = fi
- addrs= +=3D"${addr}:${!port_var}${sni} "
- else
- addrs+=3D"${addr}${sni} "
- fi

+ addresses+=3D"${addr} "
i=3D$((i+1))
done
+ echo "$addresses"

+}

- i=3D1
- local match_domains=3D"&quo= t;

- while :; do
- domain_var=3Ddns_= server_${n}_resolve_domain_${i}
- [ -n "${!domain_var}" ] || break
- # Add as match domain, if it= doesn't already exist

- [[ "$match_domains" =3D~ (^| )${!domain_var}( |$) ]]= \
- || matc= h_domains+=3D"${!domain_var} "
- i=3D$((i+1))
- done
-
- i=3D1=
+function search_domains_st= ring {
+ local n= =3D$1
+ local i=3D= 1
local search_domains=3D""
= while :; do
domain_var=3Ddns_search_domain_${= i}
@@ -201,11 +183,34 @@
|| se= arch_domains+=3D"${!domain_var} "
i=3D$(= (i+1))
done
+ echo "$search_domains"
+}
+
+functio= n match_domains_string {
+ local n=3D$1
+ local i=3D1
+ = local match_domains=3D""
+ while :; do
+ domain_var=3Ddns_server_${n}_resolve_domain_${i}
+ [ -n "${!dom= ain_var}" ] || break
+ # Add as match domain, if it doesn't already exist=
+ [[ "$match_do= mains" =3D~ (^| )${!domain_var}( |$) ]] \
+ || match_domains+=3D"${!domain_= var} "
+ = i=3D$((i+1))
+ don= e
+ echo "$ma= tch_domains"
+}<= /span>
+
+function set_dns {
+ local n=3D"$(find_compat_profil= e)"
+ local a= ddresses=3D"$(addresses_string $n)"
+ local search_domains=3D"$(search_domains= _string $n)"
+ = local match_domains=3D"$(match_domains_string $n)"

if [ -n "$match_domains" ]; then
local cmds=3D""
cmds= +=3D"d.init\n"
+ cmds+=3D"d.add S= erverAddresses * ${addresses}\n"
cmds+=3D&quo= t;d.add SupplementalMatchDomains * ${match_domains}\n"
cmds+=3D"d.add SupplementalMatchDomainsNoSearch # 1\n"<= /span>
cmds+=3D"add ${itf_dns_key}\n"@@ -222,7 +227,7 @@
cmds+=3D"get $(pri= mary_dns_key)\n"
cmds+=3D"set ${dns_back= up_key}\n"
cmds+=3D"d.init\n"

- cmds+=3D"d.add= ServerAddresses * ${addrs}\n"
+ cmds+=3D"d.add ServerAddresses * ${addresses}\= n"
cmds+=3D"d.add SearchDomains * ${sear= ch_domains}\n"
cmds+=3D"d.add SearchOrde= r # 5000\n"
cmds+=3D"set $(primary_dns_k= ey)\n"
@@ -233,22 +238,12 @@
}=

function unset_dns {
- find_compat_profile
- local n=3D$?
+ local n=3D"$(find_compat_profile)&quo= t;
+ local address= es=3D"$(addresses_string $n)"
+ local search_domains=3D"$(search_domains_strin= g $n)"
+ loca= l match_domains=3D"$(match_domains_string $n)"
<= /span>
- local i=3D1=
- local search_domains=3D&= quot;"
- while = :; do
- domain_v= ar=3Ddns_search_domain_${i}
- [ -n "${!domain_var}" ] || break
- # Add as search domain, if it do= esn't already exist
- [[ "$search_domains" =3D~ (^| )${!domain_var}( |$) ]] \=
- || search= _domains+=3D"${!domain_var} "
- i=3D$((i+1))
- done
-
- domain_var=3D= 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 "$sear= ch_domains"
else

To view, visit change 1074. To unsubscribe, or for help writing mail filter= s, visit settings.

<= meta itemprop=3D"name" content=3D"View Change"/>
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: Id6f70237c7205063b001528a403= 91678b0d093ac
Gerrit-Change-Number: 1074
Gerrit-PatchSet: 4
Gerrit-Owner: d12fk <heiko@...515...>
Gerrit-Reviewer: flichtenheld <frank@...2716...= 1...>
Gerrit-Reviewer: plaisthos <arne-openvpn@...1186...= .1227...>
Gerrit-CC: openvpn-devel <openvpn-devel@...1484...= ts.sourceforge.net>
Gerrit-MessageType: newpatchset
--SniaG5E6UAg=--