From: "cron2 (Code Review)" Date: Fri, 31 Jan 2025 19:11:26 +0000 In-Reply-To: References: Reply-To: gert@...1296..., arne-openvpn@...1227..., openvpn-devel@lists.sourceforge.net, frank@...2641..., lstipakov@...277..., a@...2181... Message-ID: <6b254c078cbcbef9622cea13d0b5aa8d344e130c-HTML@...2715...> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Disposition: inline Content-Type: multipart/alternative; boundary="iTd2bJPlnSQ="; charset=UTF-8 Subject: [Openvpn-devel] [XS] Change in openvpn[master]: mudp.c: keep offset value when resetting buffer List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: stipa Cc: flichtenheld , plaisthos , openvpn-devel --iTd2bJPlnSQ= Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable cron2 has submitted this change. ( http://gerrit.openvpn.net/c/openvpn/+/81= 4?usp=3Demail ) Change subject: mudp.c: keep offset value when resetting buffer ...................................................................... mudp.c: keep offset value when resetting buffer dco-win requires control packets to be prepended with sockaddr. For that, an offset value in buffer must be kept. Doing it always doesn't harm and makes code cleaner compared to adding "if (dco_win_server)" condition. Change-Id: I145573555aaace5e94774b5f977d032d3747ed72 Signed-off-by: Lev Stipakov Acked-by: Frank Lichtenheld Message-Id: <20250121161025.37545-1-frank@...2641...> URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg30= 519.html Signed-off-by: Gert Doering --- M src/openvpn/mudp.c 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/openvpn/mudp.c b/src/openvpn/mudp.c index 4f2bbd7..5f43db9 100644 --- a/src/openvpn/mudp.c +++ b/src/openvpn/mudp.c @@ -54,7 +54,9 @@ struct context *c =3D &m->top; - buf_reset_len(&c->c2.buffers->aux_buf); + /* dco-win server requires prepend with sockaddr, so preserve offset */ + ASSERT(buf_init(&c->c2.buffers->aux_buf, buf.offset)); + buf_copy(&c->c2.buffers->aux_buf, &buf); m->hmac_reply =3D c->c2.buffers->aux_buf; m->hmac_reply_dest =3D &m->top.c2.from; -- To view, visit http://gerrit.openvpn.net/c/openvpn/+/814?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: I145573555aaace5e94774b5f977d032d3747ed72 Gerrit-Change-Number: 814 Gerrit-PatchSet: 13 Gerrit-Owner: stipa Gerrit-Reviewer: flichtenheld Gerrit-Reviewer: ordex Gerrit-Reviewer: plaisthos Gerrit-CC: openvpn-devel Gerrit-MessageType: merged --iTd2bJPlnSQ= Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable

cron2 submitted this change.

View Change

mudp.c: keep offset value when resetting buffe=
r

dco-win requires control packets to be prepended
with sockaddr.= For that, an offset value in buffer
must be kept. Doing it always doesn= 't harm and makes
code cleaner compared to adding "if (dco_win_= server)"
condition.

Change-Id: I145573555aaace5e94774b5f977d= 032d3747ed72
Signed-off-by: Lev Stipakov <lev@...515...>
Acked-= by: Frank Lichtenheld <frank@...2641...>
Message-Id: <202501211= 61025.37545-1-frank@...2641...>
URL: https://www.mail-archive.com/ope= nvpn-devel@lists.sourceforge.net/msg30519.html
Signed-off-by: Gert Doeri= ng <gert@...1296...>
---
M src/openvpn/mudp.c
1 file changed= , 3 insertions(+), 1 deletion(-)

diff --git a/src/openvpn/mudp.c b/src/openvpn/mudp.c
ind= ex 4f2bbd7..5f43db9 100644
--- a/src/openvpn/mudp.c<= br>+++ b/src/openvpn/mudp.c
@@ -54,7 +54,9 @@<= br>
struct context *c =3D &m->top;

- buf_r= eset_len(&c->c2.buffers->aux_buf);
+ /* dco-win server requires prepend with sockad= dr, so preserve offset */
+ ASSERT(buf_init(&c->c2.buffers->aux_buf, buf.offset));<= /span>
+
= buf_copy(&c->c2.buffers->aux_buf, &buf);
= m->hmac_reply =3D c->c2.buffers->aux_buf;
= m->hmac_reply_dest =3D &m->top.c2.from;

To view, visit change 814. To unsubscribe, or for help writing mail f= ilters, visit settings.<= /p>

Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I145573555aaace5e94774b5f977= d032d3747ed72
Gerrit-Change-Number: 814
Gerrit-PatchSet: 13
Gerrit-Owner: stipa <lstipakov@...277...>= ;
Gerrit-Reviewer: flichtenheld <frank@...2716...= 1...>
Gerrit-Reviewer: ordex <a@...2181...>
Gerrit-Reviewer: plaisthos <arne-openvpn@...1186...= .1227...>
Gerrit-CC: openvpn-devel <openvpn-devel@...1484...= ts.sourceforge.net>
Gerrit-MessageType: merged
--iTd2bJPlnSQ=--