s3:rpc_client: add set_timeout hook to rpc_cli_transport

metze
(cherry picked from commit 99664ad15460530b6fb44957b6c57823f09884bf)
(cherry picked from commit 89164eb8363ffc0b951256578be48d37ddba46b1)

Signed-off-by: Stefan Metzmacher <metze@samba.org>

diff --git a/source3/include/client.h b/source3/include/client.h
index bdc6aeb863f080566d8d438ac58af52ad54a3755..d80989d114ec63eb849c15194ea8b67a6abb3b5a 100644 (file)
--- a/source3/include/client.h
+++ b/source3/include/client.h
@@ -112,6 +112,7 @@ struct rpc_cli_transport {
                               uint8_t **prdata, uint32_t *prdata_len);
 
        bool (*is_connected)(void *priv);
+       unsigned int (*set_timeout)(void *priv, unsigned int timeout);
 
        void *priv;
 };

diff --git a/source3/rpc_client/cli_pipe.c b/source3/rpc_client/cli_pipe.c
index 94e714d3b8176261446a6edc42c058d478781367..9ce090f51f1b47d0f7be8c0735e3642e282a57f3 100644 (file)
--- a/source3/rpc_client/cli_pipe.c
+++ b/source3/rpc_client/cli_pipe.c
@@ -2953,12 +2953,15 @@ NTSTATUS rpc_pipe_bind(struct rpc_pipe_client *cli,
 unsigned int rpccli_set_timeout(struct rpc_pipe_client *rpc_cli,
                                unsigned int timeout)
 {
-       struct cli_state *cli = rpc_pipe_np_smb_conn(rpc_cli);
+       if (rpc_cli->transport == NULL) {
+               return 0;
+       }
 
-       if (cli == NULL) {
+       if (rpc_cli->transport->set_timeout == NULL) {
                return 0;
        }
-       return cli_set_timeout(cli, timeout);
+
+       return rpc_cli->transport->set_timeout(rpc_cli->transport->priv, timeout);
 }
 
 bool rpccli_is_connected(struct rpc_pipe_client *rpc_cli)

diff --git a/source3/rpc_client/rpc_transport_np.c b/source3/rpc_client/rpc_transport_np.c
index 90c73abe1fa3657e3e128c6131c18905c0f84c1f..5d018717e44a2b025e824960648127b4cdf1d2fe 100644 (file)
--- a/source3/rpc_client/rpc_transport_np.c
+++ b/source3/rpc_client/rpc_transport_np.c
@@ -47,6 +47,24 @@ static bool rpc_np_is_connected(void *priv)
        return true;
 }
 
+static unsigned int rpc_np_set_timeout(void *priv, unsigned int timeout)
+{
+       struct rpc_transport_np_state *np_transport = talloc_get_type_abort(
+               priv, struct rpc_transport_np_state);
+       bool ok;
+
+       if (np_transport->cli == NULL) {
+               return false;
+       }
+
+       ok = rpc_np_is_connected(np_transport);
+       if (!ok) {
+               return 0;
+       }
+
+       return cli_set_timeout(np_transport->cli, timeout);
+}
+
 static int rpc_transport_np_state_destructor(struct rpc_transport_np_state *s)
 {
        bool ret;
@@ -470,6 +488,7 @@ NTSTATUS rpc_transport_np_init_recv(struct async_req *req,
        state->transport->trans_send = rpc_np_trans_send;
        state->transport->trans_recv = rpc_np_trans_recv;
        state->transport->is_connected = rpc_np_is_connected;
+       state->transport->set_timeout = rpc_np_set_timeout;
 
        *presult = talloc_move(mem_ctx, &state->transport);
        return NT_STATUS_OK;

diff --git a/source3/rpc_client/rpc_transport_smbd.c b/source3/rpc_client/rpc_transport_smbd.c
index 262caf9ee39e0f43967bb5ee074327711bb5cfdc..f461fb8b837d8b3c02811027c9139fd7a6d1ae35 100644 (file)
--- a/source3/rpc_client/rpc_transport_smbd.c
+++ b/source3/rpc_client/rpc_transport_smbd.c
@@ -474,6 +474,24 @@ static bool rpc_smbd_is_connected(void *priv)
        return true;
 }
 
+static unsigned int rpc_smbd_set_timeout(void *priv, unsigned int timeout)
+{
+       struct rpc_transport_smbd_state *transp = talloc_get_type_abort(
+               priv, struct rpc_transport_smbd_state);
+       bool ok;
+
+       ok = rpc_smbd_is_connected(transp);
+       if (!ok) {
+               return 0;
+       }
+
+       if (transp->sub_transp->set_timeout == NULL) {
+               return 0;
+       }
+
+       return transp->sub_transp->set_timeout(transp->sub_transp->priv, timeout);
+}
+
 struct rpc_smbd_write_state {
        struct rpc_transport_smbd_state *transp;
        ssize_t written;
@@ -733,6 +751,7 @@ NTSTATUS rpc_transport_smbd_init_recv(struct async_req *req,
        state->transport->trans_send = NULL;
        state->transport->trans_recv = NULL;
        state->transport->is_connected = rpc_smbd_is_connected;
+       state->transport->set_timeout = rpc_smbd_set_timeout;
 
        *presult = talloc_move(mem_ctx, &state->transport);
        return NT_STATUS_OK;

diff --git a/source3/rpc_client/rpc_transport_sock.c b/source3/rpc_client/rpc_transport_sock.c
index 95e16c381f1f65ab6da3bc3695168f7bebcd6681..442f3099e1f0ec116a03d76a8da9247922d2febf 100644 (file)
--- a/source3/rpc_client/rpc_transport_sock.c
+++ b/source3/rpc_client/rpc_transport_sock.c
@@ -53,6 +53,25 @@ static bool rpc_sock_is_connected(void *priv)
        return true;
 }
 
+static unsigned int rpc_sock_set_timeout(void *priv, unsigned int timeout)
+{
+       struct rpc_transport_sock_state *sock_transp = talloc_get_type_abort(
+               priv, struct rpc_transport_sock_state);
+       int orig_timeout;
+       bool ok;
+
+       ok = rpc_sock_is_connected(sock_transp);
+       if (!ok) {
+               return 0;
+       }
+
+       orig_timeout = sock_transp->timeout;
+
+       sock_transp->timeout = timeout;
+
+       return orig_timeout;
+}
+
 struct rpc_sock_read_state {
        struct rpc_transport_sock_state *transp;
        ssize_t received;
@@ -247,6 +266,7 @@ NTSTATUS rpc_transport_sock_init(TALLOC_CTX *mem_ctx, int fd,
        result->read_send = rpc_sock_read_send;
        result->read_recv = rpc_sock_read_recv;
        result->is_connected = rpc_sock_is_connected;
+       result->set_timeout = rpc_sock_set_timeout;
 
        *presult = result;
        return NT_STATUS_OK;