summaryrefslogtreecommitdiffstats
path: root/rpc
diff options
context:
space:
mode:
authorJeff Darcy <jdarcy@redhat.com>2012-11-05 11:24:57 -0500
committerVijay Bellur <vbellur@redhat.com>2012-11-12 07:17:13 -0800
commit128514fcb7f4943e6c97139f873db68a009ae893 (patch)
treeffdf880dc8f301fc80bf293cde049dfdd8450bdd /rpc
parent009c728b401287ef9aa9ee4a7fb509ccc5baa156 (diff)
socket: fix SSL breakage from re/connect handling changes
Change-Id: Ia1f5aeec5628b61cad8a10a9cdc6d9f1c67ec653 BUG: 873367 Signed-off-by: Jeff Darcy <jdarcy@redhat.com> Reviewed-on: http://review.gluster.org/4158 Tested-by: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Vijay Bellur <vbellur@redhat.com>
Diffstat (limited to 'rpc')
-rw-r--r--rpc/rpc-transport/socket/src/socket.c16
1 files changed, 9 insertions, 7 deletions
diff --git a/rpc/rpc-transport/socket/src/socket.c b/rpc/rpc-transport/socket/src/socket.c
index b043f52..ff6983f 100644
--- a/rpc/rpc-transport/socket/src/socket.c
+++ b/rpc/rpc-transport/socket/src/socket.c
@@ -2148,12 +2148,13 @@ socket_poller (void *ctx)
gf_log (this->name, GF_LOG_WARNING,
"asynchronous socket_connect_finish failed");
}
- ret = rpc_transport_notify (this->listener,
- RPC_TRANSPORT_ACCEPT, this);
- if (ret != 0) {
- gf_log (this->name, GF_LOG_WARNING,
- "asynchronous rpc_transport_notify failed");
- }
+ }
+
+ ret = rpc_transport_notify (this->listener,
+ RPC_TRANSPORT_ACCEPT, this);
+ if (ret != 0) {
+ gf_log (this->name, GF_LOG_WARNING,
+ "asynchronous rpc_transport_notify failed");
}
for (;;) {
@@ -2232,7 +2233,7 @@ socket_poller (void *ctx)
err:
/* All (and only) I/O errors should come here. */
__socket_disconnect (this);
- rpc_transport_notify (this, RPC_TRANSPORT_DISCONNECT, this);
+ rpc_transport_notify (this->listener, RPC_TRANSPORT_DISCONNECT, this);
rpc_transport_unref (this);
return NULL;
}
@@ -2632,6 +2633,7 @@ socket_connect (rpc_transport_t *this, int port)
"could not create pipe");
}
+ this->listener = this;
if (pthread_create(&priv->thread,NULL,
socket_poller, this) != 0) {
gf_log(this->name,GF_LOG_ERROR,