Re: [Openvpn-devel] [PATCH] Handle (DCO) timeouts in client mode

2022-04-26 Thread Arne Schwabe
Am 26.04.22 um 18:56 schrieb Arne Schwabe: Am 26.04.22 um 18:29 schrieb Kristof Provost via Openvpn-devel: From: Kristof Provost Handle the DCO driver telling us that the peer went away, even if we're not running in multi-instance mode. Signed-off-by:    Kristof Provost ---   src/openvpn/for

Re: [Openvpn-devel] [PATCH] Handle (DCO) timeouts in client mode

2022-04-26 Thread Arne Schwabe
Am 26.04.22 um 18:29 schrieb Kristof Provost via Openvpn-devel: From: Kristof Provost Handle the DCO driver telling us that the peer went away, even if we're not running in multi-instance mode. Signed-off-by: Kristof Provost --- src/openvpn/forward.c | 6 ++ 1 file changed, 6 insertio

[Openvpn-devel] [PATCH] Handle (DCO) timeouts in client mode

2022-04-26 Thread Kristof Provost via Openvpn-devel
From: Kristof Provost Handle the DCO driver telling us that the peer went away, even if we're not running in multi-instance mode. Signed-off-by: Kristof Provost --- src/openvpn/forward.c | 6 ++ 1 file changed, 6 insertions(+) diff --git a/src/openvpn/forward.c b/src/openvpn/forward.c in

[Openvpn-devel] [PATCH DCO]: Handle (DCO) timeouts in client mode

2022-04-26 Thread Kristof Provost via Openvpn-devel
Hi, During testing of FreeBSD DCO support we discovered that a DCO enabled client does not detect that the server has gone away, even if 'keepalive' is set. This turns out to be because we only handle DCO notification messages in the multi-instance (i.e. server) code path. I'm not 100% sure this

[Openvpn-devel] [PATCH applied] Re: Remove pointless indentation from tls_process.

2022-04-26 Thread Gert Doering
That was an easy one :-) ("git show -w"). Your patch has been applied to the master branch. commit 48ed1a3dd6e1dc2849a0dd909f1c848cc2c05f91 Author: Arne Schwabe Date: Fri Apr 22 16:29:40 2022 +0200 Remove pointless indentation from tls_process. Acked-by: Frank Lichtenheld Mess

Re: [Openvpn-devel] [PATCH applied] Re: Move tls_process_state into its own function

2022-04-26 Thread Gert Doering
Hi, On Tue, Apr 26, 2022 at 04:59:29PM +0200, Gert Doering wrote: > ACK from Frankf, but I've done another stare-at-code and submitted > to server + client tests (all good). > > Uncrustify complained about 2-3 minor things -> adjusted (so possibly > there might be conflicts later on). > > Your p

[Openvpn-devel] [PATCH applied] Re: Move tls_process_state into its own function

2022-04-26 Thread Gert Doering
ACK from Frankf, but I've done another stare-at-code and submitted to server + client tests (all good). Uncrustify complained about 2-3 minor things -> adjusted (so possibly there might be conflicts later on). Your patch has been applied to the master branch. commit f1b002fb19cc99f1a527cf95b343b

[Openvpn-devel] [PATCH applied] Re: Extract session_move_active into its own function

2022-04-26 Thread Gert Doering
Acked-by: Gert Doering This is the 2nd half of "patch 13 v2". It has a semi-ACK from Frank, and now a proper commit message as well :-) Verified "it's only moved code" by hand (indent change), and lightly tested. Whitespace error has been fixed by git, so the "whitespace fix" hunk coming up wo

[Openvpn-devel] [PATCH applied] Re: Change FULL_SYNC macro to no_pending_reliable_packets function

2022-04-26 Thread Gert Doering
Acked-by: Gert Doering As discussed on IRC, this is "13/28 v2, first half" (accidentially squashed). Un-squashing these makes this one much clearer - only FULL_SYNC, and it does what it says on the lid. Quick compile and client test passed. Your patch has been applied to the master branch. c

[Openvpn-devel] [PATCH v2] Change FULL_SYNC macro to no_pending_reliable_packets function

2022-04-26 Thread Arne Schwabe
This changes this macro to a better named inline function. This introduces a slight whitespace problem but the next refactoring will move the incorrectly intended block to its own function anyway. --- src/openvpn/ssl.c | 11 +++ 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a

