summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2009-05-10 10:49:18 +0200
committerVolker Lendecke <vl@samba.org>2009-05-24 13:45:35 +0200
commit1a69ba894514dd4eaba9fa015bdf930a5b620fea (patch)
treef60a5ca1a8440401be8c5544ce185ab0e3d222e7
parent8c39931eb3edfd685fb9f9a9b28bd89bc2deede5 (diff)
downloadsamba-1a69ba894514dd4eaba9fa015bdf930a5b620fea.tar.gz
samba-1a69ba894514dd4eaba9fa015bdf930a5b620fea.tar.bz2
samba-1a69ba894514dd4eaba9fa015bdf930a5b620fea.zip
Allow NULL queue to writev_send
-rw-r--r--lib/async_req/async_sock.c22
1 files changed, 16 insertions, 6 deletions
diff --git a/lib/async_req/async_sock.c b/lib/async_req/async_sock.c
index 543972815d..a3a6d75f3a 100644
--- a/lib/async_req/async_sock.c
+++ b/lib/async_req/async_sock.c
@@ -337,11 +337,11 @@ struct tevent_req *writev_send(TALLOC_CTX *mem_ctx, struct tevent_context *ev,
struct tevent_queue *queue, int fd,
struct iovec *iov, int count)
{
- struct tevent_req *result;
+ struct tevent_req *req;
struct writev_state *state;
- result = tevent_req_create(mem_ctx, &state, struct writev_state);
- if (result == NULL) {
+ req = tevent_req_create(mem_ctx, &state, struct writev_state);
+ if (req == NULL) {
return NULL;
}
state->ev = ev;
@@ -354,12 +354,22 @@ struct tevent_req *writev_send(TALLOC_CTX *mem_ctx, struct tevent_context *ev,
goto fail;
}
- if (!tevent_queue_add(queue, ev, result, writev_trigger, NULL)) {
+ if (queue == NULL) {
+ struct tevent_fd *fde;
+ fde = tevent_add_fd(state->ev, state, state->fd,
+ TEVENT_FD_WRITE, writev_handler, req);
+ if (tevent_req_nomem(fde, req)) {
+ return tevent_req_post(req, ev);
+ }
+ return req;
+ }
+
+ if (!tevent_queue_add(queue, ev, req, writev_trigger, NULL)) {
goto fail;
}
- return result;
+ return req;
fail:
- TALLOC_FREE(result);
+ TALLOC_FREE(req);
return NULL;
}