More reply stuff.

[adns.git] / src / internal.h

diff --git a/src/internal.h b/src/internal.h
index eaa3a6dfc8902a21525ef4f3210efb23d6388707..cd58d7a2d46135f9069919ed70f9cda76df65948 100644 (file)
--- a/src/internal.h
+++ b/src/internal.h
@@ -3,6 +3,13 @@
 #ifndef ADNS_INTERNAL_H_INCLUDED
 #define ADNS_INTERNAL_H_INCLUDED
 
+#define PRINTFFORMAT(a,b) __attribute__((format(printf,a,b)))
+typedef unsigned char byte;
+
+#include <stdarg.h>
+#include <assert.h>
+#include <unistd.h>
+
 #include <sys/time.h>
 
 #include "adns.h"
@@ -10,43 +17,61 @@
 /* Configuration and constants */
 
 #define MAXSERVERS 5
-#define MAXUDPRETRIES 15
+#define UDPMAXRETRIES /*15*/5
 #define UDPRETRYMS 2000
 #define TCPMS 30000
 #define LOCALRESOURCEMS 20
-#define UDPMAXDGRAM 512
-#define NSPORT 53
+
+#define DNS_UDPPORT 53
+#define DNS_MAXUDP 512
+#define DNS_MAXDOMAIN 255
+#define DNS_HDRSIZE 12
+#define DNS_CLASS_IN 1
 
 /* Shared data structures */
 
-union adns__align {
+typedef union {
   adns_status status;
   char *cp;
   adns_rrtype type;
-  int int;
+  int i;
   struct in_addr ia;
   unsigned long ul;
-};
+} rr_align;
+
+typedef struct {
+  int used, avail;
+  byte *buf;
+} vbuf;
+
+typedef union {
+  void *ext;
+  int dmaddr_index;
+} qcontext;
+
+typedef struct {
+  unsigned long searchkey; /* flags and typecode swapped */
+  adns_rrtype type;
+} typeinfo;
 
 struct adns__query {
   /* FIXME: make sure this is all init'd properly */
   enum { query_udp, query_tcpwait, query_tcpsent, query_child, query_done } state;
-  adns_query back, next;
-  adns_query parent;
+  adns_query back, next, parent;
   struct { adns_query head, tail; } children;
   struct { adns_query back, next; } siblings;
-  adns_rrtype type;
-  adns_answer *answer;
-  size_t ansalloc; ansused;
+  
+  const typeinfo *typei;
+  vbuf ans;
   int id, flags, udpretries;
-  int nextudpserver;
-  unsigned long sentudp, failedtcp; /* bitmap indexed by server */
+  int udpnextserver;
+  unsigned long udpsent, tcpfailed; /* bitmap indexed by server */
   struct timeval timeout;
-  void *context;
-  unsigned char *querymsg;
+  byte *querymsg;
   int querylen;
+  qcontext context;
   char owner[1];
-  /* After the owner name and nul comes the query message */
+  /* After the owner name and nul comes the query message, pointed to by querymsg */
 
   /* Possible states:
    *
@@ -101,21 +126,14 @@ struct adns__query {
    */
 };
 
