summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2010-09-06 17:31:27 +0200
committerStefan Metzmacher <metze@samba.org>2010-12-15 15:26:05 +0100
commit0342ed3ee0f8d9f29c6fcabbca1fab4f6514b78b (patch)
tree3173039f23a22384bae4c72d413cfe82f5267e47 /source3
parent122dc1e213d1049568cc49f305f82063b3fa20ba (diff)
downloadsamba-0342ed3ee0f8d9f29c6fcabbca1fab4f6514b78b.tar.gz
samba-0342ed3ee0f8d9f29c6fcabbca1fab4f6514b78b.tar.bz2
samba-0342ed3ee0f8d9f29c6fcabbca1fab4f6514b78b.zip
s3:rpc_client: implement rpc_transport_sock_init() on top of rpc_transport_tstream_init()
metze
Diffstat (limited to 'source3')
-rw-r--r--source3/rpc_client/rpc_transport_sock.c244
1 files changed, 13 insertions, 231 deletions
diff --git a/source3/rpc_client/rpc_transport_sock.c b/source3/rpc_client/rpc_transport_sock.c
index 359ec478cc..fa5c71d7d0 100644
--- a/source3/rpc_client/rpc_transport_sock.c
+++ b/source3/rpc_client/rpc_transport_sock.c
@@ -23,245 +23,27 @@
#undef DBGC_CLASS
#define DBGC_CLASS DBGC_RPC_CLI
-struct rpc_transport_sock_state {
- int fd;
- int timeout;
-};
-
-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;
-}
-
-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;
-};
-
-static void rpc_sock_read_done(struct tevent_req *subreq);
-
-static struct tevent_req *rpc_sock_read_send(TALLOC_CTX *mem_ctx,
- struct event_context *ev,
- uint8_t *data, size_t size,
- void *priv)
-{
- struct rpc_transport_sock_state *sock_transp = talloc_get_type_abort(
- priv, struct rpc_transport_sock_state);
- struct tevent_req *req, *subreq;
- struct rpc_sock_read_state *state;
- struct timeval endtime;
-
- req = tevent_req_create(mem_ctx, &state, struct rpc_sock_read_state);
- if (req == NULL) {
- return NULL;
- }
- if (!rpc_sock_is_connected(sock_transp)) {
- tevent_req_nterror(req, NT_STATUS_CONNECTION_INVALID);
- return tevent_req_post(req, ev);
- }
- state->transp = sock_transp;
- endtime = timeval_current_ofs(0, sock_transp->timeout * 1000);
- subreq = async_recv_send(state, ev, sock_transp->fd, data, size, 0);
- if (subreq == NULL) {
- goto fail;
- }
-
- if (!tevent_req_set_endtime(subreq, ev, endtime)) {
- goto fail;
- }
-
- tevent_req_set_callback(subreq, rpc_sock_read_done, req);
- return req;
- fail:
- TALLOC_FREE(req);
- return NULL;
-}
-
-static void rpc_sock_read_done(struct tevent_req *subreq)
-{
- struct tevent_req *req = tevent_req_callback_data(
- subreq, struct tevent_req);
- struct rpc_sock_read_state *state = tevent_req_data(
- req, struct rpc_sock_read_state);
- int err;
-
- /* We must free subreq in this function as there is
- a timer event attached to it. */
-
- state->received = async_recv_recv(subreq, &err);
-
- if (state->received == -1) {
- TALLOC_FREE(subreq);
- rpc_sock_disconnect(state->transp);
- tevent_req_nterror(req, map_nt_error_from_unix(err));
- return;
- }
- TALLOC_FREE(subreq);
- tevent_req_done(req);
-}
-
-static NTSTATUS rpc_sock_read_recv(struct tevent_req *req, ssize_t *preceived)
+NTSTATUS rpc_transport_sock_init(TALLOC_CTX *mem_ctx, int fd,
+ struct rpc_cli_transport **presult)
{
- struct rpc_sock_read_state *state = tevent_req_data(
- req, struct rpc_sock_read_state);
+ struct rpc_cli_transport *result;
+ struct tstream_context *stream;
+ int ret;
NTSTATUS status;
- if (tevent_req_is_nterror(req, &status)) {
+ ret = tstream_bsd_existing_socket(mem_ctx, fd, &stream);
+ if (ret != 0) {
+ status = map_nt_error_from_unix(errno);
return status;
}
- *preceived = state->received;
- return NT_STATUS_OK;
-}
-
-struct rpc_sock_write_state {
- struct rpc_transport_sock_state *transp;
- ssize_t sent;
-};
-
-static void rpc_sock_write_done(struct tevent_req *subreq);
-
-static struct tevent_req *rpc_sock_write_send(TALLOC_CTX *mem_ctx,
- struct event_context *ev,
- const uint8_t *data, size_t size,
- void *priv)
-{
- struct rpc_transport_sock_state *sock_transp = talloc_get_type_abort(
- priv, struct rpc_transport_sock_state);
- struct tevent_req *req, *subreq;
- struct rpc_sock_write_state *state;
- struct timeval endtime;
-
- req = tevent_req_create(mem_ctx, &state, struct rpc_sock_write_state);
- if (req == NULL) {
- return NULL;
- }
- if (!rpc_sock_is_connected(sock_transp)) {
- tevent_req_nterror(req, NT_STATUS_CONNECTION_INVALID);
- return tevent_req_post(req, ev);
- }
- state->transp = sock_transp;
- endtime = timeval_current_ofs(0, sock_transp->timeout * 1000);
- subreq = async_send_send(state, ev, sock_transp->fd, data, size, 0);
- if (subreq == NULL) {
- goto fail;
- }
-
- if (!tevent_req_set_endtime(subreq, ev, endtime)) {
- goto fail;
- }
-
- tevent_req_set_callback(subreq, rpc_sock_write_done, req);
- return req;
- fail:
- TALLOC_FREE(req);
- return NULL;
-}
-
-static void rpc_sock_write_done(struct tevent_req *subreq)
-{
- struct tevent_req *req = tevent_req_callback_data(
- subreq, struct tevent_req);
- struct rpc_sock_write_state *state = tevent_req_data(
- req, struct rpc_sock_write_state);
- int err;
-
- /* We must free subreq in this function as there is
- a timer event attached to it. */
-
- state->sent = async_send_recv(subreq, &err);
-
- if (state->sent == -1) {
- TALLOC_FREE(subreq);
- rpc_sock_disconnect(state->transp);
- tevent_req_nterror(req, map_nt_error_from_unix(err));
- return;
- }
- TALLOC_FREE(subreq);
- tevent_req_done(req);
-}
-static NTSTATUS rpc_sock_write_recv(struct tevent_req *req, ssize_t *psent)
-{
- struct rpc_sock_write_state *state = tevent_req_data(
- req, struct rpc_sock_write_state);
- NTSTATUS status;
-
- if (tevent_req_is_nterror(req, &status)) {
+ status = rpc_transport_tstream_init(mem_ctx,
+ &stream,
+ &result);
+ if (!NT_STATUS_IS_OK(status)) {
+ TALLOC_FREE(stream);
return status;
}
- *psent = state->sent;
- return NT_STATUS_OK;
-}
-
-NTSTATUS rpc_transport_sock_init(TALLOC_CTX *mem_ctx, int fd,
- struct rpc_cli_transport **presult)
-{
- struct rpc_cli_transport *result;
- struct rpc_transport_sock_state *state;
-
- result = talloc(mem_ctx, struct rpc_cli_transport);
- if (result == NULL) {
- return NT_STATUS_NO_MEMORY;
- }
- state = talloc(result, struct rpc_transport_sock_state);
- if (state == NULL) {
- TALLOC_FREE(result);
- return NT_STATUS_NO_MEMORY;
- }
- result->priv = state;
-
- state->fd = fd;
- state->timeout = 10000; /* 10 seconds. */
- talloc_set_destructor(state, rpc_transport_sock_state_destructor);
-
- result->trans_send = NULL;
- result->trans_recv = NULL;
- result->write_send = rpc_sock_write_send;
- 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;
- result->set_timeout = rpc_sock_set_timeout;
*presult = result;
return NT_STATUS_OK;