On 08/03/18 15:18, Arne Schwabe wrote: > Am 31.10.16 um 13:51 schrieb David Sommerseth: >> This refactors the call chain of tls_multi_process(), tls_process() >> and key_method_2_read() so the the latter function have access >> to the struct context object. >> >> This change is needed for the following patch where verify_user_pass() >> will need to call send_auth_failed(), which depends on direct access >> to the the context object. >> >> Signed-off-by: David Sommerseth <dav...@openvpn.net> >> --- >> src/openvpn/forward.c | 2 +- >> src/openvpn/ssl.c | 28 ++++++++++++++++------------ >> src/openvpn/ssl.h | 6 +----- >> 3 files changed, 18 insertions(+), 18 deletions(-) >> >> diff --git a/src/openvpn/forward.c b/src/openvpn/forward.c >> index b3077ed..7dafd53 100644 >> --- a/src/openvpn/forward.c >> +++ b/src/openvpn/forward.c >> @@ -96,7 +96,7 @@ check_tls_dowork (struct context *c) >> >> if (interval_test (&c->c2.tmp_int)) >> { >> - const int tmp_status = tls_multi_process >> + const int tmp_status = tls_multi_process(c, &wakeup); >> (c->c2.tls_multi, &c->c2.to_link, &c->c2.to_link_addr, >> > > This part of the patch looks just wrong. The > > (c->c2.tls_multi, &c->c2.to_link, &c->c2.to_link_addr, > get_link_socket_info (c), &wakeup); > > will stand alone.
Yeah, that gotta be a commit error. That said, I remember Steffan not agreeing with this re-factoring approach. As, we're passing quite some data around in these large and more global structs. We need to look into how to make send_auth_failed() work in a smaller set of context than the main 'c' context. -- kind regards, David Sommerseth OpenVPN Inc ------------------------------------------------------------------------------ Check out the vibrant tech community on one of the world's most engaging tech sites, Slashdot.org! http://sdm.link/slashdot _______________________________________________ Openvpn-devel mailing list Openvpn-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openvpn-devel