-typedef struct {
-  size_t used, avail;
-  unsigned char *buf;
-} adns__vbuf;
-
 struct adns__state {
-  /* FIXME: make sure this is all init'd properly */
   adns_initflags iflags;
   FILE *diagfile;
   struct { adns_query head, tail; } timew, childw, output;
-  int nextid, udpsocket;
-  adns_vbuf rqbuf, tcpsend, tcprecv;
+  int nextid, udpsocket, tcpsocket;
+  vbuf rqbuf, tcpsend, tcprecv;
   int nservers, tcpserver;
   enum adns__tcpstate { server_disconnected, server_connecting, server_ok } tcpstate;
-  int tcpsocket;
   struct timeval tcptimeout;
   struct server {
     struct in_addr addr;
@@ -124,19 +142,23 @@ struct adns__state {
 
 /* From setup.c: */
 
-void adns__vdiag(adns_state ads, adns_initflags prevent, const char *pfx,
+void adns__vdiag(adns_state ads, const char *pfx, adns_initflags prevent,
                 int serv, const char *fmt, va_list al);
 void adns__debug(adns_state ads, int serv, const char *fmt, ...) PRINTFFORMAT(3,4);
 void adns__warn(adns_state ads, int serv, const char *fmt, ...) PRINTFFORMAT(3,4);
 void adns__diag(adns_state ads, int serv, const char *fmt, ...) PRINTFFORMAT(3,4);
 
-static inline int adns__vbuf_ensure(adns__vbuf *vb, size_t want);
-int adns__vbuf_append(adns__vbuf *vb, const byte *data, size_t len);
-int adns__vbuf_appendq(adns__vbuf *vb, const byte *data, size_t len);
+int adns__vbuf_ensure(vbuf *vb, int want);
+int adns__vbuf_append(vbuf *vb, const byte *data, int len);
 /* 1=>success, 0=>realloc failed */
+void adns__vbuf_appendq(vbuf *vb, const byte *data, int len);
+void adns__vbuf_init(vbuf *vb);
+
+int adns__setnonblock(adns_state ads, int fd); /* => errno value */
 
 /* From submit.c: */
 
+void adns__query_nomem(adns_state ads, adns_query qu);
 void adns__query_fail(adns_state ads, adns_query qu, adns_status stat);
 
 /* From query.c: */
@@ -144,11 +166,17 @@ void adns__query_fail(adns_state ads, adns_query qu, adns_status stat);
 void adns__query_udp(adns_state ads, adns_query qu, struct timeval now);
 void adns__query_tcp(adns_state ads, adns_query qu, struct timeval now);
 adns_status adns__mkquery(adns_state ads, const char *owner, int ol, int id,
-                         adns_rrtype type, adns_queryflags flags, int *qml_r);
+                         adns_rrtype type, adns_queryflags flags);
+
+/* From reply.c: */
+
+void adns__procdgram(adns_state ads, const byte *dgram, int len, int serv);
 
 /* From event.c: */
+
 void adns__tcp_broken(adns_state ads, const char *what, const char *why);
-void adns__tcp_tryconnect(adns_state ads);
+void adns__tcp_tryconnect(adns_state ads, struct timeval now);
+void adns__autosys(adns_state ads, struct timeval now);
 
 /* Useful static inline functions: */
 
@@ -156,9 +184,9 @@ static inline void timevaladd(struct timeval *tv_io, long ms) {
   struct timeval tmp;
   assert(ms>=0);
   tmp= *tv_io;
-  tmp.tv_usec += (ms%1000)*1000;
+  tmp.tv_usec += (ms%1000)*1000000;
   tmp.tv_sec += ms/1000;
-  if (tmp.tv_usec >= 1000) { tmp.tv_sec++; tmp.tv_usec -= 1000; }
+  if (tmp.tv_usec >= 1000000) { tmp.tv_sec++; tmp.tv_usec -= 1000; }
   *tv_io= tmp;
 }
 
@@ -167,6 +195,8 @@ static inline int ctype_digit(int c) { return c>='0' && c<='9'; }
 
 /* Useful macros */
 
+#define LIST_INIT(list) ((list).head= (list).tail= 0)
+
 #define LIST_UNLINK_PART(list,node,part) \
   do { \
     if ((node)->back) (node)->back->part next= (node)->part next; \
@@ -184,6 +214,6 @@ static inline int ctype_digit(int c) { return c>='0' && c<='9'; }
   } while(0)
 
 #define LIST_UNLINK(list,node) LIST_UNLINK_PART(list,node,)
-#define LIST_LINK_TAIL_PART(list,node) LIST_LINK_TAIL(list,node,)
+#define LIST_LINK_TAIL(list,node) LIST_LINK_TAIL_PART(list,node,)
 
 #endif