From c774a50aaf12924ff89430ae9d91e77d97616c72 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Fri, 11 Mar 2011 08:27:00 +0100 Subject: s4:librpc/rpc: s/struct dcerpc_connection/struct dcecli_connection/g The name 'struct dcerpc_connection' will be used in the new generic dcerpc code. It will be used for client and server. metze --- source4/librpc/rpc/dcerpc_smb.c | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) (limited to 'source4/librpc/rpc/dcerpc_smb.c') diff --git a/source4/librpc/rpc/dcerpc_smb.c b/source4/librpc/rpc/dcerpc_smb.c index 5a404556c8f..395e0672558 100644 --- a/source4/librpc/rpc/dcerpc_smb.c +++ b/source4/librpc/rpc/dcerpc_smb.c @@ -39,7 +39,7 @@ struct smb_private { /* tell the dcerpc layer that the transport is dead */ -static void pipe_dead(struct dcerpc_connection *c, NTSTATUS status) +static void pipe_dead(struct dcecli_connection *c, NTSTATUS status) { struct smb_private *smb = (struct smb_private *)c->transport.private_data; @@ -67,7 +67,7 @@ static void pipe_dead(struct dcerpc_connection *c, NTSTATUS status) this holds the state of an in-flight call */ struct smb_read_state { - struct dcerpc_connection *c; + struct dcecli_connection *c; struct smbcli_request *req; size_t received; DATA_BLOB data; @@ -110,7 +110,7 @@ static void smb_read_callback(struct smbcli_request *req) if (frag_length <= state->received) { DATA_BLOB data = state->data; - struct dcerpc_connection *c = state->c; + struct dcecli_connection *c = state->c; data.length = state->received; talloc_steal(state->c, data.data); talloc_free(state); @@ -141,7 +141,7 @@ static void smb_read_callback(struct smbcli_request *req) trigger a read request from the server, possibly with some initial data in the read buffer */ -static NTSTATUS send_read_request_continue(struct dcerpc_connection *c, DATA_BLOB *blob) +static NTSTATUS send_read_request_continue(struct dcecli_connection *c, DATA_BLOB *blob) { struct smb_private *smb = (struct smb_private *)c->transport.private_data; union smb_read *io; @@ -197,7 +197,7 @@ static NTSTATUS send_read_request_continue(struct dcerpc_connection *c, DATA_BLO /* trigger a read request from the server */ -static NTSTATUS send_read_request(struct dcerpc_connection *c) +static NTSTATUS send_read_request(struct dcecli_connection *c) { struct smb_private *smb = (struct smb_private *)c->transport.private_data; @@ -212,7 +212,7 @@ static NTSTATUS send_read_request(struct dcerpc_connection *c) this holds the state of an in-flight trans call */ struct smb_trans_state { - struct dcerpc_connection *c; + struct dcecli_connection *c; struct smbcli_request *req; struct smb_trans2 *trans; }; @@ -223,7 +223,7 @@ struct smb_trans_state { static void smb_trans_callback(struct smbcli_request *req) { struct smb_trans_state *state = (struct smb_trans_state *)req->async.private_data; - struct dcerpc_connection *c = state->c; + struct dcecli_connection *c = state->c; NTSTATUS status; status = smb_raw_trans_recv(req, state, state->trans); @@ -249,7 +249,7 @@ static void smb_trans_callback(struct smbcli_request *req) /* send a SMBtrans style request */ -static NTSTATUS smb_send_trans_request(struct dcerpc_connection *c, DATA_BLOB *blob) +static NTSTATUS smb_send_trans_request(struct dcecli_connection *c, DATA_BLOB *blob) { struct smb_private *smb = (struct smb_private *)c->transport.private_data; struct smb_trans2 *trans; @@ -306,7 +306,7 @@ static NTSTATUS smb_send_trans_request(struct dcerpc_connection *c, DATA_BLOB *b */ static void smb_write_callback(struct smbcli_request *req) { - struct dcerpc_connection *c = (struct dcerpc_connection *)req->async.private_data; + struct dcecli_connection *c = (struct dcecli_connection *)req->async.private_data; if (!NT_STATUS_IS_OK(req->status)) { DEBUG(0,("dcerpc_smb: write callback error\n")); @@ -319,7 +319,7 @@ static void smb_write_callback(struct smbcli_request *req) /* send a packet to the server */ -static NTSTATUS smb_send_request(struct dcerpc_connection *c, DATA_BLOB *blob, +static NTSTATUS smb_send_request(struct dcecli_connection *c, DATA_BLOB *blob, bool trigger_read) { struct smb_private *smb = (struct smb_private *)c->transport.private_data; @@ -370,7 +370,7 @@ static void free_request(struct smbcli_request *req) /* shutdown SMB pipe connection */ -static NTSTATUS smb_shutdown_pipe(struct dcerpc_connection *c, NTSTATUS status) +static NTSTATUS smb_shutdown_pipe(struct dcecli_connection *c, NTSTATUS status) { struct smb_private *smb = (struct smb_private *)c->transport.private_data; union smb_close io; @@ -397,7 +397,7 @@ static NTSTATUS smb_shutdown_pipe(struct dcerpc_connection *c, NTSTATUS status) /* return SMB server name (called name) */ -static const char *smb_peer_name(struct dcerpc_connection *c) +static const char *smb_peer_name(struct dcecli_connection *c) { struct smb_private *smb = (struct smb_private *)c->transport.private_data; if (smb == NULL) return ""; @@ -407,7 +407,7 @@ static const char *smb_peer_name(struct dcerpc_connection *c) /* return remote name we make the actual connection (good for kerberos) */ -static const char *smb_target_hostname(struct dcerpc_connection *c) +static const char *smb_target_hostname(struct dcecli_connection *c) { struct smb_private *smb = talloc_get_type(c->transport.private_data, struct smb_private); if (smb == NULL) return ""; @@ -417,7 +417,7 @@ static const char *smb_target_hostname(struct dcerpc_connection *c) /* fetch the user session key */ -static NTSTATUS smb_session_key(struct dcerpc_connection *c, DATA_BLOB *session_key) +static NTSTATUS smb_session_key(struct dcecli_connection *c, DATA_BLOB *session_key) { struct smb_private *smb = (struct smb_private *)c->transport.private_data; @@ -431,7 +431,7 @@ static NTSTATUS smb_session_key(struct dcerpc_connection *c, DATA_BLOB *session_ struct pipe_open_smb_state { union smb_open *open; - struct dcerpc_connection *c; + struct dcecli_connection *c; struct smbcli_tree *tree; struct composite_context *ctx; }; @@ -445,7 +445,7 @@ struct composite_context *dcerpc_pipe_open_smb_send(struct dcerpc_pipe *p, struct composite_context *ctx; struct pipe_open_smb_state *state; struct smbcli_request *req; - struct dcerpc_connection *c = p->conn; + struct dcecli_connection *c = p->conn; /* if we don't have a binding on this pipe yet, then create one */ if (p->binding == NULL) { @@ -515,7 +515,7 @@ static void pipe_open_recv(struct smbcli_request *req) struct pipe_open_smb_state *state = talloc_get_type(req->async.private_data, struct pipe_open_smb_state); struct composite_context *ctx = state->ctx; - struct dcerpc_connection *c = state->c; + struct dcecli_connection *c = state->c; struct smb_private *smb; ctx->status = smb_raw_open_recv(req, state, state->open); @@ -571,7 +571,7 @@ _PUBLIC_ NTSTATUS dcerpc_pipe_open_smb(struct dcerpc_pipe *p, /* return the SMB tree used for a dcerpc over SMB pipe */ -_PUBLIC_ struct smbcli_tree *dcerpc_smb_tree(struct dcerpc_connection *c) +_PUBLIC_ struct smbcli_tree *dcerpc_smb_tree(struct dcecli_connection *c) { struct smb_private *smb; @@ -586,7 +586,7 @@ _PUBLIC_ struct smbcli_tree *dcerpc_smb_tree(struct dcerpc_connection *c) /* return the SMB fnum used for a dcerpc over SMB pipe (hack for torture operations) */ -_PUBLIC_ uint16_t dcerpc_smb_fnum(struct dcerpc_connection *c) +_PUBLIC_ uint16_t dcerpc_smb_fnum(struct dcecli_connection *c) { struct smb_private *smb; -- cgit v1.2.1