Change in openvpn[master]: mudp: extract send_standalone_reply() helper
A message that is not in the archive (sent off-list or not yet received): gerrit.1782719911000.Ic75ca2ee9b59a4e11f37cd9653df268bba33889c@gerrit.openvpn.net
Attention is currently required from: plaisthos.
Hello plaisthos,
I'd like you to do a code review.
Please visit
http://gerrit.openvpn.net/c/openvpn/+/1743?usp=email
to review the following change.
Change subject: mudp: extract send_standalone_reply() helper
......................................................................
mudp: extract send_standalone_reply() helper
Factor the synchronous, stateless "send a standalone control packet back to the peer that just contacted us" sequence out of send_hmac_reset_packet() into a reusable helper. No behavioural change.
This lets a following commit reuse it for the out-of-band probe reply instead of duplicating the aux_buf / to_link / process_outgoing_link sequence.
---
M src/openvpn/mudp.c
1 file changed, 34 insertions(+), 23 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/43/1743/1
src/openvpn/mudp.c +34 -23
@@ -37,6 +37,38 @@#include <sys/inotify.h> #endif +/* Send an already-built standalone control packet back to the peer that just +* contacted us (c2.from), synchronously and without keeping any state. +* +* We do not want to keep state for a reply to an initial/out-of-band packet, so +* we send it without queueing. If we hit EAGAIN on a busy socket the packet is +* lost and the client simply retries -- an acceptable compromise that avoids +* consuming server resources under attack. +* +* @param buf the packet to send (built by a tls_*_standalone() helper) +* @param prefix msg() prefix to set for the duration of the send +* @param detail D_MULTI_DEBUG message describing the reply +*/ +static void +send_standalone_reply (struct multi_context *m,struct buffer *buf,const char *prefix, +const char *detail,struct link_socket *sock) +{ +struct context *c = &m->top; + +/* 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); + +msg_set_prefix (prefix); + c->c2.to_link = c->c2.buffers->aux_buf; + c->c2.to_link_addr = &c->c2.from; +msg (D_MULTI_DEBUG ,"%s" , detail); +process_outgoing_link (c, sock); + c->c2.to_link.len =0 ; + c->c2.to_link_addr =NULL ; +msg_set_prefix (NULL ); +} + static void send_hmac_reset_packet(struct multi_context *m, struct tls_pre_decrypt_state *state, struct tls_auth_standalone *tas, struct session_id *sid,
@@ -48,29 +80,8 @@struct buffer buf =tls_reset_standalone (&state->tls_wrap_tmp, tas, sid, &state->peer_session_id, header, request_resend_wkc); -struct context *c = &m->top; - -/* 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); - -/* -* We do not want to keep any state here, so we send the reply to the -* initial packet synchronously without queueing anything. -* -* If we hit EAGAIN on a busy socket, the packet will be lost and the -* client will have to retransmit its HARD_RESET. This is considered an -* acceptable compromise to avoid consuming server resources under attack. -*/ -msg_set_prefix ("Connection Attempt" ); - c->c2.to_link = c->c2.buffers->aux_buf; - c->c2.to_link_addr = &c->c2.from; -msg (D_MULTI_DEBUG ,"Reset packet from client, sending HMAC based reset challenge" ); -process_outgoing_link (c, sock); - c->c2.to_link.len =0 ; - c->c2.to_link_addr =NULL ; -msg_set_prefix (NULL ); +send_standalone_reply (m, &buf,"Connection Attempt" , +"Reset packet from client, sending HMAC based reset challenge" , sock); }
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/1743?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: Ic75ca2ee9b59a4e11f37cd9653df268bba33889c
Gerrit-Change-Number: 1743
Gerrit-PatchSet: 1
Gerrit-Owner: stipa <[email protected]>
Gerrit-Reviewer: plaisthos <[email protected]>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]>
_______________________________________________
Openvpn-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openvpn-devel
Attention is currently required from: plaisthos, stipa.
flichtenheld has posted comments on this change by stipa. ( http://gerrit.openvpn.net/c/openvpn/+/1743?usp=email )
Change subject: mudp: extract send_standalone_reply() helper
......................................................................
Patch Set 3: Code-Review-1
(1 comment)
File src/openvpn/mudp.c:
http://gerrit.openvpn.net/c/openvpn/+/1743/comment/f40916a5_183437f1?usp=email :
PS3, Line 40: /* Send an already-built standalone control packet back to the peer that just Mark as doxygen
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/1743?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings?usp=email
Gerrit-MessageType: comment
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: Ic75ca2ee9b59a4e11f37cd9653df268bba33889c
Gerrit-Change-Number: 1743
Gerrit-PatchSet: 3
Gerrit-Owner: stipa <[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: stipa <[email protected]>
Gerrit-Comment-Date: Thu, 09 Jul 2026 09:51:43 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
_______________________________________________
Openvpn-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openvpn-devel
Attention is currently required from: flichtenheld, plaisthos.
stipa has posted comments on this change by stipa. ( http://gerrit.openvpn.net/c/openvpn/+/1743?usp=email )
Change subject: mudp: extract send_standalone_reply() helper
......................................................................
Patch Set 4:
(1 comment)
File src/openvpn/mudp.c:
http://gerrit.openvpn.net/c/openvpn/+/1743/comment/6afc6e98_2b1d76f1?usp=email :
PS3, Line 40: /* Send an already-built standalone control packet back to the peer that just
Quoted 1 line
Mark as doxygen
done
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/1743?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings?usp=email
Gerrit-MessageType: comment
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: Ic75ca2ee9b59a4e11f37cd9653df268bba33889c
Gerrit-Change-Number: 1743
Gerrit-PatchSet: 4
Gerrit-Owner: stipa <[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]>
Gerrit-Comment-Date: Thu, 09 Jul 2026 13:49:37 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: flichtenheld <[email protected]>
_______________________________________________
Openvpn-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openvpn-devel
Attention is currently required from: flichtenheld, plaisthos, stipa.
Hello flichtenheld, plaisthos,
I'd like you to reexamine a change. Please visit
http://gerrit.openvpn.net/c/openvpn/+/1743?usp=email
to look at the new patch set (#4).
The following approvals got outdated and were removed:
Code-Review-1 by flichtenheld
Change subject: mudp: extract send_standalone_reply() helper
......................................................................
mudp: extract send_standalone_reply() helper
Factor the synchronous, stateless "send a standalone control packet back to the peer that just contacted us" sequence out of send_hmac_reset_packet() into a reusable helper. No behavioural change.
This lets a following commit reuse it for the out-of-band probe reply instead of duplicating the aux_buf / to_link / process_outgoing_link sequence.
---
M src/openvpn/mudp.c
1 file changed, 37 insertions(+), 23 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/43/1743/4
src/openvpn/mudp.c +37 -23
@@ -37,6 +37,41 @@#include <sys/inotify.h> #endif +/** +* Send an already-built standalone control packet back to the peer that just +* contacted us (c2.from), synchronously and without keeping any state. +* +* We do not want to keep state for a reply to an initial/out-of-band packet, so +* we send it without queueing. If we hit EAGAIN on a busy socket the packet is +* lost and the client simply retries -- an acceptable compromise that avoids +* consuming server resources under attack. +* +* @param m the server's multi_context +* @param buf the packet to send (built by a tls_*_standalone() helper) +* @param prefix msg() prefix to set for the duration of the send +* @param detail D_MULTI_DEBUG message describing the reply +* @param sock the socket to send the reply on +*/ +static void +send_standalone_reply (struct multi_context *m,struct buffer *buf,const char *prefix, +const char *detail,struct link_socket *sock) +{ +struct context *c = &m->top; + +/* 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); + +msg_set_prefix (prefix); + c->c2.to_link = c->c2.buffers->aux_buf; + c->c2.to_link_addr = &c->c2.from; +msg (D_MULTI_DEBUG ,"%s" , detail); +process_outgoing_link (c, sock); + c->c2.to_link.len =0 ; + c->c2.to_link_addr =NULL ; +msg_set_prefix (NULL ); +} + static void send_hmac_reset_packet(struct multi_context *m, struct tls_pre_decrypt_state *state, struct tls_auth_standalone *tas, struct session_id *sid,
@@ -48,29 +83,8 @@struct buffer buf =tls_reset_standalone (&state->tls_wrap_tmp, tas, sid, &state->peer_session_id, header, request_resend_wkc); -struct context *c = &m->top; - -/* 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); - -/* -* We do not want to keep any state here, so we send the reply to the -* initial packet synchronously without queueing anything. -* -* If we hit EAGAIN on a busy socket, the packet will be lost and the -* client will have to retransmit its HARD_RESET. This is considered an -* acceptable compromise to avoid consuming server resources under attack. -*/ -msg_set_prefix ("Connection Attempt" ); - c->c2.to_link = c->c2.buffers->aux_buf; - c->c2.to_link_addr = &c->c2.from; -msg (D_MULTI_DEBUG ,"Reset packet from client, sending HMAC based reset challenge" ); -process_outgoing_link (c, sock); - c->c2.to_link.len =0 ; - c->c2.to_link_addr =NULL ; -msg_set_prefix (NULL ); +send_standalone_reply (m, &buf,"Connection Attempt" , +"Reset packet from client, sending HMAC based reset challenge" , sock); }
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/1743?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings?usp=email
Gerrit-MessageType: newpatchset
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: Ic75ca2ee9b59a4e11f37cd9653df268bba33889c
Gerrit-Change-Number: 1743
Gerrit-PatchSet: 4
Gerrit-Owner: stipa <[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]>
Gerrit-Attention: stipa <[email protected]>
_______________________________________________
Openvpn-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openvpn-devel
Attention is currently required from: plaisthos, stipa.
flichtenheld has posted comments on this change by stipa. ( http://gerrit.openvpn.net/c/openvpn/+/1743?usp=email )
Change subject: mudp: extract send_standalone_reply() helper
......................................................................
Patch Set 7: Code-Review+2
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/1743?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings?usp=email
Gerrit-MessageType: comment
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: Ic75ca2ee9b59a4e11f37cd9653df268bba33889c
Gerrit-Change-Number: 1743
Gerrit-PatchSet: 7
Gerrit-Owner: stipa <[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: stipa <[email protected]>
Gerrit-Comment-Date: Mon, 20 Jul 2026 13:50:19 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
_______________________________________________
Openvpn-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openvpn-devel
Attention is currently required from: plaisthos, stipa.
Hello flichtenheld, plaisthos,
I'd like you to reexamine a change. Please visit
http://gerrit.openvpn.net/c/openvpn/+/1743?usp=email
to look at the new patch set (#8).
The change is no longer submittable: checks~ChecksSubmitRule is unsatisfied now.
Change subject: mudp: extract send_standalone_reply() helper
......................................................................
mudp: extract send_standalone_reply() helper
Factor the synchronous, stateless "send a standalone control packet back to the peer that just contacted us" sequence out of send_hmac_reset_packet() into a reusable helper. No behavioural change.
This lets a following commit reuse it for the out-of-band probe reply instead of duplicating the aux_buf / to_link / process_outgoing_link sequence.
---
M src/openvpn/mudp.c
1 file changed, 37 insertions(+), 23 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/43/1743/8
src/openvpn/mudp.c +37 -23
@@ -37,6 +37,41 @@#include <sys/inotify.h> #endif +/** +* Send an already-built standalone control packet back to the peer that just +* contacted us (c2.from), synchronously and without keeping any state. +* +* We do not want to keep state for a reply to an initial/out-of-band packet, so +* we send it without queueing. If we hit EAGAIN on a busy socket the packet is +* lost and the client simply retries -- an acceptable compromise that avoids +* consuming server resources under attack. +* +* @param m the server's multi_context +* @param buf the packet to send (built by a tls_*_standalone() helper) +* @param prefix msg() prefix to set for the duration of the send +* @param detail D_MULTI_DEBUG message describing the reply +* @param sock the socket to send the reply on +*/ +static void +send_standalone_reply (struct multi_context *m,struct buffer *buf,const char *prefix, +const char *detail,struct link_socket *sock) +{ +struct context *c = &m->top; + +/* 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); + +msg_set_prefix (prefix); + c->c2.to_link = c->c2.buffers->aux_buf; + c->c2.to_link_addr = &c->c2.from; +msg (D_MULTI_DEBUG ,"%s" , detail); +process_outgoing_link (c, sock); + c->c2.to_link.len =0 ; + c->c2.to_link_addr =NULL ; +msg_set_prefix (NULL ); +} + static void send_hmac_reset_packet(struct multi_context *m, struct tls_pre_decrypt_state *state, struct tls_auth_standalone *tas, struct session_id *sid,
@@ -48,29 +83,8 @@struct buffer buf =tls_reset_standalone (&state->tls_wrap_tmp, tas, sid, &state->peer_session_id, header, request_resend_wkc); -struct context *c = &m->top; - -/* 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); - -/* -* We do not want to keep any state here, so we send the reply to the -* initial packet synchronously without queueing anything. -* -* If we hit EAGAIN on a busy socket, the packet will be lost and the -* client will have to retransmit its HARD_RESET. This is considered an -* acceptable compromise to avoid consuming server resources under attack. -*/ -msg_set_prefix ("Connection Attempt" ); - c->c2.to_link = c->c2.buffers->aux_buf; - c->c2.to_link_addr = &c->c2.from; -msg (D_MULTI_DEBUG ,"Reset packet from client, sending HMAC based reset challenge" ); -process_outgoing_link (c, sock); - c->c2.to_link.len =0 ; - c->c2.to_link_addr =NULL ; -msg_set_prefix (NULL ); +send_standalone_reply (m, &buf,"Connection Attempt" , +"Reset packet from client, sending HMAC based reset challenge" , sock); }
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/1743?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings?usp=email
Gerrit-MessageType: newpatchset
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: Ic75ca2ee9b59a4e11f37cd9653df268bba33889c
Gerrit-Change-Number: 1743
Gerrit-PatchSet: 8
Gerrit-Owner: stipa <[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: stipa <[email protected]>
_______________________________________________
Openvpn-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openvpn-devel
Attention is currently required from: plaisthos, stipa.
ordex has posted comments on this change by stipa. ( http://gerrit.openvpn.net/c/openvpn/+/1743?usp=email )
Change subject: mudp: extract send_standalone_reply() helper
......................................................................
Patch Set 8: Code-Review+2
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/1743?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings?usp=email
Gerrit-MessageType: comment
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: Ic75ca2ee9b59a4e11f37cd9653df268bba33889c
Gerrit-Change-Number: 1743
Gerrit-PatchSet: 8
Gerrit-Owner: stipa <[email protected]>
Gerrit-Reviewer: flichtenheld <[email protected]>
Gerrit-Reviewer: ordex <[email protected]>
Gerrit-Reviewer: plaisthos <[email protected]>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]>
Gerrit-Attention: stipa <[email protected]>
Gerrit-Comment-Date: Wed, 22 Jul 2026 20:18:27 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
_______________________________________________
Openvpn-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openvpn-devel
Attention is currently required from: plaisthos, stipa.
Hello flichtenheld, ordex, plaisthos,
I'd like you to reexamine a change. Please visit
http://gerrit.openvpn.net/c/openvpn/+/1743?usp=email
to look at the new patch set (#9).
The change is no longer submittable: checks~ChecksSubmitRule is unsatisfied now.
Change subject: mudp: extract send_standalone_reply() helper
......................................................................
mudp: extract send_standalone_reply() helper
Factor the synchronous, stateless "send a standalone control packet back to the peer that just contacted us" sequence out of send_hmac_reset_packet() into a reusable helper. No behavioural change.
This lets a following commit reuse it for the out-of-band probe reply instead of duplicating the aux_buf / to_link / process_outgoing_link sequence.
---
M src/openvpn/mudp.c
1 file changed, 37 insertions(+), 23 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/43/1743/9
src/openvpn/mudp.c +37 -23
@@ -37,6 +37,41 @@#include <sys/inotify.h> #endif +/** +* Send an already-built standalone control packet back to the peer that just +* contacted us (c2.from), synchronously and without keeping any state. +* +* We do not want to keep state for a reply to an initial/out-of-band packet, so +* we send it without queueing. If we hit EAGAIN on a busy socket the packet is +* lost and the client simply retries -- an acceptable compromise that avoids +* consuming server resources under attack. +* +* @param m the server's multi_context +* @param buf the packet to send (built by a tls_*_standalone() helper) +* @param prefix msg() prefix to set for the duration of the send +* @param detail D_MULTI_DEBUG message describing the reply +* @param sock the socket to send the reply on +*/ +static void +send_standalone_reply (struct multi_context *m,struct buffer *buf,const char *prefix, +const char *detail,struct link_socket *sock) +{ +struct context *c = &m->top; + +/* 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); + +msg_set_prefix (prefix); + c->c2.to_link = c->c2.buffers->aux_buf; + c->c2.to_link_addr = &c->c2.from; +msg (D_MULTI_DEBUG ,"%s" , detail); +process_outgoing_link (c, sock); + c->c2.to_link.len =0 ; + c->c2.to_link_addr =NULL ; +msg_set_prefix (NULL ); +} + static void send_hmac_reset_packet(struct multi_context *m, struct tls_pre_decrypt_state *state, struct tls_auth_standalone *tas, struct session_id *sid,
@@ -48,29 +83,8 @@struct buffer buf =tls_reset_standalone (&state->tls_wrap_tmp, tas, sid, &state->peer_session_id, header, request_resend_wkc); -struct context *c = &m->top; - -/* 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); - -/* -* We do not want to keep any state here, so we send the reply to the -* initial packet synchronously without queueing anything. -* -* If we hit EAGAIN on a busy socket, the packet will be lost and the -* client will have to retransmit its HARD_RESET. This is considered an -* acceptable compromise to avoid consuming server resources under attack. -*/ -msg_set_prefix ("Connection Attempt" ); - c->c2.to_link = c->c2.buffers->aux_buf; - c->c2.to_link_addr = &c->c2.from; -msg (D_MULTI_DEBUG ,"Reset packet from client, sending HMAC based reset challenge" ); -process_outgoing_link (c, sock); - c->c2.to_link.len =0 ; - c->c2.to_link_addr =NULL ; -msg_set_prefix (NULL ); +send_standalone_reply (m, &buf,"Connection Attempt" , +"Reset packet from client, sending HMAC based reset challenge" , sock); }
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/1743?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings?usp=email
Gerrit-MessageType: newpatchset
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: Ic75ca2ee9b59a4e11f37cd9653df268bba33889c
Gerrit-Change-Number: 1743
Gerrit-PatchSet: 9
Gerrit-Owner: stipa <[email protected]>
Gerrit-Reviewer: flichtenheld <[email protected]>
Gerrit-Reviewer: ordex <[email protected]>
Gerrit-Reviewer: plaisthos <[email protected]>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]>
Gerrit-Attention: stipa <[email protected]>
_______________________________________________
Openvpn-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openvpn-devel
Attention is currently required from: plaisthos, stipa.
Hello flichtenheld, ordex, plaisthos,
I'd like you to reexamine a change. Please visit
http://gerrit.openvpn.net/c/openvpn/+/1743?usp=email
to look at the new patch set (#11).
The change is no longer submittable: checks~ChecksSubmitRule is unsatisfied now.
Change subject: mudp: extract send_standalone_reply() helper
......................................................................
mudp: extract send_standalone_reply() helper
Factor the synchronous, stateless "send a standalone control packet back to the peer that just contacted us" sequence out of send_hmac_reset_packet() into a reusable helper. No behavioural change.
This lets a following commit reuse it for the out-of-band probe reply instead of duplicating the aux_buf / to_link / process_outgoing_link sequence.
---
M src/openvpn/mudp.c
1 file changed, 37 insertions(+), 23 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/43/1743/11
src/openvpn/mudp.c +37 -23
@@ -37,6 +37,41 @@#include <sys/inotify.h> #endif +/** +* Send an already-built standalone control packet back to the peer that just +* contacted us (c2.from), synchronously and without keeping any state. +* +* We do not want to keep state for a reply to an initial/out-of-band packet, so +* we send it without queueing. If we hit EAGAIN on a busy socket the packet is +* lost and the client simply retries -- an acceptable compromise that avoids +* consuming server resources under attack. +* +* @param m the server's multi_context +* @param buf the packet to send (built by a tls_*_standalone() helper) +* @param prefix msg() prefix to set for the duration of the send +* @param detail D_MULTI_DEBUG message describing the reply +* @param sock the socket to send the reply on +*/ +static void +send_standalone_reply (struct multi_context *m,struct buffer *buf,const char *prefix, +const char *detail,struct link_socket *sock) +{ +struct context *c = &m->top; + +/* 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); + +msg_set_prefix (prefix); + c->c2.to_link = c->c2.buffers->aux_buf; + c->c2.to_link_addr = &c->c2.from; +msg (D_MULTI_DEBUG ,"%s" , detail); +process_outgoing_link (c, sock); + c->c2.to_link.len =0 ; + c->c2.to_link_addr =NULL ; +msg_set_prefix (NULL ); +} + static void send_hmac_reset_packet(struct multi_context *m, struct tls_pre_decrypt_state *state, struct tls_auth_standalone *tas, struct session_id *sid,
@@ -48,29 +83,8 @@struct buffer buf =tls_reset_standalone (&state->tls_wrap_tmp, tas, sid, &state->peer_session_id, header, request_resend_wkc); -struct context *c = &m->top; - -/* 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); - -/* -* We do not want to keep any state here, so we send the reply to the -* initial packet synchronously without queueing anything. -* -* If we hit EAGAIN on a busy socket, the packet will be lost and the -* client will have to retransmit its HARD_RESET. This is considered an -* acceptable compromise to avoid consuming server resources under attack. -*/ -msg_set_prefix ("Connection Attempt" ); - c->c2.to_link = c->c2.buffers->aux_buf; - c->c2.to_link_addr = &c->c2.from; -msg (D_MULTI_DEBUG ,"Reset packet from client, sending HMAC based reset challenge" ); -process_outgoing_link (c, sock); - c->c2.to_link.len =0 ; - c->c2.to_link_addr =NULL ; -msg_set_prefix (NULL ); +send_standalone_reply (m, &buf,"Connection Attempt" , +"Reset packet from client, sending HMAC based reset challenge" , sock); }
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/1743?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings?usp=email
Gerrit-MessageType: newpatchset
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: Ic75ca2ee9b59a4e11f37cd9653df268bba33889c
Gerrit-Change-Number: 1743
Gerrit-PatchSet: 11
Gerrit-Owner: stipa <[email protected]>
Gerrit-Reviewer: flichtenheld <[email protected]>
Gerrit-Reviewer: ordex <[email protected]>
Gerrit-Reviewer: plaisthos <[email protected]>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]>
Gerrit-Attention: stipa <[email protected]>
_______________________________________________
Openvpn-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openvpn-devel
PATCH v11 1/1 mudp: extract send_standalone_reply() helper
In reply to a message not in the archiveFrom: Lev Stipakov <[email protected]>
Factor the synchronous, stateless "send a standalone control packet back to the peer that just contacted us" sequence out of send_hmac_reset_packet() into a reusable helper. No behavioural change.
This lets a following commit reuse it for the out-of-band probe reply instead of duplicating the aux_buf / to_link / process_outgoing_link sequence.
Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1743
---
This change was reviewed on Gerrit and approved by at least one developer. I request to merge it to master.
Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1743
This mail reflects revision 11 of this Change.
Acked-by according to Gerrit (reflected above):
Frank Lichtenheld <[email protected]>
Antonio Quartulli <[email protected]>
src/openvpn/mudp.c +37 -23
@@ -37,6 +37,41 @@#include <sys/inotify.h> #endif +/** +* Send an already-built standalone control packet back to the peer that just +* contacted us (c2.from), synchronously and without keeping any state. +* +* We do not want to keep state for a reply to an initial/out-of-band packet, so +* we send it without queueing. If we hit EAGAIN on a busy socket the packet is +* lost and the client simply retries -- an acceptable compromise that avoids +* consuming server resources under attack. +* +* @param m the server's multi_context +* @param buf the packet to send (built by a tls_*_standalone() helper) +* @param prefix msg() prefix to set for the duration of the send +* @param detail D_MULTI_DEBUG message describing the reply +* @param sock the socket to send the reply on +*/ +static void +send_standalone_reply (struct multi_context *m,struct buffer *buf,const char *prefix, +const char *detail,struct link_socket *sock) +{ +struct context *c = &m->top; + +/* 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); + +msg_set_prefix (prefix); + c->c2.to_link = c->c2.buffers->aux_buf; + c->c2.to_link_addr = &c->c2.from; +msg (D_MULTI_DEBUG ,"%s" , detail); +process_outgoing_link (c, sock); + c->c2.to_link.len =0 ; + c->c2.to_link_addr =NULL ; +msg_set_prefix (NULL ); +} + static void send_hmac_reset_packet(struct multi_context *m, struct tls_pre_decrypt_state *state, struct tls_auth_standalone *tas, struct session_id *sid,
@@ -48,29 +83,8 @@struct buffer buf =tls_reset_standalone (&state->tls_wrap_tmp, tas, sid, &state->peer_session_id, header, request_resend_wkc); -struct context *c = &m->top; - -/* 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); - -/* -* We do not want to keep any state here, so we send the reply to the -* initial packet synchronously without queueing anything. -* -* If we hit EAGAIN on a busy socket, the packet will be lost and the -* client will have to retransmit its HARD_RESET. This is considered an -* acceptable compromise to avoid consuming server resources under attack. -*/ -msg_set_prefix ("Connection Attempt" ); - c->c2.to_link = c->c2.buffers->aux_buf; - c->c2.to_link_addr = &c->c2.from; -msg (D_MULTI_DEBUG ,"Reset packet from client, sending HMAC based reset challenge" ); -process_outgoing_link (c, sock); - c->c2.to_link.len =0 ; - c->c2.to_link_addr =NULL ; -msg_set_prefix (NULL ); +send_standalone_reply (m, &buf,"Connection Attempt" , +"Reset packet from client, sending HMAC based reset challenge" , sock); }
_______________________________________________
Openvpn-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openvpn-devel
[Openvpn-devel] [PATCH applied] Re: mudp: extract send_standalone_reply() helper
Straightforward move, with a few generalizations - unfortunately, too few lines moved to make "git show --color-moved=zebra" display this in a nice way. So verified by stare-at-gerrit... also, BB all green :-)
Your patch has been applied to the master branch.
commit d169af7f831ea2c20e2c633fe426e51b91b397b3
Author: Lev Stipakov Date: Wed Aug 5 15:46:14 2026 +0200
mudp: extract send_standalone_reply() helper
Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1743
Message-Id: <[email protected]>
URL: https://www.mail-archive.com/[email protected]/msg38134.html
--
kind regards,
Gert Doering
_______________________________________________
Openvpn-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openvpn-devel
cron2 has submitted this change. ( http://gerrit.openvpn.net/c/openvpn/+/1743?usp=email )
Change subject: mudp: extract send_standalone_reply() helper
......................................................................
mudp: extract send_standalone_reply() helper
Factor the synchronous, stateless "send a standalone control packet back to the peer that just contacted us" sequence out of send_hmac_reset_packet() into a reusable helper. No behavioural change.
This lets a following commit reuse it for the out-of-band probe reply instead of duplicating the aux_buf / to_link / process_outgoing_link sequence.
Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1743
Message-Id: <[email protected]>
URL: https://www.mail-archive.com/[email protected]/msg38134.html
---
M src/openvpn/mudp.c
1 file changed, 37 insertions(+), 23 deletions(-)
src/openvpn/mudp.c +37 -23
@@ -37,6 +37,41 @@#include <sys/inotify.h> #endif +/** +* Send an already-built standalone control packet back to the peer that just +* contacted us (c2.from), synchronously and without keeping any state. +* +* We do not want to keep state for a reply to an initial/out-of-band packet, so +* we send it without queueing. If we hit EAGAIN on a busy socket the packet is +* lost and the client simply retries -- an acceptable compromise that avoids +* consuming server resources under attack. +* +* @param m the server's multi_context +* @param buf the packet to send (built by a tls_*_standalone() helper) +* @param prefix msg() prefix to set for the duration of the send +* @param detail D_MULTI_DEBUG message describing the reply +* @param sock the socket to send the reply on +*/ +static void +send_standalone_reply (struct multi_context *m,struct buffer *buf,const char *prefix, +const char *detail,struct link_socket *sock) +{ +struct context *c = &m->top; + +/* 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); + +msg_set_prefix (prefix); + c->c2.to_link = c->c2.buffers->aux_buf; + c->c2.to_link_addr = &c->c2.from; +msg (D_MULTI_DEBUG ,"%s" , detail); +process_outgoing_link (c, sock); + c->c2.to_link.len =0 ; + c->c2.to_link_addr =NULL ; +msg_set_prefix (NULL ); +} + static void send_hmac_reset_packet(struct multi_context *m, struct tls_pre_decrypt_state *state, struct tls_auth_standalone *tas, struct session_id *sid,
@@ -48,29 +83,8 @@struct buffer buf =tls_reset_standalone (&state->tls_wrap_tmp, tas, sid, &state->peer_session_id, header, request_resend_wkc); -struct context *c = &m->top; - -/* 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); - -/* -* We do not want to keep any state here, so we send the reply to the -* initial packet synchronously without queueing anything. -* -* If we hit EAGAIN on a busy socket, the packet will be lost and the -* client will have to retransmit its HARD_RESET. This is considered an -* acceptable compromise to avoid consuming server resources under attack. -*/ -msg_set_prefix ("Connection Attempt" ); - c->c2.to_link = c->c2.buffers->aux_buf; - c->c2.to_link_addr = &c->c2.from; -msg (D_MULTI_DEBUG ,"Reset packet from client, sending HMAC based reset challenge" ); -process_outgoing_link (c, sock); - c->c2.to_link.len =0 ; - c->c2.to_link_addr =NULL ; -msg_set_prefix (NULL ); +send_standalone_reply (m, &buf,"Connection Attempt" , +"Reset packet from client, sending HMAC based reset challenge" , sock); }
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/1743?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings?usp=email
Gerrit-MessageType: merged
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: Ic75ca2ee9b59a4e11f37cd9653df268bba33889c
Gerrit-Change-Number: 1743
Gerrit-PatchSet: 12
Gerrit-Owner: stipa <[email protected]>
Gerrit-Reviewer: flichtenheld <[email protected]>
Gerrit-Reviewer: ordex <[email protected]>
Gerrit-Reviewer: plaisthos <[email protected]>
Gerrit-CC: openvpn-devel <[email protected]>
_______________________________________________
Openvpn-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openvpn-devel
cron2 has uploaded a new patch set (#12) to the change originally created by stipa. ( http://gerrit.openvpn.net/c/openvpn/+/1743?usp=email )
The following approvals got outdated and were removed:
Code-Review+2 by flichtenheld, Code-Review+2 by ordex
Change subject: mudp: extract send_standalone_reply() helper
......................................................................
mudp: extract send_standalone_reply() helper
Factor the synchronous, stateless "send a standalone control packet back to the peer that just contacted us" sequence out of send_hmac_reset_packet() into a reusable helper. No behavioural change.
This lets a following commit reuse it for the out-of-band probe reply instead of duplicating the aux_buf / to_link / process_outgoing_link sequence.
Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1743
Message-Id: <[email protected]>
URL: https://www.mail-archive.com/[email protected]/msg38134.html
---
M src/openvpn/mudp.c
1 file changed, 37 insertions(+), 23 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/43/1743/12
src/openvpn/mudp.c +37 -23
@@ -37,6 +37,41 @@#include <sys/inotify.h> #endif +/** +* Send an already-built standalone control packet back to the peer that just +* contacted us (c2.from), synchronously and without keeping any state. +* +* We do not want to keep state for a reply to an initial/out-of-band packet, so +* we send it without queueing. If we hit EAGAIN on a busy socket the packet is +* lost and the client simply retries -- an acceptable compromise that avoids +* consuming server resources under attack. +* +* @param m the server's multi_context +* @param buf the packet to send (built by a tls_*_standalone() helper) +* @param prefix msg() prefix to set for the duration of the send +* @param detail D_MULTI_DEBUG message describing the reply +* @param sock the socket to send the reply on +*/ +static void +send_standalone_reply (struct multi_context *m,struct buffer *buf,const char *prefix, +const char *detail,struct link_socket *sock) +{ +struct context *c = &m->top; + +/* 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); + +msg_set_prefix (prefix); + c->c2.to_link = c->c2.buffers->aux_buf; + c->c2.to_link_addr = &c->c2.from; +msg (D_MULTI_DEBUG ,"%s" , detail); +process_outgoing_link (c, sock); + c->c2.to_link.len =0 ; + c->c2.to_link_addr =NULL ; +msg_set_prefix (NULL ); +} + static void send_hmac_reset_packet(struct multi_context *m, struct tls_pre_decrypt_state *state, struct tls_auth_standalone *tas, struct session_id *sid,
@@ -48,29 +83,8 @@struct buffer buf =tls_reset_standalone (&state->tls_wrap_tmp, tas, sid, &state->peer_session_id, header, request_resend_wkc); -struct context *c = &m->top; - -/* 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); - -/* -* We do not want to keep any state here, so we send the reply to the -* initial packet synchronously without queueing anything. -* -* If we hit EAGAIN on a busy socket, the packet will be lost and the -* client will have to retransmit its HARD_RESET. This is considered an -* acceptable compromise to avoid consuming server resources under attack. -*/ -msg_set_prefix ("Connection Attempt" ); - c->c2.to_link = c->c2.buffers->aux_buf; - c->c2.to_link_addr = &c->c2.from; -msg (D_MULTI_DEBUG ,"Reset packet from client, sending HMAC based reset challenge" ); -process_outgoing_link (c, sock); - c->c2.to_link.len =0 ; - c->c2.to_link_addr =NULL ; -msg_set_prefix (NULL ); +send_standalone_reply (m, &buf,"Connection Attempt" , +"Reset packet from client, sending HMAC based reset challenge" , sock); }
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/1743?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings?usp=email
Gerrit-MessageType: newpatchset
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: Ic75ca2ee9b59a4e11f37cd9653df268bba33889c
Gerrit-Change-Number: 1743
Gerrit-PatchSet: 12
Gerrit-Owner: stipa <[email protected]>
Gerrit-Reviewer: flichtenheld <[email protected]>
Gerrit-Reviewer: ordex <[email protected]>
Gerrit-Reviewer: plaisthos <[email protected]>
Gerrit-CC: openvpn-devel <[email protected]>
_______________________________________________
Openvpn-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openvpn-devel