Also check specific query where applicable.

[adns] / src / internal.h

diff --git a/src/internal.h b/src/internal.h
index fc4fe853685300125d0202028f1260c34296123b..12ecd6f59be44a0f11d34d42d8f658f9ad74b748 100644 (file)
--- a/src/internal.h
+++ b/src/internal.h
@@ -33,6 +33,7 @@ typedef unsigned char byte;
 #include <unistd.h>
 #include <signal.h>
 #include <errno.h>
 #include <unistd.h>
 #include <signal.h>
 #include <errno.h>

+#include <string.h>

 
 #include <sys/time.h>
 
 
 #include <sys/time.h>
 


@@ -58,6 +59,12 @@ typedef unsigned char byte;
 
 #define MAX_POLLFDS  ADNS_POLLFDS_RECOMMENDED
 
 
 #define MAX_POLLFDS  ADNS_POLLFDS_RECOMMENDED
 

+typedef enum {
+  cc_user,
+  cc_entex,
+  cc_freq
+} consistency_checks;
+

 typedef enum {
   rcode_noerror,
   rcode_formaterror,
 typedef enum {
   rcode_noerror,
   rcode_formaterror,


@@ -151,7 +158,7 @@ typedef struct {
 
 struct adns__query {
   adns_state ads;
 
 struct adns__query {
   adns_state ads;

-  enum { query_udp, query_tcpwait, query_tcpsent, query_child, query_done } state;
+  enum { query_tosend, query_tcpwait, query_tcpsent, query_child, query_done } state;

   adns_query back, next, parent;
   struct { adns_query head, tail; } children;
   struct { adns_query back, next; } siblings;
   adns_query back, next, parent;
   struct { adns_query head, tail; } children;
   struct { adns_query back, next; } siblings;


@@ -205,14 +212,14 @@ struct adns__query {
 
   /* Possible states:
    *
 
   /* Possible states:
    *

-   *  state   Queue   child  id   nextudpserver  sentudp     failedtcp
+   *  state   Queue   child  id   nextudpserver  udpsent     tcpfailed

    *                             
    *                             

-   *  udp     NONE    null   >=0  0              zero        zero
-   *  udp     timew   null   >=0  any            nonzero     zero
-   *  udp     NONE    null   >=0  any            nonzero     zero
+   *  tosend  NONE    null   >=0  0              zero        zero
+   *  tosend  timew   null   >=0  any            nonzero     zero
+   *  tosend  NONE    null   >=0  any            nonzero     zero

    *                             
    *                             

-   *  tcpwait timew   null   >=0  irrelevant     zero        any
-   *  tcpsent timew   null   >=0  irrelevant     zero        any
+   *  tcpwait timew   null   >=0  irrelevant     any         any
+   *  tcpsent timew   null   >=0  irrelevant     any         any

    *                             
    *  child   childw  set    >=0  irrelevant     irrelevant  irrelevant
    *  child   NONE    null   >=0  irrelevant     irrelevant  irrelevant
    *                             
    *  child   childw  set    >=0  irrelevant     irrelevant  irrelevant
    *  child   NONE    null   >=0  irrelevant     irrelevant  irrelevant


@@ -364,11 +371,14 @@ void adns__query_tcp(adns_query qu, struct timeval now);
  * reestablishment and retry.
  */
 
  * reestablishment and retry.
  */
 

-void adns__query_udp(adns_query qu, struct timeval now);
-/* Query must be in state udp/NONE; it will be moved to a new state,
+void adns__query_send(adns_query qu, struct timeval now);
+/* Query must be in state tosend/NONE; it will be moved to a new state,

  * and no further processing can be done on it for now.
  * (Resulting state is one of udp/timew, tcpwait/timew (if server not connected),
  *  tcpsent/timew, child/childw or done/output.)
  * and no further processing can be done on it for now.
  * (Resulting state is one of udp/timew, tcpwait/timew (if server not connected),
  *  tcpsent/timew, child/childw or done/output.)

+ * __query_send may decide to use either UDP or TCP depending whether
+ * _qf_usevc is set (or has become set) and whether the query is too
+ * large.

  */
 
 /* From query.c: */
  */
 
 /* From query.c: */


@@ -476,7 +486,7 @@ void adns__query_fail(adns_query qu, adns_status stat);
 /* From reply.c: */
 
 void adns__procdgram(adns_state ads, const byte *dgram, int len,
 /* From reply.c: */
 
 void adns__procdgram(adns_state ads, const byte *dgram, int len,

-                    int serv, struct timeval now);
+                    int serv, int viatcp, struct timeval now);

 
 /* From types.c: */
 
 
 /* From types.c: */
 


@@ -630,6 +640,10 @@ void adns__fdevents(adns_state ads,
                    const fd_set *writefds, const fd_set *exceptfds,
                    struct timeval now, int *r_r);
 
                    const fd_set *writefds, const fd_set *exceptfds,
                    struct timeval now, int *r_r);
 

+/* From check.c: */
+
+void adns__consistency(adns_state ads, adns_query qu, consistency_checks cc);
+

 /* Useful static inline functions: */
 
 static inline void timevaladd(struct timeval *tv_io, long ms) {
 /* Useful static inline functions: */
 
 static inline void timevaladd(struct timeval *tv_io, long ms) {


@@ -647,6 +661,7 @@ static inline int ctype_digit(int c) { return c>='0' && c<='9'; }
 static inline int ctype_alpha(int c) {
   return (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z');
 }
 static inline int ctype_alpha(int c) {
   return (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z');
 }

+static inline int ctype_822special(int c) { return strchr("()<>@,;:\\\".[]",c) != 0; }

 
 static inline int errno_resources(int e) { return e==ENOMEM || e==ENOBUFS; }
 
 
 static inline int errno_resources(int e) { return e==ENOMEM || e==ENOBUFS; }