#include <unistd.h>
#include <fcntl.h>
+#include <limits.h>
+
#include "harness.h"
-static FILE *Tinputfile, *Treportfile;
+static FILE *Tinputfile, *Tfuzzrawfile, *Treportfile;
static vbuf vb2;
-extern void Tshutdown(void) {
- adns__vbuf_free(&vb2);
-}
-
static void Tensurereportfile(void) {
const char *fdstr;
int fd;
Treportfile= fdopen(fd,"a"); if (!Treportfile) Tfailed("fdopen ADNS_TEST_REPORT_FD");
}
+static void Tensurefuzzrawfile(void) {
+ static int done;
+
+ if (done) return;
+ done++;
+
+ const char *fdstr= getenv("ADNS_TEST_FUZZRAW_DUMP_FD");
+ if (!fdstr) return;
+
+ int fd= atoi(fdstr);
+ Tfuzzrawfile= fdopen(fd,"ab");
+ if (!Tfuzzrawfile) Tfailed("fdopen ADNS_TEST_FUZZRAW_DUMP_FD");
+}
+
+static void FR_write(void *p, size_t sz) {
+ if (!Tfuzzrawfile) return;
+ ssize_t got = fwrite(p,1,sz,Tfuzzrawfile);
+ if (ferror(Tfuzzrawfile)) Tfailed("write fuzzraw output file");
+ assert(got==sz);
+}
+
+#define FR_WRITE(x) (FR_write(&(x), sizeof((x))))
+
+extern void Tshutdown(void) {
+ adns__vbuf_free(&vb2);
+ if (Tfuzzrawfile) {
+ if (fclose(Tfuzzrawfile)) Tfailed("close fuzzraw output file");
+ }
+}
+
static void Psyntax(const char *where) {
fprintf(stderr,"adns test harness: syntax error in test log input file: %s\n",where);
exit(-1);
if (feof(Tinputfile)) Psyntax("eof at syscall reply");
}
+void T_gettimeofday_hook(void) {
+ static struct timeval previously;
+ struct timeval delta;
+ memset(&delta,0,sizeof(delta));
+ timersub(¤ttime, &previously, &delta);
+ FR_WRITE(delta);
+}
+
void Tensurerecordfile(void) {
int fd;
int chars;
}
static void Pfdset(fd_set *set, int max) {
- int r, c;
+ int c;
+ unsigned long ul;
char *ep;
if (!set) {
FD_ZERO(set);
if (vb2.buf[vb2.used] == hm_squote]hm_squote) { vb2.used++; return; }
for (;;) {
- r= strtoul(vb2.buf+vb2.used,&ep,10);
- if (r>=max) Psyntax("fd set member > max");
+ ul= strtoul(vb2.buf+vb2.used,&ep,10);
+ if (ul>=max) Psyntax("fd set member > max");
if (ep == (char*)vb2.buf+vb2.used) Psyntax("empty entry in fd set");
- FD_SET(r,set);
+ FD_SET(ul,set);
vb2.used= ep - (char*)vb2.buf;
c= vb2.buf[vb2.used++];
if (c == hm_squote]hm_squote) break;
fgets(vb2.buf,vb2.avail,Tinputfile); Pcheckinput();
Tensurereportfile();
+ Tensurefuzzrawfile();
fprintf(Treportfile,"%s",vb2.buf);
amtread= strlen(vb2.buf);
if (amtread<=0 || vb2.buf[--amtread]!=hm_squote\nhm_squote)
vb2.buf[amtread]= 0;
if (memcmp(vb2.buf," $1=",hm_r_offset)) Psyntax("syscall reply mismatch");
+ m4_define(`hm_rv_check_errno',`
if (vb2.buf[hm_r_offset] == hm_squoteEhm_squote) {
int e;
e= Perrno(vb2.buf+hm_r_offset);
P_updatetime();
errno= e;
+ FR_WRITE(e);
return -1;
}
-
- m4_define(`hm_rv_succfail',`
+ r= 0;
+ FR_WRITE(r);
+ ')
+ m4_define(`hm_rv_check_success',`
if (memcmp(vb2.buf+hm_r_offset,"OK",2)) Psyntax("success/fail not E* or OK");
vb2.used= hm_r_offset+2;
r= 0;
')
- m4_define(`hm_rv_len',`hm_rv_succfail')
- m4_define(`hm_rv_must',`hm_rv_succfail')
- m4_define(`hm_rv_any',`
- r= strtoul(vb2.buf+hm_r_offset,&ep,10);
- if (*ep && *ep!=hm_squote hm_squote) Psyntax("return value not E* or positive number");
+ m4_define(`hm_rv_any_nowrite',`
+ hm_rv_check_errno
+ unsigned long ul_r= strtoul(vb2.buf+hm_r_offset,&ep,10);
+ if (ul_r < 0 || ul_r > INT_MAX ||
+ (*ep && *ep!=hm_squote hm_squote))
+ Psyntax("return value not E* or positive number");
+ r= ul_r;
vb2.used= ep - (char*)vb2.buf;
')
+
+ m4_define(`hm_rv_succfail',`
+ hm_rv_check_errno
+ hm_rv_check_success
+ ')
+ m4_define(`hm_rv_len',`
+ hm_rv_check_errno
+ hm_rv_check_success
+ ')
+ m4_define(`hm_rv_must',`
+ hm_rv_check_success
+ ')
+ m4_define(`hm_rv_any',`
+ hm_rv_any_nowrite
+ FR_WRITE(r);
+ ')
m4_define(`hm_rv_fd',`hm_rv_any')
m4_define(`hm_rv_fcntl',`
r= 0;
if (vb2.used != amtread) Psyntax("junk at end of line");
hm_create_nothing
- m4_define(`hm_arg_bytes_out',`r= Pbytes($'`2,$'`4);')
+ m4_define(`hm_arg_bytes_out',`
+ r= Pbytes($'`2,$'`4);
+ FR_WRITE(r);
+ FR_write(buf,r);
+ ')
$3
P_updatetime();
m4_define(`hm_specsyscall', `')
m4_include(`hsyscalls.i4')
+
+hm_stdsyscall_close