regress: hfuzzraw: Break out P_succfail()

[adns.git] / regress / hfuzzraw.c.m4

diff --git a/regress/hfuzzraw.c.m4 b/regress/hfuzzraw.c.m4
index c9c24ce3fe04fc2a577b1b5d46ebf46f8149700b..587f7f75268d4e7566ae4d13d2a1a3c276b96ac9 100644 (file)
--- a/regress/hfuzzraw.c.m4
+++ b/regress/hfuzzraw.c.m4
@@ -47,8 +47,13 @@ static vbuf fdtab;
 #define FDF_NONBLOCK 002u
 
 static FILE *Tinputfile;
+static int stdout_enable;
 
-void Q_vb(void) { abort(); /* we neve called Q_anythig */ }
+void Q_vb(void) {
+  if (!adns__vbuf_append(&vb,"",1)) Tnomem();
+  if (fprintf(stdout," %s\n",vb.buf) == EOF) Toutputerr();
+  if (fflush(stdout)) Toutputerr();
+}
 
 static void Pformat(const char *what) {
   fprintf(stderr,"adns test harness: format error in raw log input file: %s\n",what);
@@ -56,6 +61,9 @@ static void Pformat(const char *what) {
 }
 
 extern void Tshutdown(void) {
+  int c= fgetc(Tinputfile);
+  if (c!=EOF) Pformat("unwanted additional syscall reply data");
+  if (ferror(Tinputfile)) Tfailed("read test log input (at end)");
 }
 
 static void Pcheckinput(void) {
@@ -64,6 +72,11 @@ static void Pcheckinput(void) {
 }
 
 void Tensurerecordfile(void) {
+  static int done;
+
+  if (done) return;
+  done++;
+
   int fd;
 
   fd = Ttestinputfd();
@@ -75,25 +88,31 @@ void Tensurerecordfile(void) {
     const char fdfstd = FDF_OPEN;
     if (!adns__vbuf_append(&fdtab,&fdfstd,1)) Tnomem();
   }
+
+  const char *proutstr= getenv("ADNS_TEST_FUZZRAW_STDOUT_ENABLE");
+  if (proutstr) stdout_enable= atoi(proutstr);
 }
 
 static void P_read(void *p, size_t sz) {
-  ssize_t got = fread(&p,1,sz,Tinputfile);
+  ssize_t got = fread(p,1,sz,Tinputfile);
   Pcheckinput();
   assert(got==sz);
 }
 
 #define P_READ(x) (P_read(&(x), sizeof((x))))
 
-static void P_updatetime(void) {
-m4_dnl xxx
-}
-
 static unsigned P_fdf(int fd) {
   assert(fd>=0 && fd<fdtab.used);
   return fdtab.buf[fd];
 }
 
+void T_gettimeofday_hook(void) {
+  struct timeval delta, sum;
+  P_READ(delta);
+  timeradd(&delta, &currenttime, &sum);
+  currenttime= sum;
+}
+
 static void Paddr(struct sockaddr *addr, int *lenr) {
   int l, r;
   uint16_t port;
@@ -148,6 +167,21 @@ int fd;
 }
 #endif
 
+static int P_succfail(void) {
+  int r;
+  P_READ(r);
+  if (r<0 && -r<Tnerrnos) {
+    errno= Terrnos[-r].v;
+    return -1;
+  } else if (r>0 && r<=255) {
+    errno= r;
+    return -1;
+  } else if (r) {
+    Pformat("wrong errno value");
+  }
+  return 0;
+}
+
 m4_define(`hm_syscall', `
  hm_create_proto_h
 int H$1(hm_args_massage($3,void)) {
@@ -167,20 +201,15 @@ int H$1(hm_args_massage($3,void)) {
  $3
 
  Tensurerecordfile();
- P_updatetime();
+
+ if (stdout_enable) {
+   hm_create_hqcall_args
+   Q$1(hm_args_massage($3));
+ }
 
  m4_define(`hm_rv_succfail',`
-  P_READ(r);
-  if (r<0 && -r<Tnerrnos) {
-    errno= Terrnos[-r].v;
-    return -1;
-  } else if (r>0 && r<=255) {
-    errno= r;
-    return -1;
-  } else if (r) {
-    Pformat("wrong errno value");
-  }
-  r= 0;
+  r= P_succfail();
+  if (r<0) return r;
  ')
 
  m4_define(`hm_rv_any',`
@@ -214,15 +243,17 @@ int H$1(hm_args_massage($3,void)) {
  m4_define(`hm_rv_fd',`
   hm_rv_succfail
   if (!r) {
-    for (;;) {
-      assert(r < 1000);
-      if (r >= fdtab.used)
-        if (!adns__vbuf_append(&fdtab,"\0",1)) Tnomem();
-      assert(r < fdtab.used);
-      if (!(fdtab.buf[r] & FDF_OPEN)) break;
-      r++;
+    int newfd;
+    P_READ(newfd);
+    if (newfd<0 || newfd>1000) Pformat("new fd out of range");
+    adns__vbuf_ensure(&fdtab, newfd+1);
+    if (fdtab.used <= newfd) {
+      memset(fdtab.buf+fdtab.used, 0, newfd+1-fdtab.used);
+      fdtab.used= newfd+1;
     }
-    fdtab.buf[r] |= FDF_OPEN;
+    if (fdtab.buf[newfd]) Pformat("new fd already in use");
+    fdtab.buf[newfd] |= FDF_OPEN;
+    r= newfd;
  }
  ')
  $2
@@ -237,7 +268,6 @@ int H$1(hm_args_massage($3,void)) {
  m4_define(`hm_arg_bytes_out',`r= Pbytes($'`2,$'`4);')
  $3
 
- P_updatetime();
  return r;
 }
 ')