summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2011-09-22 21:30:13 +0200
committerStefan Metzmacher <metze@samba.org>2011-11-24 19:02:33 +0100
commit378c21a72a2d4727b10fd871c43d61792ada0625 (patch)
treef1b28349d18f84d26edf66bf9f99ccea34b09952
parenta312a8c788385faf0d179a36ce226503a612943e (diff)
downloadsamba-378c21a72a2d4727b10fd871c43d61792ada0625.tar.gz
samba-378c21a72a2d4727b10fd871c43d61792ada0625.tar.bz2
samba-378c21a72a2d4727b10fd871c43d61792ada0625.zip
s4:torture/smb2: use tctx->ev as event context for polling
metze
-rw-r--r--source4/torture/smb2/lock.c2
-rw-r--r--source4/torture/smb2/notify.c10
-rw-r--r--source4/torture/smb2/oplock.c3
3 files changed, 7 insertions, 8 deletions
diff --git a/source4/torture/smb2/lock.c b/source4/torture/smb2/lock.c
index aee82929c1..3691830ce4 100644
--- a/source4/torture/smb2/lock.c
+++ b/source4/torture/smb2/lock.c
@@ -62,7 +62,7 @@
#define WAIT_FOR_ASYNC_RESPONSE(req) \
while (!req->cancel.can_cancel && req->state <= SMB2_REQUEST_RECV) { \
- if (tevent_loop_once(req->transport->socket->event.ctx) != 0) { \
+ if (tevent_loop_once(torture->ev) != 0) { \
break; \
} \
}
diff --git a/source4/torture/smb2/notify.c b/source4/torture/smb2/notify.c
index 0f0e866098..0e6d7025e2 100644
--- a/source4/torture/smb2/notify.c
+++ b/source4/torture/smb2/notify.c
@@ -101,7 +101,7 @@ static bool test_valid_request(struct torture_context *torture,
req = smb2_notify_send(tree, &n);
while (!req->cancel.can_cancel && req->state <= SMB2_REQUEST_RECV) {
- if (tevent_loop_once(req->transport->socket->event.ctx) != 0) {
+ if (tevent_loop_once(torture->ev) != 0) {
break;
}
}
@@ -123,7 +123,7 @@ static bool test_valid_request(struct torture_context *torture,
req = smb2_notify_send(tree, &n);
while (!req->cancel.can_cancel && req->state <= SMB2_REQUEST_RECV) {
- if (tevent_loop_once(req->transport->socket->event.ctx) != 0) {
+ if (tevent_loop_once(torture->ev) != 0) {
break;
}
}
@@ -142,7 +142,7 @@ static bool test_valid_request(struct torture_context *torture,
req = smb2_notify_send(tree, &n);
while (!req->cancel.can_cancel && req->state <= SMB2_REQUEST_RECV) {
- if (tevent_loop_once(req->transport->socket->event.ctx) != 0) {
+ if (tevent_loop_once(torture->ev) != 0) {
break;
}
}
@@ -174,7 +174,7 @@ static bool test_valid_request(struct torture_context *torture,
req = smb2_notify_send(tree, &n);
while (!req->cancel.can_cancel && req->state <= SMB2_REQUEST_RECV) {
- if (tevent_loop_once(req->transport->socket->event.ctx) != 0) {
+ if (tevent_loop_once(torture->ev) != 0) {
break;
}
}
@@ -188,7 +188,7 @@ static bool test_valid_request(struct torture_context *torture,
n.in.buffer_size = max_buffer_size;
req = smb2_notify_send(tree, &n);
while (!req->cancel.can_cancel && req->state <= SMB2_REQUEST_RECV) {
- if (tevent_loop_once(req->transport->socket->event.ctx) != 0) {
+ if (tevent_loop_once(torture->ev) != 0) {
break;
}
}
diff --git a/source4/torture/smb2/oplock.c b/source4/torture/smb2/oplock.c
index 5b12e135b7..d489943986 100644
--- a/source4/torture/smb2/oplock.c
+++ b/source4/torture/smb2/oplock.c
@@ -3582,8 +3582,7 @@ bool test_smb2_hold_oplock(struct torture_context *tctx,
struct smb2_tree *tree)
{
struct torture_context *mem_ctx = talloc_new(tctx);
- struct tevent_context *ev =
- (struct tevent_context *)tree->session->transport->socket->event.ctx;
+ struct tevent_context *ev = tctx->ev;
int i;
struct smb2_handle h;
NTSTATUS status;