From: "stipa (Code Review)" Date: Thu, 21 Nov 2024 18:07:55 +0000 References: Reply-To: lstipakov@...277..., arne-openvpn@...1227..., openvpn-devel@lists.sourceforge.net, frank@...2641... Message-ID: <241103e957af68f399f7e150e8f6c8674c67d951-HTML@...2715...> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Disposition: inline Content-Type: multipart/alternative; boundary="I7zgNQqG3Tw="; charset=UTF-8 Subject: [Openvpn-devel] [XS] Change in openvpn[master]: mudp.c: keep offset value when reset buffer List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: plaisthos , flichtenheld Cc: openvpn-devel --I7zgNQqG3Tw= 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/+/814?usp=3Demail to review the following change. Change subject: mudp.c: keep offset value when reset buffer ...................................................................... mudp.c: keep offset value when reset 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 --- M src/openvpn/mudp.c 1 file changed, 3 insertions(+), 1 deletion(-) git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/14/814/1 diff --git a/src/openvpn/mudp.c b/src/openvpn/mudp.c index 5fbd7b0..d8e3d69 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 requres prepend with sockaddr, so preserve offset */ + 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: 1 Gerrit-Owner: stipa Gerrit-Reviewer: flichtenheld Gerrit-Reviewer: plaisthos Gerrit-CC: openvpn-devel Gerrit-Attention: plaisthos Gerrit-Attention: flichtenheld Gerrit-MessageType: newchange --I7zgNQqG3Tw= Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable

Attention is currently required from: flichtenheld, plaisthos.

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

Vi= ew Change

mudp.c: keep offset value when reset buffer

dco-win re= quires control packets to be prepended
with sockaddr. For that, an offse= t value in buffer
must be kept. Doing it always doesn't harm and mak= es
code cleaner compared to adding "if (dco_win_server)"
co= ndition.

Change-Id: I145573555aaace5e94774b5f977d032d3747ed72
Sig= ned-off-by: Lev Stipakov <lev@...515...>
---
M src/openvpn/mudp= .c
1 file changed, 3 insertions(+), 1 deletion(-)

git pull ssh=
://gerrit.openvpn.net:29418/openvpn refs/changes/14/814/1
diff --=
git a/src/openvpn/mudp.c b/src/openvpn/mudp.c
index 5fbd7b0= ..d8e3d69 100644
--- a/src/openvpn/mudp.c
+= ++ b/src/openvpn/mudp.c
@@ -54,7 +54,9 @@
=
struct context *c =3D &m->top;

- buf_reset_len(&= amp;c->c2.buffers->aux_buf);
+ /* dco-win server requres prepend with sockaddr, so pres= erve offset */
+ b= uf_init(&c->c2.buffers->aux_buf, buf.offset);
+
buf_copy(&c-&= gt;c2.buffers->aux_buf, &buf);
m->hmac_reply= =3D c->c2.buffers->aux_buf;
m->hmac_reply_de= st =3D &m->top.c2.from;

To view,= visit ch= ange 814. To unsubscribe, or for help writing mail filters, visit settings.

Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I145573555aaace5e94774b5f977= d032d3747ed72
Gerrit-Change-Number: 814
Gerrit-PatchSet: 1
Gerrit-Owner: stipa <lstipakov@...277...>= ;
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
--I7zgNQqG3Tw=--