From bdf7e746f05112f4cc6dfea0fc59ec5a55797b28 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Hoguin?= Date: Sun, 10 Mar 2019 10:26:50 +0100 Subject: Fix get_remote_pid_tls for OTP-22+ --- src/ct_helper.erl | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/ct_helper.erl b/src/ct_helper.erl index 73dd96a..58fff09 100644 --- a/src/ct_helper.erl +++ b/src/ct_helper.erl @@ -142,8 +142,17 @@ get_remote_pid_tls(Socket) -> %% This gives us the pid of the sslsocket process. %% We must introspect this process in order to retrieve the connection pid. TLSPid = get_remote_pid_tcp(ssl:sockname(Socket)), + get_tls_state(TLSPid). + +-if(?OTP_RELEASE >= 22). +get_tls_state(TLSPid) -> + {_, #state{connection_env=#connection_env{user_application={_, UserPid}}}} = sys:get_state(TLSPid), + UserPid. +-else. +get_tls_state(TLSPid) -> {_, #state{user_application={_, UserPid}}} = sys:get_state(TLSPid), UserPid. +-endif. %% @doc Ignore crashes from Pid occuring in M:F/A. -- cgit v1.2.3