diff options
| author | Stefan Metzmacher <metze@samba.org> | 2014-01-14 14:19:56 +0100 |
|---|---|---|
| committer | Günther Deschner <gd@samba.org> | 2014-01-16 16:22:52 +0100 |
| commit | 9b2dc0e46c154dccdc2f567442bca86bd807b17b (patch) | |
| tree | 0a2c9b7c7d99ad993f2f59ff62e4064511f2c15a /source4/librpc/rpc | |
| parent | 040002523758e187d0485b07c87078bb3e371bed (diff) | |
| download | samba-9b2dc0e46c154dccdc2f567442bca86bd807b17b.tar.gz samba-9b2dc0e46c154dccdc2f567442bca86bd807b17b.tar.xz samba-9b2dc0e46c154dccdc2f567442bca86bd807b17b.zip | |
s4:librpc: remove dcerpc_event_context()
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Guenther Deschner <gd@samba.org>
Diffstat (limited to 'source4/librpc/rpc')
| -rw-r--r-- | source4/librpc/rpc/dcerpc.c | 17 | ||||
| -rw-r--r-- | source4/librpc/rpc/dcerpc.h | 1 |
2 files changed, 3 insertions, 15 deletions
diff --git a/source4/librpc/rpc/dcerpc.c b/source4/librpc/rpc/dcerpc.c index 4ede4bc72c1..23b3c377167 100644 --- a/source4/librpc/rpc/dcerpc.c +++ b/source4/librpc/rpc/dcerpc.c @@ -1558,7 +1558,7 @@ static struct rpc_request *dcerpc_request_send(TALLOC_CTX *mem_ctx, dcerpc_schedule_io_trigger(p->conn); if (p->request_timeout) { - tevent_add_timer(dcerpc_event_context(p), req, + tevent_add_timer(p->conn->event_ctx, req, timeval_current_ofs(p->request_timeout, 0), dcerpc_timeout_handler, req); } @@ -1752,17 +1752,6 @@ static void dcerpc_schedule_io_trigger(struct dcecli_connection *c) } /* - return the event context for a dcerpc pipe - used by callers who wish to operate asynchronously -*/ -_PUBLIC_ struct tevent_context *dcerpc_event_context(struct dcerpc_pipe *p) -{ - return p->conn->event_ctx; -} - - - -/* perform the receive side of a async dcerpc request */ static NTSTATUS dcerpc_request_recv(struct rpc_request *req, @@ -1772,7 +1761,7 @@ static NTSTATUS dcerpc_request_recv(struct rpc_request *req, NTSTATUS status; while (req->state != RPC_REQUEST_DONE) { - struct tevent_context *ctx = dcerpc_event_context(req->p); + struct tevent_context *ctx = req->p->conn->event_ctx; if (tevent_loop_once(ctx) != 0) { return NT_STATUS_CONNECTION_DISCONNECTED; } @@ -2233,7 +2222,7 @@ _PUBLIC_ NTSTATUS dcerpc_alter_context(struct dcerpc_pipe *p, /* TODO: create a new event context here */ - subreq = dcerpc_alter_context_send(mem_ctx, p->conn->event_ctx, + subreq = dcerpc_alter_context_send(mem_ctx, ev, p, syntax, transfer_syntax); if (subreq == NULL) { return NT_STATUS_NO_MEMORY; diff --git a/source4/librpc/rpc/dcerpc.h b/source4/librpc/rpc/dcerpc.h index 7075d8d878b..a0409dee38b 100644 --- a/source4/librpc/rpc/dcerpc.h +++ b/source4/librpc/rpc/dcerpc.h @@ -199,7 +199,6 @@ NTSTATUS dcerpc_bind_auth_schannel(TALLOC_CTX *tmp_ctx, struct cli_credentials *credentials, struct loadparm_context *lp_ctx, uint8_t auth_level); -struct tevent_context *dcerpc_event_context(struct dcerpc_pipe *p); NTSTATUS dcerpc_init(void); struct composite_context *dcerpc_secondary_smb_send(struct dcecli_connection *c1, struct dcecli_connection *c2, |