Testsuite: output changes from a26fb6a77384

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

diff --git a/test/src/server.c b/test/src/server.c
index b2f1bc754d95163d133f124093f276bf5cf55638..ce55c5c377ac716be3f875b7c683eed0fb56d9b5 100644 (file)
--- a/test/src/server.c
+++ b/test/src/server.c
@@ -28,7 +28,7 @@ on all interfaces, unless the option -noipv6 is given. */
 #include <netinet/ip.h>
 
 #ifdef HAVE_NETINET_IP_VAR_H
 #include <netinet/ip.h>
 
 #ifdef HAVE_NETINET_IP_VAR_H

-#include <netinet/ip_var.h>
+# include <netinet/ip_var.h>

 #endif
 
 #include <netdb.h>
 #endif
 
 #include <netdb.h>


@@ -52,6 +52,7 @@ on all interfaces, unless the option -noipv6 is given. */
 
 #ifndef CS
 # define CS (char *)
 
 #ifndef CS
 # define CS (char *)

+# define CCS (const char *)

 #endif
 
 
 #endif
 
 


@@ -61,17 +62,22 @@ typedef struct line {
   char line[1];
 } line;
 
   char line[1];
 } line;
 

+typedef unsigned BOOL;
+#define FALSE 0
+#define TRUE  1
+

 
 /*************************************************
 *            SIGALRM handler - crash out         *
 *************************************************/
 
 /*************************************************
 *            SIGALRM handler - crash out         *
 *************************************************/

+int tmo_noerror = 0;

 
 static void
 sigalrm_handler(int sig)
 {
 sig = sig;    /* Keep picky compilers happy */
 printf("\nServer timed out\n");
 
 static void
 sigalrm_handler(int sig)
 {
 sig = sig;    /* Keep picky compilers happy */
 printf("\nServer timed out\n");

-exit(99);
+exit(tmo_noerror ? 0 : 99);

 }
 
 
 }
 
 


@@ -200,7 +206,7 @@ int len = sizeof(accepted);
 /* Sort out the arguments */
 if (argc > 1 && (!strcmp(argv[1], "--help") || !strcmp(argv[1], "-h")))
   {
 /* Sort out the arguments */
 if (argc > 1 && (!strcmp(argv[1], "--help") || !strcmp(argv[1], "-h")))
   {

-  printf("Usage: %s [options]\n", argv[0]);
+  printf("Usage: %s [options] port|socket [connection count]\n", argv[0]);

   puts("Options"
        "\n\t-d       debug"
        "\n\t-i n     n seconds initial delay"
   puts("Options"
        "\n\t-d       debug"
        "\n\t-i n     n seconds initial delay"


@@ -215,7 +221,10 @@ if (argc > 1 && (!strcmp(argv[1], "--help") || !strcmp(argv[1], "-h")))
 while (na < argc && argv[na][0] == '-')
   {
   if (strcmp(argv[na], "-d") == 0) debug = 1;
 while (na < argc && argv[na][0] == '-')
   {
   if (strcmp(argv[na], "-d") == 0) debug = 1;

-  else if (strcmp(argv[na], "-t") == 0) timeout = atoi(argv[++na]);
+  else if (strcmp(argv[na], "-t") == 0)
+    {
+    if (tmo_noerror = ((timeout = atoi(argv[++na])) < 0)) timeout = -timeout;
+    }

   else if (strcmp(argv[na], "-i") == 0) initial_pause = atoi(argv[++na]);
   else if (strcmp(argv[na], "-noipv4") == 0) use_ipv4 = 0;
   else if (strcmp(argv[na], "-noipv6") == 0) use_ipv6 = 0;
   else if (strcmp(argv[na], "-i") == 0) initial_pause = atoi(argv[++na]);
   else if (strcmp(argv[na], "-noipv4") == 0) use_ipv4 = 0;
   else if (strcmp(argv[na], "-noipv6") == 0) use_ipv6 = 0;


@@ -389,7 +398,6 @@ else
       sin4.sin_addr.s_addr = (S_ADDR_TYPE)INADDR_ANY;
       sin4.sin_port = htons(port);
       if (bind(listen_socket[i], (struct sockaddr *)&sin4, sizeof(sin4)) < 0)
       sin4.sin_addr.s_addr = (S_ADDR_TYPE)INADDR_ANY;
       sin4.sin_port = htons(port);
       if (bind(listen_socket[i], (struct sockaddr *)&sin4, sizeof(sin4)) < 0)

-        {

         if (listen_socket[v6n] < 0 || errno != EADDRINUSE)
           {
           printf("IPv4 socket bind() failed: %s\n", strerror(errno));
         if (listen_socket[v6n] < 0 || errno != EADDRINUSE)
           {
           printf("IPv4 socket bind() failed: %s\n", strerror(errno));


@@ -400,7 +408,6 @@ else
           close(listen_socket[i]);
           listen_socket[i] = -1;
           }
           close(listen_socket[i]);
           listen_socket[i] = -1;
           }

-        }

       }
     }
   }
       }
     }
   }


