diff options
| author | Milind Changire <mchangir@redhat.com> | 2018-01-05 11:17:46 +0530 |
|---|---|---|
| committer | Raghavendra G <rgowdapp@redhat.com> | 2018-01-07 03:55:51 +0000 |
| commit | 9b12157fea5ac054106ed14f9d91cdb8bad665c7 (patch) | |
| tree | d7b6701996424111ce8e39c5f2d03239830fae3c /rpc/rpc-transport/socket/src/socket.h | |
| parent | 515a832de0e761639b1d076a59bf918070ec3130 (diff) | |
Revert "rpc: merge ssl infra with epoll infra"
This reverts commit 56e5fdae74845dfec0ff7ad0c8fee77695d36ad5.
Change-Id: Ia62cee5440bbe8e23f5da9cff692d792091d544a
Signed-off-by: Milind Changire <mchangir@redhat.com>
Diffstat (limited to 'rpc/rpc-transport/socket/src/socket.h')
| -rw-r--r-- | rpc/rpc-transport/socket/src/socket.h | 32 |
1 files changed, 4 insertions, 28 deletions
diff --git a/rpc/rpc-transport/socket/src/socket.h b/rpc/rpc-transport/socket/src/socket.h index fdfc20774a8..ccc2a84cb35 100644 --- a/rpc/rpc-transport/socket/src/socket.h +++ b/rpc/rpc-transport/socket/src/socket.h @@ -248,36 +248,12 @@ typedef struct { char *ssl_ca_list; pthread_t thread; int pipe[2]; + gf_boolean_t own_thread; + gf_boolean_t own_thread_done; + ot_state_t ot_state; + uint32_t ot_gen; gf_boolean_t is_server; int log_ctr; - gf_boolean_t ssl_accepted; /* To indicate SSL_accept() */ - gf_boolean_t ssl_connected;/* or SSL_connect() has been - * been completed on this socket. - * These are valid only when - * use_ssl is true. - */ - /* SSL_CTX is created for each transport. Since we are now using non- - * blocking mechanism for SSL_accept() and SSL_connect(), the SSL - * context is created on the first EPOLLIN event which may lead to - * SSL_ERROR_WANT_READ/SSL_ERROR_WANT_WRITE and may not complete the - * SSL connection at the first attempt. - * ssl_context_created is a flag to note that we've created the SSL - * context for the connection so that we don't blindly create any more - * while !ssl_accepted or !ssl_connected. - */ - gf_boolean_t ssl_context_created; - gf_boolean_t accepted; /* explicit flag to be set in - * socket_event_handler() for - * newly accepted socket - */ - - /* ssl_error_required is used only during the SSL connection setup - * phase. - * It holds the error code returned by SSL_get_error() and is used to - * arm the epoll event set for the required event for the specific fd. - */ - int ssl_error_required; - GF_REF_DECL; /* refcount to keep track of socket_poller threads */ struct { |