From: "d12fk (Code Review)" Date: Wed, 24 Jul 2024 14:14:37 +0000 References: Reply-To: heiko@...515..., arne-openvpn@...1227..., openvpn-devel@lists.sourceforge.net, frank@...2641... Message-ID: <1f7a7eb17635cc300a54855f2a1b8aa86256e5d3-HTML@...2715...> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Disposition: inline Content-Type: multipart/alternative; boundary="OBaUkthJHJA="; charset=UTF-8 Subject: [Openvpn-devel] [XS] Change in openvpn[master]: add and send IV_PROTO_DNS_OPTION_V2 flag List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: plaisthos , flichtenheld Cc: openvpn-devel --OBaUkthJHJA= 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/+/680?usp=3Demail to review the following change. Change subject: add and send IV_PROTO_DNS_OPTION_V2 flag ...................................................................... add and send IV_PROTO_DNS_OPTION_V2 flag Incompatible changes to the --dns server address and --dns server exclude-domains options were introduced after the code for handling them was released. Add and send a new IV_PROTO flag, so servers which act on the flags set can differentiate between clients which have implemented --dns and those which just support the new option. This enables them to decide which variant of options to send to the client. Change-Id: I975057c20c1457ef88111f8d142ca3fd2039d5ff Signed-off-by: Heiko Hund --- M src/openvpn/ssl.c M src/openvpn/ssl.h 2 files changed, 6 insertions(+), 3 deletions(-) git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/80/680/1 diff --git a/src/openvpn/ssl.c b/src/openvpn/ssl.c index e0e9591..14c38cf 100644 --- a/src/openvpn/ssl.c +++ b/src/openvpn/ssl.c @@ -1900,8 +1900,8 @@ /* support for P_DATA_V2 */ int iv_proto =3D IV_PROTO_DATA_V2; - /* support for the --dns option */ - iv_proto |=3D IV_PROTO_DNS_OPTION; + /* support for the latest --dns option */ + iv_proto |=3D IV_PROTO_DNS_OPTION_V2; /* support for exit notify via control channel */ iv_proto |=3D IV_PROTO_CC_EXIT_NOTIFY; diff --git a/src/openvpn/ssl.h b/src/openvpn/ssl.h index 1a45048..6c2bfc3 100644 --- a/src/openvpn/ssl.h +++ b/src/openvpn/ssl.h @@ -94,7 +94,7 @@ * result. */ #define IV_PROTO_NCP_P2P (1<<5) -/** Supports the --dns option introduced in version 2.6 */ +/** Supports the --dns option introduced in version 2.6. Not sent anymore.= */ #define IV_PROTO_DNS_OPTION (1<<6) /** Support for explicit exit notify via control channel @@ -107,6 +107,9 @@ /** Support to dynamic tls-crypt (renegotiation with TLS-EKM derived tls-c= rypt key) */ #define IV_PROTO_DYN_TLS_CRYPT (1<<9) +/** Supports the --dns option after all the incompatible changes */ +#define IV_PROTO_DNS_OPTION_V2 (1<<11) + /* Default field in X509 to be username */ #define X509_USERNAME_FIELD_DEFAULT "CN" -- To view, visit http://gerrit.openvpn.net/c/openvpn/+/680?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: I975057c20c1457ef88111f8d142ca3fd2039d5ff Gerrit-Change-Number: 680 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 --OBaUkthJHJA= 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.

Vi= ew Change

add and send IV_PROTO_DNS_OPTION_V2 flag

Incompatible = changes to the --dns server address and --dns server
exclude-domains opt= ions were introduced after the code for handling them
was released. Add = and send a new IV_PROTO flag, so servers which act on
the flags set can = differentiate between clients which have implemented
--dns and those whi= ch just support the new option. This enables them to
decide which varian= t of options to send to the client.

Change-Id: I975057c20c1457ef8811= 1f8d142ca3fd2039d5ff
Signed-off-by: Heiko Hund <heiko@...2662...><= br>---
M src/openvpn/ssl.c
M src/openvpn/ssl.h
2 files changed, 6 = insertions(+), 3 deletions(-)

git pull ssh://gerrit.openvpn.net:2=
9418/openvpn refs/changes/80/680/1
diff --git a/src/openvpn/ssl.c b=
/src/openvpn/ssl.c
index e0e9591..14c38cf 100644
= --- a/src/openvpn/ssl.c
+++ b/src/openvpn/ssl.c
@@ -1900,8 +1900,8 @@
/* support for P_= DATA_V2 */
int iv_proto =3D IV_PROTO_DATA_V2;

- = /* support for the --dns option */
- iv_proto |=3D IV_PROTO_DNS_OPTION;
+ /* support for the latest --dns= option */
+ i= v_proto |=3D IV_PROTO_DNS_OPTION_V2;

= /* support for exit notify via control channel */
= iv_proto |=3D IV_PROTO_CC_EXIT_NOTIFY;
diff --git a/sr= c/openvpn/ssl.h b/src/openvpn/ssl.h
index 1a45048..6c2bfc3 = 100644
--- a/src/openvpn/ssl.h
+++ b/src/op= envpn/ssl.h
@@ -94,7 +94,7 @@
* result. *= /
#define IV_PROTO_NCP_P2P (1<<5)
=
-/** Supports t= he --dns option introduced in version 2.6 */
+/** Supports the --dns option introduced in versio= n 2.6. Not sent anymore. */
#define IV_PROTO_DNS_OPTION = (1<<6)

/** Support for explicit= exit notify via control channel
@@ -107,6 +107,9 @@=
/** Support to dynamic tls-crypt (renegotiation with TLS-EKM der= ived tls-crypt key) */
#define IV_PROTO_DYN_TLS_CRYPT (1= <<9)

+/** Supports the --dns option after all the incompatible changes *= /
+#define IV_PROTO_D= NS_OPTION_V2 (1<<11)
+
/* Default field in X509 to be username */
#define X509_USERNAME_FIELD_DEFAULT "CN"


To view, visit change 680. To unsubscr= ibe, or for help writing mail filters, visit settings.

Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I975057c20c1457ef88111f8d142= ca3fd2039d5ff
Gerrit-Change-Number: 680
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
--OBaUkthJHJA=--