@@ -492,6 +499,11 @@ s = script;
 
 for (count = 0; count < connection_count; count++)
   {
 
 for (count = 0; count < connection_count; count++)
   {

+  struct {
+    int left;
+    BOOL in_use;
+  } content_length = { 0, FALSE };
+

   alarm(timeout);
   if (port <= 0)
     {
   alarm(timeout);
   if (port <= 0)
     {


@@ -517,8 +529,7 @@ for (count = 0; count < connection_count; count++)
       if (listen_socket[i] > max_socket) max_socket = listen_socket[i];
       }
 
       if (listen_socket[i] > max_socket) max_socket = listen_socket[i];
       }
 

-    lcount = select(max_socket + 1, &select_listen, NULL, NULL, NULL);
-    if (lcount < 0)
+    if ((lcount = select(max_socket + 1, &select_listen, NULL, NULL, NULL)) < 0)

       {
       printf("Select failed\n");
       fflush(stdout);
       {
       printf("Select failed\n");
       fflush(stdout);


@@ -527,7 +538,6 @@ for (count = 0; count < connection_count; count++)
 
     accept_socket = -1;
     for (i = 0; i < skn; i++)
 
     accept_socket = -1;
     for (i = 0; i < skn; i++)

-      {

       if (listen_socket[i] > 0 && FD_ISSET(listen_socket[i], &select_listen))
         {
         accept_socket = accept(listen_socket[i],
       if (listen_socket[i] > 0 && FD_ISSET(listen_socket[i], &select_listen))
         {
         accept_socket = accept(listen_socket[i],


@@ -535,7 +545,6 @@ for (count = 0; count < connection_count; count++)
         FD_CLR(listen_socket[i], &select_listen);
         break;
         }
         FD_CLR(listen_socket[i], &select_listen);
         break;
         }

-      }

     }
   alarm(0);
 
     }
   alarm(0);
 


@@ -568,6 +577,7 @@ for (count = 0; count < connection_count; count++)
               cr.pid, cr.uid, cr.gid);
     --------------*****************/
     }
               cr.pid, cr.uid, cr.gid);
     --------------*****************/
     }

