From: "cron2 (Code Review)" Date: Tue, 15 Jul 2025 11:22:53 +0000 In-Reply-To: References: Reply-To: gert@...1296..., arne-openvpn@...1227..., heiko@...515..., openvpn-devel@lists.sourceforge.net, frank@...2641... Message-ID: <13baba59d8156b339405e7e3d11c71fcf58a7c2b-HTML@...2715...> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Disposition: inline Content-Type: multipart/alternative; boundary="THt47OLa0UU="; 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 Cc: flichtenheld , plaisthos , openvpn-devel --THt47OLa0UU= Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable cron2 has submitted this change. ( http://gerrit.openvpn.net/c/openvpn/+/10= 74?usp=3Demail ) 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(-) 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: merged --THt47OLa0UU= Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable

cron2 submitted this change.

View Change

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(-)

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 @@<= /span>

n=3D$((n+1))
= done
- return $n
+ echo $n }

function get_search_domains {<= /span>
@@ -157,41 +157,23 @@
echo -e "${= cmds}" | /usr/sbin/scutil
}
<= br>-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
<= span> local addr_var=3Ddns_server_${n}_address_${i}

local addr=3D"${!addr_var}"

[ = -n "$addr" ] || break
-
- loc= al port_var=3Ddns_server_${n}_port_${i}
- if [ -n "${!port_var}" ]; then- if [[ "$addr&= quot; =3D~ : ]]; then
-= addr=3D"[$addr]"
- fi
- addrs+=3D"${addr}:${!port_var}${sni} "<= /span>
- else- addrs+=3D"${ad= dr}${sni} "
- = fi
+ addres= ses+=3D"${addr} "
i=3D$((i+1)) done
+ = echo "$addresses"
+}

- i=3D1
- l= ocal match_domains=3D""
- while :; do
- domain_var=3Ddns_server_${n}_resolve_domain_${i}
- [ -n "${!domain_var}&= quot; ] || 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
d= omain_var=3Ddns_search_domain_${i}
@@ -201,11 +183,34 @@
|| search_domains+=3D"${!domain_var} "=
i=3D$((i+1))
done
= + echo "$search_domains= "
+}
<= span style=3D"color: hsl(120, 100%, 40%);">+

+function match_domains_string {
+ local n=3D$1
+ local i=3D1
+ local match_domains=3D""=
+ while :; do
= + domain_var=3Ddns_serve= r_${n}_resolve_domain_${i}
+ [ -n "${!domain_var}" ] || break
+ # Add as match domain, if it = doesn't already exist
+ [[ "$match_domains" =3D~ (^| )${!domain_var}( |$) ]= ] \
+ || m= atch_domains+=3D"${!domain_var} "
+ i=3D$((i+1))
+ done
+ echo "$match_domains"
+}
+
+functio= n set_dns {
+ loca= l n=3D"$(find_compat_profile)"
+ local addresses=3D"$(addresses_string $n)&quo= t;
+ local search_= domains=3D"$(search_domains_string $n)"
+ local match_domains=3D"$(match_domai= ns_string $n)"

if [ -n "$m= atch_domains" ]; then
local cmds=3D"&quo= t;
cmds+=3D"d.init\n"
- cmds+=3D"d.add ServerAddres= ses * ${addrs}\n"
- cmds+=3D"d.add ServerAddresses * ${addrs}\n"<= br>+ cmds+=3D"d.add= ServerAddresses * ${addresses}\n"
cmds+=3D&q= uot;d.add SearchDomains * ${search_domains}\n"
= cmds+=3D"d.add SearchOrder # 5000\n"
c= mds+=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_domain= s=3D"$(search_domains_string $n)"
+ local match_domains=3D"$(match_domains_str= ing $n)"

- local i=3D1
- local search_domains=3D""
- while :; do
- domain_var=3Ddns_search_domain_${i}
- [ -n "${!domain_var}&quo= t; ] || 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_va= r}" ]; then
+ = if [ -n "$match_domains" ]; then
echo &= quot;remove ${itf_dns_key}" | /usr/sbin/scutil
= unset_search_domains "$search_domains"
els= e

To view, visit change 1074. To unsubscrib= e, or for help writing mail filters, visit settings.

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: merged
--THt47OLa0UU=--