--- cvsroot/EV-ADNS/ADNS.xs	2007/12/01 15:54:40	1.5
+++ cvsroot/EV-ADNS/ADNS.xs	2007/12/07 23:54:13	1.12
@@ -7,9 +7,6 @@
 
 #include "EVAPI.h"
 
-static HV *stash;
-static adns_state ads;
-
 struct ctx
 {
   SV *self;
@@ -17,13 +14,24 @@
   SV *cb;
 };
 
+static SV *
+ha2sv (adns_rr_hostaddr *rr)
+{
+  AV *av = newAV ();
+  av_push (av, newSVpv (rr->host, 0));
+  // TODO: add addresses
+
+  return newRV_noinc ((SV *)av);
+}
+
 static void
-process ()
+process (adns_state ads)
 {
   dSP;
 
   for (;;)
     {
+      int i;
       adns_query q = 0;
       adns_answer *a;
       void *ctx;
@@ -31,7 +39,6 @@
       struct ctx *c;
       int r = adns_check (ads, &q, &a, &ctx);
       
-      printf ("check %d\n", r);//D
       if (r)
         break;
 
@@ -39,10 +46,160 @@
       cb = c->cb;
       c->cb = 0;
       ev_unref ();
+      SvREFCNT_dec (c->self);
 
       PUSHMARK (SP);
 
-      XPUSHs (sv_2mortal (newSViv (a->status)));
+      EXTEND (SP, a->nrrs + 2);
+      PUSHs (sv_2mortal (newSViv (a->status)));
+      PUSHs (sv_2mortal (newSViv (a->expires)));
+
+      for (i = 0; i < a->nrrs; ++i)
+        {
+          SV *sv;
+
+          switch (a->type & adns_r_unknown ? adns_r_unknown : a->type)
+            {
+              case adns_r_ns_raw:
+              case adns_r_cname:
+              case adns_r_ptr:
+              case adns_r_ptr_raw:
+                sv = newSVpv (a->rrs.str [i], 0);
+                break;
+
+              case adns_r_txt:
+                {
+                  AV *av = newAV ();
+                  adns_rr_intstr *rr = a->rrs.manyistr [i];
+
+                  while (rr->str)
+                    {
+                      av_push (av, newSVpvn (rr->str, rr->i));
+                      ++rr;
+                    }
+
+                  sv = newRV_noinc ((SV *)av);
+                }
+                break;
+
+              case adns_r_a:
+                sv = newSVpv (inet_ntoa (a->rrs.inaddr [i]), 0);
+                break;
+
+              case adns_r_ns:
+                sv = ha2sv (a->rrs.hostaddr + i);
+                break;
+
+              case adns_r_hinfo:
+                {
+                  /* untested */
+                  AV *av = newAV ();
+                  adns_rr_intstrpair *rr = a->rrs.intstrpair + i;
+
+                  av_push (av, newSVpvn (rr->array [0].str, rr->array [0].i));
+                  av_push (av, newSVpvn (rr->array [1].str, rr->array [1].i));
+
+                  sv = newRV_noinc ((SV *)av);
+                }
+                break;
+
+              case adns_r_rp:
+              case adns_r_rp_raw:
+                {
+                  /* untested */
+                  AV *av = newAV ();
+                  adns_rr_strpair *rr = a->rrs.strpair + i;
+
+                  av_push (av, newSVpv (rr->array [0], 0));
+                  av_push (av, newSVpv (rr->array [1], 0));
+
+                  sv = newRV_noinc ((SV *)av);
+                }
+                break;
+
+              case adns_r_mx:
+                {
+                  AV *av = newAV ();
+                  adns_rr_inthostaddr *rr = a->rrs.inthostaddr + i;
+
+                  av_push (av, newSViv (rr->i));
+                  av_push (av, ha2sv (&rr->ha));
+
+                  sv = newRV_noinc ((SV *)av);
+                }
+                break;
+
+              case adns_r_mx_raw:
+                {
+                  AV *av = newAV ();
+                  adns_rr_intstr *rr = a->rrs.intstr + i;
+
+                  av_push (av, newSViv (rr->i));
+                  av_push (av, newSVpv (rr->str, 0));
+
+                  sv = newRV_noinc ((SV *)av);
+                }
+                break;
+
+              case adns_r_soa:
+              case adns_r_soa_raw:
+                {
+                  AV *av = newAV ();
+                  adns_rr_soa *rr = a->rrs.soa + i;
+
+                  av_push (av, newSVpv (rr->mname, 0));
+                  av_push (av, newSVpv (rr->rname, 0));
+                  av_push (av, newSVuv (rr->serial));
+                  av_push (av, newSVuv (rr->refresh));
+                  av_push (av, newSVuv (rr->retry));
+                  av_push (av, newSVuv (rr->expire));
+                  av_push (av, newSVuv (rr->minimum));
+
+                  sv = newRV_noinc ((SV *)av);
+                }
+                break;
+
+              case adns_r_srv_raw:
+                {
+                  AV *av = newAV ();
+                  adns_rr_srvraw *rr = a->rrs.srvraw + i;
+
+                  av_push (av, newSViv (rr->priority));
+                  av_push (av, newSViv (rr->weight));
+                  av_push (av, newSViv (rr->port));
+                  av_push (av, newSVpv (rr->host, 0));
+
+                  sv = newRV_noinc ((SV *)av);
+                }
+                break;
+
+              case adns_r_srv:
+                {
+                  AV *av = newAV ();
+                  adns_rr_srvha *rr = a->rrs.srvha + i;
+
+                  av_push (av, newSViv (rr->priority));
+                  av_push (av, newSViv (rr->weight));
+                  av_push (av, newSViv (rr->port));
+                  av_push (av, ha2sv (&rr->ha));
+
+                  sv = newRV_noinc ((SV *)av);
+                }
+                break;
+
+              case adns_r_unknown:
+                sv = newSVpvn (a->rrs.byteblock [i].data, a->rrs.byteblock [i].len);
+                break;
+
+              default:
+              case adns_r_addr:
+                sv = &PL_sv_undef; /* not supported */
+                break;
+            }
+
+          PUSHs (sv_2mortal (sv));
+        }
+
       free (a);
 
       PUTBACK;
@@ -50,7 +207,6 @@
       SPAGAIN;
 
       SvREFCNT_dec (cb);
-      SvREFCNT_dec (c->self);
     }
 }
 