[Openvpn-devel] [PATCH v2] Extract session_move_active into its own function

2022-04-26 Thread Arne Schwabe
This makes the tls_process function smaller and easier to understand and this state easier to understand in its own function. --- src/openvpn/ssl.c | 92 ++- 1 file changed, 52 insertions(+), 40 deletions(-) diff --git a/src/openvpn/ssl.c b/src/openvpn/

[Openvpn-devel] [PATCH applied] Re: Extract session_move_pre_start as own function, use local buffer variable

2022-04-26 Thread Gert Doering
Stared at the code for a bit, and ran the t_server tests, for good measure. All fine. "git diff --color-moved=zebra" is non-helpful here, due to the indent change. Your patch has been applied to the master branch. commit edc3e9f5c939ca40841b8054732bfae47aad7e11 Author: Arne Schwabe Date: Fri

Re: [Openvpn-devel] [PATCH 20/28] Change reliable_get_buf_sequenced to reliable_get_entry_sequenced

2022-04-26 Thread Frank Lichtenheld
Acked-By: Frank Lichtenheld Trivial change. Applies on top of 15/28 (probably sooner, but this is the one I tested). Only compile/UT tested. > Arne Schwabe hat am 22.04.2022 16:29 geschrieben: > > > This returns not just the buffer of a reliable_entry but the whole > entry. This allows the c

Re: [Openvpn-devel] [PATCH 15/28] Remove pointless indentation from tls_process.

2022-04-26 Thread Frank Lichtenheld
Acked-by: Frank Lichtenheld Trivial. The commit message is a bit garbled though. Changing the first "add" to "and" makes it better, I think. "decleration" should be "declaration". Also remove the full stop from the summary line and move it at the end of the body. $ git show -w commit fdbf34d2e4

Re: [Openvpn-devel] [PATCH 14/28] Move tls_process_state into its own function

2022-04-26 Thread Frank Lichtenheld
Acked-By: Frank Lichtenheld (small issues mentioned below) Verified visually that this only moves code around and doesn't change behavior. Only compile/UT tested. This one actually fixes the spurious whitespace I complained about in 13/28 but that hunk should just be moved to there. You remove

[Openvpn-devel] [PATCH applied] Re: Refactor tls-auth/tls-crypt wrapping into into own function

2022-04-26 Thread Gert Doering
I've done a bit of "extra eyes stare at the code" and things look good (due to the newly named options, git is not that helpful in confirming "it's all the same code"). Will test together with 12. Your patch has been applied to the master branch. commit 9bbebf100a07f4dca3f088dce19cd87608e82b4c A

Re: [Openvpn-devel] [PATCH 13/28] Change FULL_SYNC macro to no_pending_reliable_packets function

2022-04-26 Thread Frank Lichtenheld
> Arne Schwabe hat am 22.04.2022 16:29 geschrieben: > > > This changes this macro to a better named inline function. This > introduces a slight whitespace problem but the next refactoring will > move the incorrectly intended block to its own function anyway. Could it be that you forgot to upda

Re: [Openvpn-devel] [PATCH 12/28] Extract session_move_pre_start as own function, use local buffer variable

2022-04-26 Thread Frank Lichtenheld
Acked-By: Frank Lichtenheld Verified visually that this only moves code around and doesn't change behavior. Only compile/UT tested. > Arne Schwabe hat am 22.04.2022 16:29 geschrieben: > > > This changes the C90 struct buffer declaration to a C99 style one. Also > move the state transition fr

Re: [Openvpn-devel] [PATCH 11/28] Refactor tls-auth/tls-crypt wrapping into into own function

2022-04-26 Thread Frank Lichtenheld
Acked-By: Frank Lichtenheld Verified visually that this only moves code around and doesn't change behavior. Only compile/UT tested. > Arne Schwabe hat am 22.04.2022 16:29 geschrieben: > > > This allows the the wrapping to be easier reused by a function that > does not have access to a full T

[Openvpn-devel] [PATCH applied] Re: fix GitHub workflow working directories in MinGW builds

2022-04-26 Thread Gert Doering
Acked-by: Gert Doering Applied (changes look reasonable and simplify future version bumps), and verified that everything builds in my GH repo and that it does, indeed, build with pkcs11-helper 1.29.0 (.bz2!) and OpenSSL 1.1.1n. Your patch has been applied to the master branch. commit 33abca04