Attention is currently required from: flichtenheld, plaisthos.
Hello flichtenheld, plaisthos,
I'd like you to reexamine a change. Please visit
http://gerrit.openvpn.net/c/openvpn/+/814?usp=email
to look at the new patch set (#2).
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 <l...@openvpn.net>
---
M src/openvpn/mudp.c
1 file changed, 3 insertions(+), 1 deletion(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/14/814/2
diff --git a/src/openvpn/mudp.c b/src/openvpn/mudp.c
index 5fbd7b0..bba34ef 100644
--- a/src/openvpn/mudp.c
+++ b/src/openvpn/mudp.c
@@ -54,7 +54,9 @@
struct context *c = &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 = c->c2.buffers->aux_buf;
m->hmac_reply_dest = &m->top.c2.from;
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/814?usp=email
To unsubscribe, or for help writing mail filters, visit
http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I145573555aaace5e94774b5f977d032d3747ed72
Gerrit-Change-Number: 814
Gerrit-PatchSet: 2
Gerrit-Owner: stipa <lstipa...@gmail.com>
Gerrit-Reviewer: flichtenheld <fr...@lichtenheld.com>
Gerrit-Reviewer: plaisthos <arne-open...@rfc2549.org>
Gerrit-CC: openvpn-devel <openvpn-devel@lists.sourceforge.net>
Gerrit-Attention: plaisthos <arne-open...@rfc2549.org>
Gerrit-Attention: flichtenheld <fr...@lichtenheld.com>
Gerrit-MessageType: newpatchset
_______________________________________________
Openvpn-devel mailing list
Openvpn-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openvpn-devel