@@ -58,7 +214,8 @@
 static int nfd, mfd;
 static ev_io *iow;
 static ev_timer tw;
-static ev_prepare prepare_ev;
+static ev_idle iw;
+static ev_prepare pw;
 static struct timeval tv_now;
 
 static void
@@ -67,17 +224,28 @@
   ev_tstamp t = ev_now ();
 
   tv_now.tv_sec  = (long)t;
-  tv_now.tv_usec = (long)((t - (ev_tstamp)tv_now.tv_sec) * 1e-6);
+  tv_now.tv_usec = (long)((t - (ev_tstamp)tv_now.tv_sec) * 1e6);
+}
+
+static void
+idle_cb (EV_P_ ev_idle *w, int revents)
+{
+  ev_idle_stop (EV_A_ w);
 }
 
 static void
 timer_cb (EV_P_ ev_timer *w, int revents)
 {
+  adns_state ads = (adns_state)w->data;
+  update_now ();
+
+  adns_processtimeouts (ads, &tv_now);
 }
 
 static void
 io_cb (EV_P_ ev_io *w, int revents)
 {
+  adns_state ads = (adns_state)w->data;
   update_now (EV_A);
 
   if (revents & EV_READ ) adns_processreadable  (ads, w->fd, &tv_now);
@@ -90,14 +258,24 @@
 {
   int i;
   int timeout = 3600000;
+  adns_state ads = (adns_state)w->data;
+
+  if (ev_is_active (&tw))
+    {
+      ev_ref ();
+      ev_timer_stop (EV_A_ &tw);
+    }
 
-  ev_timer_stop (EV_A_ &tw);
+  if (ev_is_active (&iw))
+    ev_idle_stop (EV_A_ &iw);
 
   for (i = 0; i < nfd; ++i)
-    ev_io_stop (EV_A_ iow + i);
-
-  process ();
+    {
+      ev_ref ();
+      ev_io_stop (EV_A_ iow + i);
+    }
 
+  process (ads);
   update_now (EV_A);
 
   nfd = mfd;
@@ -106,14 +284,13 @@
     {
       mfd = nfd;
 
-      free (iow); iow = malloc (mfd * sizeof (struct pollfd));
-      free (fds); fds = malloc (mfd * sizeof (ev_io));
+      free (iow); iow = malloc (mfd * sizeof (ev_io));
+      free (fds); fds = malloc (mfd * sizeof (struct pollfd));
     }
 
-  printf ("to %d\n", timeout);//d
-
   ev_timer_set (&tw, timeout * 1e-3, 0.);
   ev_timer_start (EV_A_ &tw);
+  ev_unref ();
 
   // create one ev_io per pollfd
   for (i = 0; i < nfd; ++i)
@@ -123,9 +300,13 @@
          | (fds [i].events & POLLOUT ? EV_WRITE : 0)));
 
       ev_io_start (EV_A_ iow + i);
