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/+/1264?usp=email
to review the following change.
Change subject: PUSH_UPDATE server: bug-fix, reset buffer after processing
......................................................................
PUSH_UPDATE server: bug-fix, reset buffer after processing
In the send_single_push_update() function the buffer containing
the message was not reset after processing, so o in a push-update-broad
the messages sent starting from the second client would have been
shrunk (offset advanced and size decreased).
Change-Id: I41d08a9a2e79ac1f1104e72dd5b7b7617e2071a0
Signed-off-by: Marco Baffo <[email protected]>
---
M src/openvpn/push_util.c
1 file changed, 6 insertions(+), 1 deletion(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/64/1264/1
diff --git a/src/openvpn/push_util.c b/src/openvpn/push_util.c
index 9138bdb..43f2cb3 100644
--- a/src/openvpn/push_util.c
+++ b/src/openvpn/push_util.c
@@ -171,8 +171,13 @@
* to check the return value here because we just want to `advance`,
* meaning we skip the `push_update_cmd' we added earlier.
*/
+ int original_size = msgs[i].len;
buf_string_compare_advance(&msgs[i], push_update_cmd);
- if (process_incoming_push_update(c, pull_permission_mask(c),
option_types_found, &msgs[i], true) == PUSH_MSG_ERROR)
+ int ret = process_incoming_push_update(c, pull_permission_mask(c),
option_types_found, &msgs[i], true);
+ /* We reset the processed buffer */
+ msgs[i].offset = 0;
+ msgs[i].len = original_size;
+ if (ret == PUSH_MSG_ERROR)
{
msg(M_WARN, "Failed to process push update message sent to client
ID: %u",
c->c2.tls_multi ? c->c2.tls_multi->peer_id : UINT32_MAX);
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/1264?usp=email
To unsubscribe, or for help writing mail filters, visit
http://gerrit.openvpn.net/settings?usp=email
Gerrit-MessageType: newchange
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I41d08a9a2e79ac1f1104e72dd5b7b7617e2071a0
Gerrit-Change-Number: 1264
Gerrit-PatchSet: 1
Gerrit-Owner: mrbff <[email protected]>
Gerrit-Reviewer: flichtenheld <[email protected]>
Gerrit-Reviewer: plaisthos <[email protected]>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]>
Gerrit-Attention: flichtenheld <[email protected]>
_______________________________________________
Openvpn-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openvpn-devel
