Changeset ee0e95f in code

Timestamp:

Mar 31, 2014, 2:14:10 PM (11 years ago)

Author:

Florian Obser <florian@…>

Branches:

master

Children:

dab4135

Parents:

cdd2ff5

Message:

new and public asr api; from eric@
OK mikeb

Files:

• Makefile (modified) (1 diff)
• dns.c (modified) (7 diffs)

Makefile

@@ -11 +11 @@
 CFLAGS+=        -Wshadow -Wpointer-arith -Wcast-qual -Wsign-compare
 
-# hook up asynchronous resolver
-CFLAGS+=        -I${BSDSRCDIR}/lib/libc/asr
-
 DPADD=          ${LIBEVENT}
 LDADD=          -levent

dns.c

@@ -24 +24 @@
 #include <sys/time.h>
 #include <netinet/in.h>
+#include <netdb.h>
 #include <errno.h>
 #include <event.h>
@@ -31 +32 @@
 #include <syslog.h>
 
-#include "asr.h"
+#include <asr.h>
 
 #include "icb.h"
@@ -37 +38 @@
 
 struct async_event;
-struct async_event *async_run_event(struct async *,
-    void (*)(int, struct async_res *, void *), void *);
-void dns_done(int, struct async_res *, void *);
+struct async_event *async_run_event(struct asr_query *,
+    void (*)(struct asr_result *, void *), void *);
+void dns_done(struct asr_result *, void *);
 
 extern int dodns;
 
 void
-dns_done(int ev __attribute__((__unused__)), struct async_res *ar, void *arg)
+dns_done(struct asr_result *ar, void *arg)
 {
         struct icb_session *is = arg;
@@ -64 +65 @@
 dns_rresolv(struct icb_session *is, struct sockaddr *sa)
 {
-        struct async *as;
+        struct asr_query *as;
 
         if (!dodns)
@@ -80 +81 @@
 
 struct async_event {
-        struct async    *async;
+        struct asr_query *async;
         struct event     ev;
-        void            (*callback)(int, struct async_res *, void *);
+        void            (*callback)(struct asr_result *, void *);
         void            *arg;
 };
@@ -89 +90 @@
 
 struct async_event *
-async_run_event(struct async * async,
-    void (*cb)(int, struct async_res *, void *), void *arg)
+async_run_event(struct asr_query *async,
+    void (*cb)(struct asr_result *, void *), void *arg)
 {
         struct async_event      *aev;
@@ -113 +114 @@
 {
         struct async_event      *aev = arg;
-        struct async_res         ar;
-        int                      r;
+        struct asr_result        ar;
         struct timeval           tv;
 
-        while ((r = asr_async_run(aev->async, &ar)) == ASYNC_YIELD)
-                aev->callback(r, &ar, aev->arg);
+        event_del(&aev->ev);
 
-        event_del(&aev->ev);
-        if (r == ASYNC_COND) {
+        if (asr_run(aev->async, &ar) == 0) {
                 event_set(&aev->ev, ar.ar_fd,
-                          ar.ar_cond == ASYNC_READ ? EV_READ : EV_WRITE,
-                          async_event_dispatch, aev);
+                    ar.ar_cond == ASR_WANT_READ ? EV_READ : EV_WRITE,
+                    async_event_dispatch, aev);
                 tv.tv_sec = ar.ar_timeout / 1000;
                 tv.tv_usec = (ar.ar_timeout % 1000) * 1000;
                 event_add(&aev->ev, &tv);
-        } else { /* ASYNC_DONE */
-                aev->callback(r, &ar, aev->arg);
+        } else { /* done */
+                aev->callback(&ar, aev->arg);
                 free(aev);
         }