From: "d12fk (Code Review)" Date: Thu, 3 Jul 2025 03:56:26 +0000 References: Reply-To: heiko@...515..., arne-openvpn@...1227..., openvpn-devel@lists.sourceforge.net, frank@...2641... Message-ID: <95dbe4615bbbf5b9fc8e2968a9239ec11eeb561c-HTML@...2715...> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Disposition: inline Content-Type: multipart/alternative; boundary="YnfBVMPsuSk="; 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: plaisthos , flichtenheld Cc: openvpn-devel --YnfBVMPsuSk= Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Attention is currently required from: flichtenheld, plaisthos. Hello plaisthos, flichtenheld, I'd like you to do a code review. Please visit http://gerrit.openvpn.net/c/openvpn/+/1074?usp=3Demail to review the following change. 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 --- 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/1 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: 1 Gerrit-Owner: d12fk Gerrit-Reviewer: flichtenheld Gerrit-Reviewer: plaisthos Gerrit-CC: openvpn-devel Gerrit-Attention: plaisthos Gerrit-Attention: flichtenheld Gerrit-MessageType: newchange --YnfBVMPsuSk= Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable

Attention is currently required from: flichtenheld, plaisthos.

d12fk would like plaisthos and flichtenheld to review t= his change.

V= iew Change

move macOS dns-updown common code into functions

Chan= ge-Id: Id6f70237c7205063b001528a40391678b0d093ac
Signed-off-by: Heiko Hu= nd <heiko@...2662...>
---
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/1
diff=
 --git a/distro/dns-scripts/macos-dns-updown.sh b/distro/dns-scripts/macos-=
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 @@<= br>
n=3D$((n+1))
done<= /span>
- return $n+ echo $n
= }

function get_search_domains {<= br>@@ -157,41 +157,23 @@
echo -e "${cmds}&q= uot; | /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"&= quot;
+ local addr= esses=3D""
while :; do
= local addr_var=3Ddns_server_${n}_address_${i}
= local addr=3D"${!addr_var}"
[ -n "$= addr" ] || break
-=
- local port_va= r=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&qu= ot;${addr} "
i=3D$((i+1))
= done
+ echo &quo= t;$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}( |$) ]] \
- i=3D$((i+1))
- done

-
- i=3D1
+func= tion search_domains_string {
+ local n=3D$1
+ local i=3D1
local search_domains=3D"&qu= ot;
while :; do
domain_var=3D= dns_search_domain_${i}
@@ -201,11 +183,34 @@
|| search_domains+=3D"${!domain_var} "

<= span> 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}_res= olve_domain_${i}
+ = [ -n "${!domain_var}" ] || break
+ # Add as match domain, if it doesn'= t already exist
+ = [[ "$match_domains" =3D~ (^| )${!domain_var}( |$) ]] \=
+ || match_domai= ns+=3D"${!domain_var} "
+ i=3D$((i+1))
+ done
+ echo "$match_domains"
+}
+
+function set_dns = {
+ local n=3D&quo= t;$(find_compat_profile)"
+ local addresses=3D"$(addresses_string $n)"<= br>+ local search_domains=3D= "$(search_domains_string $n)"
+ local match_domains=3D"$(match_domains_string = $n)"

if [ -n "$match_domai= ns" ]; then
local cmds=3D""<= br> cmds+=3D"d.init\n"
- cmds+=3D"d.add ServerAddresses * ${ad= drs}\n"
+ = cmds+=3D"d.add ServerAddresses * ${addresses}\n"
cmds+=3D"d.add SupplementalMatchDomains * ${match_domains}\n= "

cmds+=3D"d.add SupplementalMatchDomain= sNoSearch # 1\n"
cmds+=3D"add ${itf_dns_= key}\n"
@@ -222,7 +227,7 @@
c= mds+=3D"get $(primary_dns_key)\n"
cmds+= =3D"set ${dns_backup_key}\n"
cmds+=3D&qu= ot;d.init\n"
- = cmds+=3D"d.add ServerAddresses * ${addrs}\n"
+ cmds+=3D"d.add ServerAd= dresses * ${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 @@<= /span>
}

function unset_dns {<= /span>
- find_compat_profil= e
- local n=3D$?
+ local n=3D"$(f= ind_compat_profile)"
+ local addresses=3D"$(addresses_string $n)"
+ local search_domains=3D"= ;$(search_domains_string $n)"

+ local match_domains=3D"$(match_domains_string $n)&q= uot;

= - local i=3D1
- l= ocal search_domains=3D""
- while :; do
- domain_var=3Ddns_search_domain_${i}
- [ -n "${!domain_var}" ] || b= reak
- # 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 &q= uot;$match_domains" ]; then
echo "remove= ${itf_dns_key}" | /usr/sbin/scutil
unset_sea= rch_domains "$search_domains"
else

To view, visit change 1074. To unsubscribe, or for h= elp writing mail filters, visit settings.

=
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: Id6f70237c7205063b001528a403= 91678b0d093ac
Gerrit-Change-Number: 1074
Gerrit-PatchSet: 1
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-Attention: plaisthos <arne-openvpn@...220...= ..1227...>
Gerrit-Attention: flichtenheld <frank@...2375...= 41...>
Gerrit-MessageType: newchange
--YnfBVMPsuSk=--