diff options
author | Stefan Metzmacher <metze@samba.org> | 2010-04-06 14:31:17 +0200 |
---|---|---|
committer | Karolin Seeger <kseeger@samba.org> | 2010-05-06 14:08:36 +0200 |
commit | 50f8ed9c85a3caeac466e87175e084fc00e47209 (patch) | |
tree | 1c20332a823436ee0269b403453261e4bb827026 | |
parent | 8ff54339230d4cf6862e5c3dac59adff7178a869 (diff) | |
download | samba-50f8ed9c85a3caeac466e87175e084fc00e47209.tar.gz |
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>
(cherry picked from commit b462bc1724b3bdf9052566e683f9748ea6730169)
-rw-r--r-- | source3/include/client.h | 1 | ||||
-rw-r--r-- | source3/rpc_client/cli_pipe.c | 9 | ||||
-rw-r--r-- | source3/rpc_client/rpc_transport_np.c | 19 | ||||
-rw-r--r-- | source3/rpc_client/rpc_transport_smbd.c | 19 | ||||
-rw-r--r-- | source3/rpc_client/rpc_transport_sock.c | 20 |
5 files changed, 65 insertions, 3 deletions
diff --git a/source3/include/client.h b/source3/include/client.h index bdc6aeb863f..d80989d114e 100644 --- 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 94e714d3b81..9ce090f51f1 100644 --- 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 90c73abe1fa..5d018717e44 100644 --- 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 262caf9ee39..f461fb8b837 100644 --- 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 95e16c381f1..442f3099e1f 100644 --- 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; |