summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2011-11-22 09:36:30 +0100
committerStefan Metzmacher <metze@samba.org>2011-11-29 16:00:08 +0100
commitb3d3395e01a015b440a84878c4d540dbaa437a32 (patch)
treecacebbfa1feaeb88fa8e724a0346c4bac0db7bc1
parent511dc9358d8954f9ef04c01fb7cc3f776625c1f2 (diff)
downloadsamba-b3d3395e01a015b440a84878c4d540dbaa437a32.tar.gz
samba-b3d3395e01a015b440a84878c4d540dbaa437a32.tar.bz2
samba-b3d3395e01a015b440a84878c4d540dbaa437a32.zip
s4:libcli/raw: add transport->ev as copy of transport->socket->event.ctx
We'll remove transport->socket soon, but removing transport->ev will take a bit longer. metze
-rw-r--r--source4/libcli/raw/clitransport.c1
-rw-r--r--source4/libcli/raw/libcliraw.h2
-rw-r--r--source4/libcli/raw/rawrequest.c2
-rw-r--r--source4/libcli/smb_composite/appendacl.c2
-rw-r--r--source4/libcli/smb_composite/loadfile.c2
-rw-r--r--source4/libcli/smb_composite/savefile.c2
-rw-r--r--source4/libcli/smb_composite/sesssetup.c2
-rw-r--r--source4/libcli/util/clilsa.c2
8 files changed, 9 insertions, 6 deletions
diff --git a/source4/libcli/raw/clitransport.c b/source4/libcli/raw/clitransport.c
index b8df09ece3..6f87e00808 100644
--- a/source4/libcli/raw/clitransport.c
+++ b/source4/libcli/raw/clitransport.c
@@ -88,6 +88,7 @@ struct smbcli_transport *smbcli_transport_init(struct smbcli_socket *sock,
transport->socket = talloc_reference(transport, sock);
}
transport->negotiate.protocol = PROTOCOL_NT1;
+ transport->ev = sock->event.ctx;
transport->options = *options;
transport->negotiate.max_xmit = transport->options.max_xmit;
diff --git a/source4/libcli/raw/libcliraw.h b/source4/libcli/raw/libcliraw.h
index b7b02c668e..1009f4353a 100644
--- a/source4/libcli/raw/libcliraw.h
+++ b/source4/libcli/raw/libcliraw.h
@@ -108,6 +108,8 @@ struct smbcli_options {
/* this is the context for the client transport layer */
struct smbcli_transport {
+ struct tevent_context *ev; /* TODO: remove this !!! */
+
/* socket level info */
struct smbcli_socket *socket;
diff --git a/source4/libcli/raw/rawrequest.c b/source4/libcli/raw/rawrequest.c
index 3b0cf7cabb..ae68fb0cd3 100644
--- a/source4/libcli/raw/rawrequest.c
+++ b/source4/libcli/raw/rawrequest.c
@@ -358,7 +358,7 @@ bool smbcli_request_receive(struct smbcli_request *req)
/* keep receiving packets until this one is replied to */
while (req->state <= SMBCLI_REQUEST_RECV) {
- if (tevent_loop_once(req->transport->socket->event.ctx) != 0) {
+ if (tevent_loop_once(req->transport->ev) != 0) {
return false;
}
}
diff --git a/source4/libcli/smb_composite/appendacl.c b/source4/libcli/smb_composite/appendacl.c
index c1a964f151..792ea5a47e 100644
--- a/source4/libcli/smb_composite/appendacl.c
+++ b/source4/libcli/smb_composite/appendacl.c
@@ -247,7 +247,7 @@ struct composite_context *smb_composite_appendacl_send(struct smbcli_tree *tree,
c->private_data = state;
c->state = COMPOSITE_STATE_IN_PROGRESS;
- c->event_ctx = tree->session->transport->socket->event.ctx;
+ c->event_ctx = tree->session->transport->ev;
/* setup structures for opening file */
state->io_open = talloc_zero(c, union smb_open);
diff --git a/source4/libcli/smb_composite/loadfile.c b/source4/libcli/smb_composite/loadfile.c
index 994c29c77d..00456f18a4 100644
--- a/source4/libcli/smb_composite/loadfile.c
+++ b/source4/libcli/smb_composite/loadfile.c
@@ -229,7 +229,7 @@ struct composite_context *smb_composite_loadfile_send(struct smbcli_tree *tree,
c->private_data = state;
c->state = COMPOSITE_STATE_IN_PROGRESS;
- c->event_ctx = tree->session->transport->socket->event.ctx;
+ c->event_ctx = tree->session->transport->ev;
/* setup for the open */
state->io_open = talloc_zero(c, union smb_open);
diff --git a/source4/libcli/smb_composite/savefile.c b/source4/libcli/smb_composite/savefile.c
index 25a35c01a9..2f00443083 100644
--- a/source4/libcli/smb_composite/savefile.c
+++ b/source4/libcli/smb_composite/savefile.c
@@ -225,7 +225,7 @@ struct composite_context *smb_composite_savefile_send(struct smbcli_tree *tree,
if (c == NULL) goto failed;
c->state = COMPOSITE_STATE_IN_PROGRESS;
- c->event_ctx = tree->session->transport->socket->event.ctx;
+ c->event_ctx = tree->session->transport->ev;
state = talloc(c, struct savefile_state);
if (state == NULL) goto failed;
diff --git a/source4/libcli/smb_composite/sesssetup.c b/source4/libcli/smb_composite/sesssetup.c
index 8b1571cc49..cafaacd8bb 100644
--- a/source4/libcli/smb_composite/sesssetup.c
+++ b/source4/libcli/smb_composite/sesssetup.c
@@ -548,7 +548,7 @@ struct composite_context *smb_composite_sesssetup_send(struct smbcli_session *se
struct sesssetup_state *state;
NTSTATUS status;
- c = composite_create(session, session->transport->socket->event.ctx);
+ c = composite_create(session, session->transport->ev);
if (c == NULL) return NULL;
state = talloc_zero(c, struct sesssetup_state);
diff --git a/source4/libcli/util/clilsa.c b/source4/libcli/util/clilsa.c
index 4cfdf93725..4a81457569 100644
--- a/source4/libcli/util/clilsa.c
+++ b/source4/libcli/util/clilsa.c
@@ -79,7 +79,7 @@ static NTSTATUS smblsa_connect(struct smbcli_state *cli)
}
lsa->ipc_tree->tid = tcon.tconx.out.tid;
- lsa->pipe = dcerpc_pipe_init(lsa, cli->transport->socket->event.ctx);
+ lsa->pipe = dcerpc_pipe_init(lsa, cli->transport->ev);
if (lsa->pipe == NULL) {
talloc_free(lsa);
return NT_STATUS_NO_MEMORY;