ChangeLog entry JH/18; applying to 4.89 release

[users/jgh/exim.git] / test / src / fakens.c

diff --git a/test/src/fakens.c b/test/src/fakens.c
index aff5f40f6fbb1eadf7e62e99fdb4271c5dbd5a59..0806136cc99a87ba437e6e8c173ade1c2a03d413 100644 (file)
--- a/test/src/fakens.c
+++ b/test/src/fakens.c
@@ -25,7 +25,7 @@ The arguments to the program are:
   the DNS record type that is being sought
 
 The output from the program is written to stdout. It is supposed to be in
   the DNS record type that is being sought
 
 The output from the program is written to stdout. It is supposed to be in

-exactly the same format as a traditional namserver response (see RFC 1035) so
+exactly the same format as a traditional nameserver response (see RFC 1035) so

 that Exim can process it as normal. At present, no compression is used.
 Error messages are written to stderr.
 
 that Exim can process it as normal. At present, no compression is used.
 Error messages are written to stderr.
 


@@ -55,12 +55,15 @@ a number of milliseconds (followed by one space).
 
 Any DNS record line in a zone file can be prefixed with "DNSSEC ";
 if all the records found by a lookup are marked
 
 Any DNS record line in a zone file can be prefixed with "DNSSEC ";
 if all the records found by a lookup are marked

-as such then the response will have the "AD" bit set. 
+as such then the response will have the "AD" bit set.

 
 Any DNS record line in a zone file can be prefixed with "AA "
 if all the records found by a lookup are marked
 as such then the response will have the "AA" bit set.
 
 
 Any DNS record line in a zone file can be prefixed with "AA "
 if all the records found by a lookup are marked
 as such then the response will have the "AA" bit set.
 

+Any DNS record line in a zone file can be prefixed with "TTL=" and
+a number of seconds (followed by one space).
+

 */
 
 #include <ctype.h>
 */
 
 #include <ctype.h>


@@ -72,9 +75,14 @@ as such then the response will have the "AA" bit set.
 #include <errno.h>
 #include <signal.h>
 #include <arpa/nameser.h>
 #include <errno.h>
 #include <signal.h>
 #include <arpa/nameser.h>

+#include <arpa/inet.h>

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

+#include <unistd.h>
+#ifdef HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif

 
 #define FALSE         0
 #define TRUE          1
 
 #define FALSE         0
 #define TRUE          1


@@ -94,6 +102,7 @@ typedef unsigned char uschar;
 #define Ustrlen(s)         (int)strlen(CCS(s))
 #define Ustrncmp(s,t,n)    strncmp(CCS(s),CCS(t),n)
 #define Ustrncpy(s,t,n)    strncpy(CS(s),CCS(t),n)
 #define Ustrlen(s)         (int)strlen(CCS(s))
 #define Ustrncmp(s,t,n)    strncmp(CCS(s),CCS(t),n)
 #define Ustrncpy(s,t,n)    strncpy(CS(s),CCS(t),n)

