| Message ID | 20201023113431.26691-1-arne@rfc2549.org |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [Openvpn-devel,1/5] Inline function tls_get_peer_info | expand |
Acked-by: Gert Doering <gert@greenie.muc.de> "obviously correct" and a reasonable change. Just a quick client side test (passed). Your patch has been applied to the master branch. commit 0d5aab889b0209cab9bb65f8bebf2adab5b1ff52 Author: Arne Schwabe Date: Fri Oct 23 13:34:27 2020 +0200 Inline function tls_get_peer_info Signed-off-by: Arne Schwabe <arne@rfc2549.org> Acked-by: Gert Doering <gert@greenie.muc.de> Message-Id: <20201023113431.26691-1-arne@rfc2549.org> URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg21217.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 a5862020..009b46fa 100644 --- a/src/openvpn/multi.c +++ b/src/openvpn/multi.c @@ -3993,7 +3993,7 @@ management_get_peer_info(void *arg, const unsigned long cid) if (mi) { - ret = tls_get_peer_info(mi->context.c2.tls_multi); + ret = mi->context.c2.tls_multi->peer_info; } return ret; diff --git a/src/openvpn/ssl.h b/src/openvpn/ssl.h index f00f8abd..f3032dab 100644 --- a/src/openvpn/ssl.h +++ b/src/openvpn/ssl.h @@ -499,14 +499,6 @@ bool tls_session_update_crypto_params(struct tls_session *session, struct frame *frame, struct frame *frame_fragment); -#ifdef MANAGEMENT_DEF_AUTH -static inline char * -tls_get_peer_info(const struct tls_multi *multi) -{ - return multi->peer_info; -} -#endif - /* * inline functions */
All other places in our code also directly access peer_info and this function does not contribute to code clarity. Signed-off-by: Arne Schwabe <arne@rfc2549.org> --- src/openvpn/multi.c | 2 +- src/openvpn/ssl.h | 8 -------- 2 files changed, 1 insertion(+), 9 deletions(-)