s3:rpc_client: add rpccli_is_connected()

metze

1 files changed, 23 insertions, 11 deletions

diff --git a/source3/rpc_client/rpc_transport_sock.c b/source3/rpc_client/rpc_transport_sock.c
index 4ab17dbd8d..5132504a85 100644
--- a/source3/rpc_client/rpc_transport_sock.c
+++ b/source3/rpc_client/rpc_transport_sock.c
@@ -27,15 +27,32 @@ struct rpc_transport_sock_state {
 	int timeout;
 };
 
-static int rpc_transport_sock_state_destructor(struct rpc_transport_sock_state *s)
+static void rpc_sock_disconnect(struct rpc_transport_sock_state *s)
 {
 	if (s->fd != -1) {
 		close(s->fd);
 		s->fd = -1;
 	}
+}
+
+static int rpc_transport_sock_state_destructor(struct rpc_transport_sock_state *s)
+{
+	rpc_sock_disconnect(s);
 	return 0;
 }
 
+static bool rpc_sock_is_connected(void *priv)
+{
+	struct rpc_transport_sock_state *sock_transp = talloc_get_type_abort(
+		priv, struct rpc_transport_sock_state);
+
+	if (sock_transp->fd == -1) {
+		return false;
+	}
+
+	return true;
+}
+
 struct rpc_sock_read_state {
 	struct rpc_transport_sock_state *transp;
 	ssize_t received;
@@ -58,7 +75,7 @@ static struct tevent_req *rpc_sock_read_send(TALLOC_CTX *mem_ctx,
 	if (req == NULL) {
 		return NULL;
 	}
-	if (sock_transp->fd == -1) {
+	if (!rpc_sock_is_connected(sock_transp)) {
 		tevent_req_nterror(req, NT_STATUS_CONNECTION_INVALID);
 		return tevent_req_post(req, ev);
 	}
@@ -94,11 +111,8 @@ static void rpc_sock_read_done(struct tevent_req *subreq)
 	state->received = async_recv_recv(subreq, &err);
 
 	if (state->received == -1) {
-		if (state->transp->fd != -1) {
-			close(state->transp->fd);
-			state->transp->fd = -1;
-		}
 		TALLOC_FREE(subreq);
+		rpc_sock_disconnect(state->transp);
 		tevent_req_nterror(req, map_nt_error_from_unix(err));
 		return;
 	}
@@ -141,7 +155,7 @@ static struct tevent_req *rpc_sock_write_send(TALLOC_CTX *mem_ctx,
 	if (req == NULL) {
 		return NULL;
 	}
-	if (sock_transp->fd == -1) {
+	if (!rpc_sock_is_connected(sock_transp)) {
 		tevent_req_nterror(req, NT_STATUS_CONNECTION_INVALID);
 		return tevent_req_post(req, ev);
 	}
@@ -177,11 +191,8 @@ static void rpc_sock_write_done(struct tevent_req *subreq)
 	state->sent = async_send_recv(subreq, &err);
 
 	if (state->sent == -1) {
-		if (state->transp->fd != -1) {
-			close(state->transp->fd);
-			state->transp->fd = -1;
-		}
 		TALLOC_FREE(subreq);
+		rpc_sock_disconnect(state->transp);
 		tevent_req_nterror(req, map_nt_error_from_unix(err));
 		return;
 	}
@@ -229,6 +240,7 @@ NTSTATUS rpc_transport_sock_init(TALLOC_CTX *mem_ctx, int fd,
 	result->write_recv = rpc_sock_write_recv;
 	result->read_send = rpc_sock_read_send;
 	result->read_recv = rpc_sock_read_recv;
+	result->is_connected = rpc_sock_is_connected;
 
 	*presult = result;
 	return NT_STATUS_OK;