Add the socket rpc client transport

diff --git a/source3/Makefile.in b/source3/Makefile.in
index 7fbe22fded1a0987fe6ed4fbc0a471dc374d2f16..3cbefc8d85a24e7221d095ab7afbfe1e801c6cf5 100644 (file)
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -576,7 +576,8 @@ RPC_PARSE_OBJ = $(RPC_PARSE_OBJ2) \
                 rpc_parse/parse_spoolss.o \
                rpc_parse/parse_eventlog.o rpc_parse/parse_buffer.o
 
-RPC_CLIENT_OBJ = rpc_client/cli_pipe.o rpc_client/rpc_transport_np.o
+RPC_CLIENT_OBJ = rpc_client/cli_pipe.o rpc_client/rpc_transport_np.o \
+       rpc_client/rpc_transport_sock.o
 
 LOCKING_OBJ = locking/locking.o locking/brlock.o locking/posix.o
 

diff --git a/source3/include/proto.h b/source3/include/proto.h
index 1e71533156d92f8884d7efebc4b9188467a01803..1554bfdb25e2800c5db44a9fafc233b5473233af 100644 (file)
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -5302,6 +5302,11 @@ NTSTATUS rpc_transport_np_init(TALLOC_CTX *mem_ctx, struct cli_state *cli,
                               struct rpc_cli_transport **presult);
 struct cli_state *rpc_pipe_np_smb_conn(struct rpc_pipe_client *p);
 
+/* The following definitions come from rpc_client/rpc_transport_sock.c  */
+
+NTSTATUS rpc_transport_sock_init(TALLOC_CTX *mem_ctx, int fd,
+                                struct rpc_cli_transport **presult);
+
 /* The following definitions come from rpc_client/cli_reg.c  */
 
 NTSTATUS rpccli_winreg_Connect(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,

diff --git a/source3/rpc_client/rpc_transport_sock.c b/source3/rpc_client/rpc_transport_sock.c
new file mode 100644 (file)
index 0000000..c0fa41b
--- /dev/null
+++ b/source3/rpc_client/rpc_transport_sock.c
@@ -0,0 +1,116 @@
+/*
+ *  Unix SMB/CIFS implementation.
+ *  RPC client transport over a socket
+ *  Copyright (C) Volker Lendecke 2009
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "includes.h"
+
+#undef DBGC_CLASS
+#define DBGC_CLASS DBGC_RPC_CLI
+
+struct rpc_transport_sock_state {
+       int fd;
+};
+
+static int rpc_transport_sock_state_destructor(struct rpc_transport_sock_state *s)
+{
+       if (s->fd != -1) {
+               close(s->fd);
+               s->fd = -1;
+       }
+       return 0;
+}
+
+static struct async_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);
+       return async_recv(mem_ctx, ev, sock_transp->fd, data, size, 0);
+}
+
+static NTSTATUS rpc_sock_read_recv(struct async_req *req, ssize_t *preceived)
+{
+       ssize_t received;
+       int sys_errno;
+
+       received = async_syscall_result_ssize_t(req, &sys_errno);
+       if (received == -1) {
+               return map_nt_error_from_unix(sys_errno);
+       }
+       if (received == 0) {
+               return NT_STATUS_END_OF_FILE;
+       }
+       *preceived = received;
+       return NT_STATUS_OK;
+}
+
+static struct async_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);
+       return async_send(mem_ctx, ev, sock_transp->fd, data, size, 0);
+}
+
+static NTSTATUS rpc_sock_write_recv(struct async_req *req, ssize_t *psent)
+{
+       ssize_t sent;
+       int sys_errno;
+
+       sent = async_syscall_result_ssize_t(req, &sys_errno);
+       if (sent == -1) {
+               return map_nt_error_from_unix(sys_errno);
+       }
+       *psent = 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;
+       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;
+
+       *presult = result;
+       return NT_STATUS_OK;
+}