+  fflush(stdout);

 
   if (dup_accept_socket < 0)
     {
 
   if (dup_accept_socket < 0)
     {


@@ -586,7 +596,7 @@ for (count = 0; count < connection_count; count++)
   doesn't work for other tests (e.g. ident tests) so we have explicit '<' and
   '>' flags for input and output as well as the defaults. */
 
   doesn't work for other tests (e.g. ident tests) so we have explicit '<' and
   '>' flags for input and output as well as the defaults. */
 

-  for (; s != NULL; s = s->next)
+  for (; s; s = s->next)

     {
     char *ss = s->line;
 
     {
     char *ss = s->line;
 


@@ -635,6 +645,38 @@ for (count = 0; count < connection_count; count++)
       sleep(sleepfor);
       }
 
       sleep(sleepfor);
       }
 

+    /* If the script line starts with "*data " we expect a numeric argument,
+    and we expect to read (and discard) that many data bytes from the input. */
+
+    else if (strncmp(ss, "*data ", 6) == 0)
+      {
+      int dlen = atoi(ss+6);
+      int n;
+
+      alarm(timeout);
+
+      if (!linebuf)
+       while (dlen > 0)
+         {
+         n = dlen < sizeof(buffer) ? dlen : sizeof(buffer);
+         if ((n = read(dup_accept_socket, CS buffer, n)) == 0)
+           {
+           printf("Unexpected EOF read from client\n");
+           s = s->next;
+           goto END_OFF;
+           }
+         dlen -= n;
+         }
+      else
+       while (dlen-- > 0)
+         if (fgetc(in) == EOF)
+           {
+           printf("Unexpected EOF read from client\n");
+           s = s->next;
+           goto END_OFF;
+           }
+      }
+

     /* Otherwise the script line is the start of an input line we are expecting
     from the client, or "*eof" indicating we expect the client to close the
     connection. Read command line or data lines; the latter are indicated
     /* Otherwise the script line is the start of an input line we are expecting
     from the client, or "*eof" indicating we expect the client to close the
     connection. Read command line or data lines; the latter are indicated


@@ -672,6 +714,7 @@ for (count = 0; count < connection_count; count++)
 
        alarm(timeout);
        n = read(dup_accept_socket, CS buffer+offset, s->len - offset);
 
        alarm(timeout);
        n = read(dup_accept_socket, CS buffer+offset, s->len - offset);

+       if (content_length.in_use) content_length.left -= n;

        if (n == 0)
          {
          printf("%sxpected EOF read from client\n",
        if (n == 0)
          {
          printf("%sxpected EOF read from client\n",


@@ -684,13 +727,14 @@ for (count = 0; count < connection_count; count++)
        alarm(0);
        n += offset;
 
        alarm(0);
        n += offset;
 

-       printit(buffer, n);
+       printit(CS buffer, n);

 
        if (data) do
          {
          n = (read(dup_accept_socket, &c, 1) == 1 && c == '.');
 
        if (data) do
          {
          n = (read(dup_accept_socket, &c, 1) == 1 && c == '.');

+         if (content_length.in_use) content_length.left--;

          while (c != '\n' && read(dup_accept_socket, &c, 1) == 1)
          while (c != '\n' && read(dup_accept_socket, &c, 1) == 1)

-           ;
+            if (content_length.in_use) content_length.left--;

          } while (!n);
        else if (memcmp(ss, buffer, n) != 0)
          {
          } while (!n);
        else if (memcmp(ss, buffer, n) != 0)
          {


@@ -713,7 +757,8 @@ for (count = 0; count < connection_count; count++)
            goto END_OFF;
            }
          alarm(0);
            goto END_OFF;
            }
          alarm(0);

-         n = (int)strlen(CS buffer);
+         n = strlen(CS buffer);
+         if (content_length.in_use) content_length.left -= (n - offset);

          while (n > 0 && isspace(buffer[n-1])) n--;
          buffer[n] = 0;
          printf("%s\n", buffer);
          while (n > 0 && isspace(buffer[n-1])) n--;
          buffer[n] = 0;
          printf("%s\n", buffer);


@@ -727,6 +772,11 @@ for (count = 0; count < connection_count; count++)
          break;
          }
        }
          break;
          }
        }

+
+       if (sscanf(CCS buffer, "<Content-length: %d", &content_length.left))
+                 content_length.in_use = TRUE;
+       if (content_length.in_use && content_length.left <= 0)
+         shutdown(dup_accept_socket, SHUT_RD);

       }
     }
 
       }
     }
 


@@ -737,7 +787,7 @@ for (count = 0; count < connection_count; count++)
 
 if (s == NULL) printf("End of script\n");
 
 
 if (s == NULL) printf("End of script\n");
 

-if (sockname != NULL) unlink(sockname);
+if (sockname) unlink(sockname);

 exit(0);
 }
 
 exit(0);
 }