+      ev_unref ();
     }
 }
 
+static HV *stash;
+static adns_state ads;
+
 MODULE = EV::ADNS                PACKAGE = EV::ADNS
 
 PROTOTYPES: ENABLE
@@ -222,12 +403,17 @@
 
   I_EV_API ("EV::ADNS");
 
-  ev_prepare_init (&prepare_ev, prepare_cb); ev_prepare_start (EV_DEFAULT_ &prepare_ev);
+  adns_init (&ads, adns_if_noenv | adns_if_noerrprint | adns_if_noserverwarn | adns_if_noautosys, 0);
+
+  ev_prepare_init (&pw, prepare_cb);
+  pw.data = (void *)ads;
+  ev_prepare_start (EV_DEFAULT_ &pw);
   ev_unref ();
 
+  ev_init (&iw, idle_cb); ev_set_priority (&iw, EV_MINPRI);
+  iw.data = (void *)ads;
   ev_init (&tw, timer_cb);
-
-  adns_init (&ads, adns_if_noenv | adns_if_noerrprint | adns_if_noserverwarn | adns_if_noautosys, 0);
+  tw.data = (void *)ads;
 }
 
 void submit (char *owner, int type, int flags, SV *cb)
@@ -240,6 +426,7 @@
         if (r)
           {
             SvREFCNT_dec (csv);
+            errno = r;
             XSRETURN_EMPTY;
           }
         else
@@ -247,9 +434,13 @@
             ev_ref ();
             SvPOK_only (csv);
             SvCUR_set (csv, sizeof (struct ctx));
+
             c->self = csv;
             c->cb   = newSVsv (cb);
 
+            if (!ev_is_active (&iw))
+              ev_idle_start (EV_A_ &iw);
+
             if (GIMME_V != G_VOID)
               {
                 csv = sv_2mortal (newRV_inc (csv));
@@ -260,6 +451,8 @@
 }
 
 void DESTROY (SV *req)
+	ALIAS:
+        cancel = 1
 	CODE:
 {
         struct ctx *c;
@@ -273,8 +466,10 @@
         if (c->cb)
           {
             ev_unref ();
-            adns_cancel (c->query);
             SvREFCNT_dec (c->cb);
+            c->cb = 0;
+            adns_cancel (c->query);
+            SvREFCNT_dec (c->self);
           }
 }