lib/tsocket: add generic socket abstraction layer

[ira/wip.git] / lib / async_req / async_req.c

diff --git a/lib/async_req/async_req.c b/lib/async_req/async_req.c
index db47bd93ed1c733bf2074371587cc7cc012f1e57..4dfe809738e516f14cbc9423b65873a03f4c621a 100644 (file)
--- a/lib/async_req/async_req.c
+++ b/lib/async_req/async_req.c
@@ -174,7 +174,7 @@ bool async_post_error(struct async_req *req, struct tevent_context *ev,
 {
        req->error = error;
 
-       if (tevent_add_timer(ev, req, timeval_zero(),
+       if (tevent_add_timer(ev, req, tevent_timeval_zero(),
                            async_trigger, req) == NULL) {
                return false;
        }
@@ -194,47 +194,6 @@ bool async_req_is_error(struct async_req *req, enum async_req_state *state,
        return true;
 }
 
-static void async_req_timedout(struct tevent_context *ev,
-                              struct tevent_timer *te,
-                              struct timeval now,
-                              void *priv)
-{
-       struct async_req *req = talloc_get_type_abort(priv, struct async_req);
-       TALLOC_FREE(te);
-       async_req_finish(req, ASYNC_REQ_TIMED_OUT);
-}
-
-bool async_req_set_timeout(struct async_req *req, struct tevent_context *ev,
-                          struct timeval to)
-{
-       return (tevent_add_timer(
-                       ev, req, timeval_current_ofs(to.tv_sec, to.tv_usec),
-                       async_req_timedout, req)
-               != NULL);
-}
-
-struct async_req *async_wait_send(TALLOC_CTX *mem_ctx,
-                                 struct tevent_context *ev,
-                                 struct timeval to)
-{
-       struct async_req *result;
-
-       result = async_req_new(mem_ctx);
-       if (result == NULL) {
-               return result;
-       }
-       if (!async_req_set_timeout(result, ev, to)) {
-               TALLOC_FREE(result);
-               return NULL;
-       }
-       return result;
-}
-
-bool async_wait_recv(struct async_req *req)
-{
-       return true;
-}
-
 struct async_queue_entry {
        struct async_queue_entry *prev, *next;
        struct async_req_queue *queue;
@@ -300,7 +259,7 @@ bool async_req_enqueue(struct async_req_queue *queue, struct tevent_context *ev,
        if (!busy) {
                struct tevent_timer *te;
 
-               te = tevent_add_timer(ev, e, timeval_zero(),
+               te = tevent_add_timer(ev, e, tevent_timeval_zero(),
                                     async_req_immediate_trigger,
                                     e);
                if (te == NULL) {