+#define Ustrtok(s,t)       (uschar*)strtok(CS(s),CCS(t))

 
 typedef struct zoneitem {
   uschar *zone;
 
 typedef struct zoneitem {
   uschar *zone;


@@ -105,6 +114,8 @@ typedef struct tlist {
   int value;
 } tlist;
 
   int value;
 } tlist;
 

+#define DEFAULT_TTL 3600U
+

 /* On some (older?) operating systems, the standard ns_t_xxx definitions are
 not available, and only the older T_xxx ones exist in nameser.h. If ns_t_a is
 not defined, assume we are in this state. A really old system might not even
 /* On some (older?) operating systems, the standard ns_t_xxx definitions are
 not available, and only the older T_xxx ones exist in nameser.h. If ns_t_a is
 not defined, assume we are in this state. A really old system might not even


@@ -298,8 +309,8 @@ Arguments:
   qtypelen    the length of qtype
   pkptr       points to the output buffer pointer; this is updated
   countptr    points to the record count; this is updated
   qtypelen    the length of qtype
   pkptr       points to the output buffer pointer; this is updated
   countptr    points to the record count; this is updated

-  dnssec      points to the AD flag indicator; this updated
-  aa         points to the AA flag indicator; this updated
+  dnssec      points to the AD flag indicator; this is updated
+  aa          points to the AA flag indicator; this is updated

 
 Returns:      0 on success, else HOST_NOT_FOUND or NO_DATA or NO_RECOVERY or
               PASS_ON - the latter if a "PASS ON NOT FOUND" line is seen
 
 Returns:      0 on success, else HOST_NOT_FOUND or NO_DATA or NO_RECOVERY or
               PASS_ON - the latter if a "PASS ON NOT FOUND" line is seen


@@ -318,8 +329,8 @@ uschar buffer[256];
 uschar rrdomain[256];
 uschar RRdomain[256];
 
 uschar rrdomain[256];
 uschar RRdomain[256];
 

-/* Decode the required type */

 
 

+/* Decode the required type */

 for (typeptr = type_list; typeptr->name != NULL; typeptr++)
   { if (Ustrcmp(typeptr->name, qtype) == 0) break; }
 if (typeptr->name == NULL)
 for (typeptr = type_list; typeptr->name != NULL; typeptr++)
   { if (Ustrcmp(typeptr->name, qtype) == 0) break; }
 if (typeptr->name == NULL)


@@ -331,8 +342,8 @@ if (typeptr->name == NULL)
 rrdomain[0] = 0;                 /* No previous domain */
 (void)fseek(f, 0, SEEK_SET);     /* Start again at the beginning */
 
 rrdomain[0] = 0;                 /* No previous domain */
 (void)fseek(f, 0, SEEK_SET);     /* Start again at the beginning */
 

-*dnssec = TRUE;                        /* cancelled by first nonsecure rec found */ 
-*aa = TRUE;                    /* cancelled by first non-authoritive record */
+if (dnssec) *dnssec = TRUE;     /* cancelled by first nonsecure rec found */
+if (aa) *aa = TRUE;             /* cancelled by first non-aa rec found */

 
 /* Scan for RRs */
 
 
 /* Scan for RRs */
 


@@ -347,6 +358,7 @@ while (fgets(CS buffer, sizeof(buffer), f) != NULL)
   BOOL rr_sec = FALSE;
   BOOL rr_aa = FALSE;
   int delay = 0;
   BOOL rr_sec = FALSE;
   BOOL rr_aa = FALSE;
   int delay = 0;

+  uint ttl = DEFAULT_TTL;

 
   p = buffer;
   while (isspace(*p)) p++;
 
   p = buffer;
   while (isspace(*p)) p++;


@@ -365,21 +377,27 @@ while (fgets(CS buffer, sizeof(buffer), f) != NULL)
   p = buffer;
   for (;;)
     {
   p = buffer;
   for (;;)
     {

-    if (Ustrncmp(p, US"DNSSEC ", 7) == 0)      /* tagged as secure */
+    if (Ustrncmp(p, US"DNSSEC ", 7) == 0)       /* tagged as secure */

       {
       rr_sec = TRUE;
       p += 7;
       }
       {
       rr_sec = TRUE;
       p += 7;
       }

-    else if (Ustrncmp(p, US"AA ", 3) == 0)     /* tagged as authoritive */
+    else if (Ustrncmp(p, US"AA ", 3) == 0)      /* tagged as authoritative */

       {
       rr_aa = TRUE;
       p += 3;
       }
       {
       rr_aa = TRUE;
       p += 3;
       }

-    else if (Ustrncmp(p, US"DELAY=", 6) == 0)  /* delay before response */
+    else if (Ustrncmp(p, US"DELAY=", 6) == 0)   /* delay before response */

       {
       for (p += 6; *p >= '0' && *p <= '9'; p++) delay = delay*10 + *p - '0';
       if (isspace(*p)) p++;
       }
       {
       for (p += 6; *p >= '0' && *p <= '9'; p++) delay = delay*10 + *p - '0';
       if (isspace(*p)) p++;
       }

+    else if (Ustrncmp(p, US"TTL=", 4) == 0)     /* TTL for record */
+      {
+      ttl = 0;
+      for (p += 4; *p >= '0' && *p <= '9'; p++) ttl = ttl*10 + *p - '0';
+      if (isspace(*p)) p++;
+      }

     else
       break;
     }
     else
       break;
     }


@@ -435,15 +453,14 @@ while (fgets(CS buffer, sizeof(buffer), f) != NULL)
   else if (Ustrncmp(p, qtype, qtypelen) != 0 || !isspace(p[qtypelen])) continue;
 
   /* Found a relevant record */
   else if (Ustrncmp(p, qtype, qtypelen) != 0 || !isspace(p[qtypelen])) continue;
 
   /* Found a relevant record */

-

   if (delay)
     millisleep(delay);
 
   if (delay)
     millisleep(delay);
 

-  if (!rr_sec)
-    *dnssec = FALSE;                   /* cancel AD return */
+  if (dnssec && !rr_sec)
+    *dnssec = FALSE;                    /* cancel AD return */

 
 

-  if (!rr_aa)
-    *aa = FALSE;                       /* cancel AA return */
+  if (aa && !rr_aa)
+    *aa = FALSE;                        /* cancel AA return */

 
   yield = 0;
   *countptr = *countptr + 1;
 
   yield = 0;
   *countptr = *countptr + 1;


@@ -460,7 +477,10 @@ while (fgets(CS buffer, sizeof(buffer), f) != NULL)
   *pk++ = 0;
   *pk++ = 1;     /* class = IN */
 
   *pk++ = 0;
   *pk++ = 1;     /* class = IN */
 

-  pk += 4;       /* TTL field; don't care */
+  *pk++ = (ttl >>24) & 255;
+  *pk++ = (ttl >>16) & 255;
+  *pk++ = (ttl >> 8) & 255;
+  *pk++ = ttl & 255;

 
   rdlptr = pk;   /* remember rdlength field */
   pk += 2;
 
   rdlptr = pk;   /* remember rdlength field */
   pk += 2;


@@ -470,51 +490,29 @@ while (fgets(CS buffer, sizeof(buffer), f) != NULL)
   switch (tvalue)
     {
     case ns_t_soa:
   switch (tvalue)
     {
     case ns_t_soa:

-      p = strtok(p, " ");
-      ep = p + strlen(p);
+      p = Ustrtok(p, " ");
+      ep = p + Ustrlen(p);

       if (ep[-1] != '.') sprintf(CS ep, "%s.", zone);
       if (ep[-1] != '.') sprintf(CS ep, "%s.", zone);

-      pk = packname(p, pk);                    /* primary ns */
-      p = strtok(NULL, " ");
-      pk = packname(p , pk);                   /* responsible mailbox */
-      *(p += strlen(p)) = ' ';
+      pk = packname(p, pk);                     /* primary ns */
+      p = Ustrtok(NULL, " ");
+      pk = packname(p , pk);                    /* responsible mailbox */
+      *(p += Ustrlen(p)) = ' ';

       while (isspace(*p)) p++;
       while (isspace(*p)) p++;

-      pk = longfield(&p, pk);                  /* serial */
-      pk = longfield(&p, pk);                  /* refresh */
-      pk = longfield(&p, pk);                  /* retry */
-      pk = longfield(&p, pk);                  /* expire */
-      pk = longfield(&p, pk);                  /* minimum */
+      pk = longfield(&p, pk);                   /* serial */
+      pk = longfield(&p, pk);                   /* refresh */
+      pk = longfield(&p, pk);                   /* retry */
+      pk = longfield(&p, pk);                   /* expire */
+      pk = longfield(&p, pk);                   /* minimum */

       break;
 
     case ns_t_a:
       break;
 
     case ns_t_a:

-      for (i = 0; i < 4; i++)
-       {
-       value = 0;
-       while (isdigit(*p)) value = value*10 + *p++ - '0';
-       *pk++ = value;
-       p++;
-       }
+      inet_pton(AF_INET, CCS p, pk);                /* FIXME: error checking */
+      pk += 4;

       break;
 
       break;
 

-    /* The only occurrence of a double colon is for ::1 */

     case ns_t_aaaa:
     case ns_t_aaaa:

-      if (Ustrcmp(p, "::1") == 0)
-       {
-       memset(pk, 0, 15);
-       pk += 15;
-       *pk++ = 1;
-       }
-      else for (i = 0; i < 8; i++)
-       {
-       value = 0;
-       while (isxdigit(*p))
-         {
-         value = value * 16 + toupper(*p) - (isdigit(*p)? '0' : '7');
-         p++;
-         }
-       *pk++ = (value >> 8) & 255;
-       *pk++ = value & 255;
-       p++;
-       }
+      inet_pton(AF_INET6, CCS p, pk);               /* FIXME: error checking */
+      pk += 16;

       break;
 
     case ns_t_mx:
       break;
 
     case ns_t_mx:


@@ -531,17 +529,17 @@ while (fgets(CS buffer, sizeof(buffer), f) != NULL)
       break;
 
     case ns_t_tlsa:
       break;
 
     case ns_t_tlsa:

-      pk = bytefield(&p, pk);  /* usage */
-      pk = bytefield(&p, pk);  /* selector */
-      pk = bytefield(&p, pk);  /* match type */
+      pk = bytefield(&p, pk);   /* usage */
+      pk = bytefield(&p, pk);   /* selector */
+      pk = bytefield(&p, pk);   /* match type */

       while (isxdigit(*p))
       {
       value = toupper(*p) - (isdigit(*p) ? '0' : '7') << 4;
       if (isxdigit(*++p))
       while (isxdigit(*p))
       {
       value = toupper(*p) - (isdigit(*p) ? '0' : '7') << 4;
       if (isxdigit(*++p))

-       {
-       value |= toupper(*p) - (isdigit(*p) ? '0' : '7');
-       p++;
-       }
+        {
+        value |= toupper(*p) - (isdigit(*p) ? '0' : '7');
+        p++;
+        }

       *pk++ = value & 255;
       }
 
       *pk++ = value & 255;
       }
 


@@ -549,13 +547,13 @@ while (fgets(CS buffer, sizeof(buffer), f) != NULL)
 
     case ns_t_srv:
       for (i = 0; i < 3; i++)
 
     case ns_t_srv:
       for (i = 0; i < 3; i++)

-       {
-       value = 0;
-       while (isdigit(*p)) value = value*10 + *p++ - '0';
-       while (isspace(*p)) p++;
-       *pk++ = (value >> 8) & 255;
-       *pk++ = value & 255;
-       }
+        {
+        value = 0;
+        while (isdigit(*p)) value = value*10 + *p++ - '0';
+        while (isspace(*p)) p++;
+        *pk++ = (value >> 8) & 255;
+        *pk++ = value & 255;
+        }

 
     /* Fall through */
 
 
     /* Fall through */
 


@@ -654,6 +652,7 @@ uschar domain[256];
 uschar buffer[256];
 uschar qtype[12];
 uschar packet[2048 * 32 + 32];
 uschar buffer[256];
 uschar qtype[12];
 uschar packet[2048 * 32 + 32];

+HEADER *header = (HEADER *)packet;

 uschar *pk = packet;
 BOOL dnssec;
 BOOL aa;
 uschar *pk = packet;
 BOOL dnssec;
 BOOL aa;


@@ -771,21 +770,28 @@ if (f == NULL)
 count = 0;
 yield = find_records(f, zone, domain, qtype, qtypelen, &pk, &count, &dnssec, &aa);
 if (yield == NO_RECOVERY) goto END_OFF;
 count = 0;
 yield = find_records(f, zone, domain, qtype, qtypelen, &pk, &count, &dnssec, &aa);
 if (yield == NO_RECOVERY) goto END_OFF;

+header->ancount = htons(count);
+
+/* If the AA bit should be set (as indicated by the AA prefix in the zone file),
+we are expected to return some records in the authoritative section. Bind9: If
+there is data in the answer section, the authoritative section contains the NS
+records, otherwise it contains the SOA record.  Currently we mimic this
+behaviour for the first case (there is some answer record).
+*/

 
 

-packet[6] = (count >> 8) & 255;
-packet[7] = count & 255;
+if (aa)
+  find_records(f, zone, zone[0] == '.' ? zone+1 : zone, US"NS", 2, &pk, &count, NULL, NULL);
+header->nscount = htons(count - ntohs(header->ancount));

 
 /* There is no need to return any additional records because Exim no longer
 (from release 4.61) makes any use of them. */
 
 /* There is no need to return any additional records because Exim no longer
 (from release 4.61) makes any use of them. */

-
-packet[10] = 0;
-packet[11] = 0;
+header->arcount = 0;

 
 if (dnssec)
 
 if (dnssec)

-  ((HEADER *)packet)->ad = 1;
+  header->ad = 1;

 
 if (aa)
 
 if (aa)

-  ((HEADER *)packet)->aa = 1;
+  header->aa = 1;

 
 /* Close the zone file, write the result, and return. */
 
 
 /* Close the zone file, write the result, and return. */