From 64b664155b16b0995af7cc87f54c613350127f9e Mon Sep 17 00:00:00 2001 From: Günther Deschner Date: Thu, 31 Mar 2011 00:34:28 +0200 Subject: s3-rpc_client: move rpc_cli_transport structs and protos to rpc_transport.h Guenther --- source3/include/client.h | 56 +----------------------------------------------- source3/include/proto.h | 25 --------------------- 2 files changed, 1 insertion(+), 80 deletions(-) (limited to 'source3/include') diff --git a/source3/include/client.h b/source3/include/client.h index 9f8f46c4ab..a4c52c3a06 100644 --- a/source3/include/client.h +++ b/source3/include/client.h @@ -48,61 +48,7 @@ struct print_job_info { time_t t; }; -/** - * rpc_cli_transport defines a transport mechanism to ship rpc requests - * asynchronously to a server and receive replies - */ - -struct rpc_cli_transport { - - enum dcerpc_transport_t transport; - - /** - * Trigger an async read from the server. May return a short read. - */ - struct tevent_req *(*read_send)(TALLOC_CTX *mem_ctx, - struct event_context *ev, - uint8_t *data, size_t size, - void *priv); - /** - * Get the result from the read_send operation. - */ - NTSTATUS (*read_recv)(struct tevent_req *req, ssize_t *preceived); - - /** - * Trigger an async write to the server. May return a short write. - */ - struct tevent_req *(*write_send)(TALLOC_CTX *mem_ctx, - struct event_context *ev, - const uint8_t *data, size_t size, - void *priv); - /** - * Get the result from the read_send operation. - */ - NTSTATUS (*write_recv)(struct tevent_req *req, ssize_t *psent); - - /** - * This is an optimization for the SMB transport. It models the - * TransactNamedPipe API call: Send and receive data in one round - * trip. The transport implementation is free to set this to NULL, - * cli_pipe.c will fall back to the explicit write/read routines. - */ - struct tevent_req *(*trans_send)(TALLOC_CTX *mem_ctx, - struct event_context *ev, - uint8_t *data, size_t data_len, - uint32_t max_rdata_len, - void *priv); - /** - * Get the result from the trans_send operation. - */ - NTSTATUS (*trans_recv)(struct tevent_req *req, TALLOC_CTX *mem_ctx, - uint8_t **prdata, uint32_t *prdata_len); - - bool (*is_connected)(void *priv); - unsigned int (*set_timeout)(void *priv, unsigned int timeout); - - void *priv; -}; +#include "rpc_client/rpc_transport.h" struct dcerpc_binding_handle; diff --git a/source3/include/proto.h b/source3/include/proto.h index a85b2f9e60..c550be212c 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -2731,31 +2731,6 @@ NTSTATUS get_schannel_session_key(struct cli_state *cli, uint32 *pneg_flags, struct rpc_pipe_client **presult); -/* The following definitions come from rpc_client/rpc_transport_np.c */ - -struct tevent_req *rpc_transport_np_init_send(TALLOC_CTX *mem_ctx, - struct event_context *ev, - struct cli_state *cli, - const struct ndr_syntax_id *abstract_syntax); -NTSTATUS rpc_transport_np_init_recv(struct tevent_req *req, - TALLOC_CTX *mem_ctx, - struct rpc_cli_transport **presult); -NTSTATUS rpc_transport_np_init(TALLOC_CTX *mem_ctx, struct cli_state *cli, - const struct ndr_syntax_id *abstract_syntax, - struct rpc_cli_transport **presult); - -/* 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/rpc_transport_tstream.c */ - -NTSTATUS rpc_transport_tstream_init(TALLOC_CTX *mem_ctx, - struct tstream_context **stream, - struct rpc_cli_transport **presult); -struct cli_state *rpc_pipe_np_smb_conn(struct rpc_pipe_client *p); - /* The following definitions come from rpc_server/rpc_handles.c */ size_t num_pipe_handles(struct pipes_struct *p); -- cgit