Message ID | 20200715141425.26293-1-arne@rfc2549.org |
---|---|
State | Accepted |
Headers | show |
Series | [Openvpn-devel] reformat multi_client_generate_tls_keys according to uncrustify | expand |
Hi, On 15/07/2020 16:14, Arne Schwabe wrote: > The refactor accidently used a wrong code style template and > ended up using 2 instead of 4 as indent. > > Signed-off-by: Arne Schwabe <arne@rfc2549.org> Acked-by: Antonio Quartulli <a@unstable.cc>
Your patch has been applied to the master branch. commit 90ed0fd2df37441dd6fc368ece006e4dd49093e9 Author: Arne Schwabe Date: Wed Jul 15 16:14:25 2020 +0200 reformat multi_client_generate_tls_keys according to uncrustify Signed-off-by: Arne Schwabe <arne@rfc2549.org> Acked-by: Antonio Quartulli <a@unstable.cc> Message-Id: <20200715141425.26293-1-arne@rfc2549.org> URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg20371.html Signed-off-by: Gert Doering <gert@greenie.muc.de> -- kind regards, Gert Doering
diff --git a/src/openvpn/multi.c b/src/openvpn/multi.c index 4cf42440..97b7df16 100644 --- a/src/openvpn/multi.c +++ b/src/openvpn/multi.c @@ -2003,23 +2003,23 @@ cleanup: static bool multi_client_generate_tls_keys(struct context *c) { - struct frame *frame_fragment = NULL; + struct frame *frame_fragment = NULL; #ifdef ENABLE_FRAGMENT - if (c->options.ce.fragment) + if (c->options.ce.fragment) { - frame_fragment = &c->c2.frame_fragment; + frame_fragment = &c->c2.frame_fragment; } #endif - struct tls_session *session = &c->c2.tls_multi->session[TM_ACTIVE]; - if (!tls_session_update_crypto_params(session, &c->options, - &c->c2.frame, frame_fragment)) + struct tls_session *session = &c->c2.tls_multi->session[TM_ACTIVE]; + if (!tls_session_update_crypto_params(session, &c->options, + &c->c2.frame, frame_fragment)) { - msg(D_TLS_ERRORS, "TLS Error: initializing data channel failed"); - register_signal(c, SIGUSR1, "process-push-msg-failed"); - return false; + msg(D_TLS_ERRORS, "TLS Error: initializing data channel failed"); + register_signal(c, SIGUSR1, "process-push-msg-failed"); + return false; } - return true; + return true; } static void
The refactor accidently used a wrong code style template and ended up using 2 instead of 4 as indent. Signed-off-by: Arne Schwabe <arne@rfc2549.org> --- src/openvpn/multi.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-)