summaryrefslogtreecommitdiff
path: root/source4/libcli/raw
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 /source4/libcli/raw
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
Diffstat (limited to 'source4/libcli/raw')
-rw-r--r--source4/libcli/raw/clitransport.c1
-rw-r--r--source4/libcli/raw/libcliraw.h2
-rw-r--r--source4/libcli/raw/rawrequest.c2
3 files changed, 4 insertions, 1 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;
}
}