X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=adns.git;a=blobdiff_plain;f=src%2Fadns-internal.h;fp=src%2Fadns-internal.h;h=08a29488ab6c638fe8a7b078b6404b8794dbe2c7;hp=7caba2f6d9db024cbe701c3b279a6b522f4c32f7;hb=c6bc229718c914227b46c18bd8511abaf9cd0135;hpb=84fe28dbf1b4d178b54d84becc0ee91c1b2db5d4

diff --git a/src/adns-internal.h b/src/adns-internal.h
index 7caba2f..08a2948 100644
--- a/src/adns-internal.h
+++ b/src/adns-internal.h
@@ -23,6 +23,7 @@ union adns__align {
 };
 
 struct adns__query {
+  /* FIXME: make sure this is all init'd properly */
   adns_query back, next;
   adns_query parent;
   struct { adns_query head, tail; } children;
@@ -47,18 +48,21 @@ struct adns__query {
    */
 };
 
+struct adns__vbuf {
+  size_t used, avail;
+  unsigned char *buf;
+};
+
 struct adns__state {
+  /* FIXME: make sure this is all init'd properly */
   adns_initflags iflags;
   struct { adns_query head, tail; } tosend, timew, childw, output;
   int nextid, udpsocket;
-  int qbufavail, tcpbufavail, tcpbufused, tcpbufdone;
-  unsigned char *qbuf, *tcpbuf;
+  adns_vbuf rqbuf, tcpsend, tcprecv;
   int nservers, tcpserver;
-  enum { server_disc, server_connecting, server_ok } tcpstate;
+  enum adns__tcpstate { server_disc, server_connecting, server_ok } tcpstate;
   int tcpsocket;
   struct timeval tcptimeout;
-  int opbufavail, opbufused;
-  unsigned char *opbuf;
   struct server {
     struct in_addr addr;
   } servers[MAXSERVERS];