#define FDF_NONBLOCK 002u
static FILE *Tinputfile;
+static int stdout_enable;
-void Q_vb(void) { abort(); /* we neve called Q_anythig */ }
+static void Tflushstdout( void) {
+ if (fflush(stdout)) Toutputerr();
+}
+
+void Q_vb(void) {
+ if (!adns__vbuf_append(&vb,"",1)) Tnomem();
+ if (fprintf(stdout," %s\n",vb.buf) == EOF) Toutputerr();
+ Tflushstdout();
+}
static void Pformat(const char *what) {
fprintf(stderr,"adns test harness: format error in raw log input file: %s\n",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) {
}
void Tensurerecordfile(void) {
+ static int done;
+
+ if (done) return;
+ done++;
+
int fd;
fd = Ttestinputfd();
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);
+
+static void P_read_dump(const unsigned char *p0, size_t count, ssize_t d) {
+ fputs(" | ",stdout);
+ while (count) {
+ fprintf(stdout,"%02x", *p0);
+ p0 += d;
+ count--;
+ }
+}
+
+static void P_read(void *p, size_t sz, const char *what) {
+ ssize_t got = fread(p,1,sz,Tinputfile);
Pcheckinput();
assert(got==sz);
+ if (stdout_enable && sz) {
+ fprintf(stdout,"%s:",what);
+ P_read_dump(p, sz, +1);
+ if (sz<=16) {
+ P_read_dump((const unsigned char *)p+sz-1, sz, -1);
+ }
+ fputs(" |\n",stdout);
+ Tflushstdout();
+ }
}
-#define P_READ(x) (P_read(&(x), sizeof((x))))
-
-static void P_updatetime(void) {
-m4_dnl xxx
-}
+#define P_READ(x) (P_read(&(x), sizeof((x)), #x))
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, ¤ttime, &sum);
+ currenttime= sum;
+}
+
static void Paddr(struct sockaddr *addr, int *lenr) {
int l, r;
uint16_t port;
int l;
P_READ(l);
if (l<0 || l>maxlen) Pformat("bad byte block len");
- P_read(buf, l);
+ P_read(buf, l, "bytes");
return l;
}
-static void Pfdset(fd_set *set, int max) {
+static void Pfdset(fd_set *set, int max, int *r_io) {
uint16_t got;
int fd, ngot=0;
P_READ(got);
ngot= 16;
}
- if (!(got & 1u)) {
+ if (got & 1u) {
+ (*r_io)++;
+ } else {
FD_CLR(fd,set);
}
got >>= 1;
}
#ifdef HAVE_POLL
-static void Ppollfds(struct pollfd *fds, int nfds) {
-int fd;
+static void Ppollfds(struct pollfd *fds, int nfds, int *r_io) {
+ int fd;
for (fd=0; fd<nfds; fd++) {
if (!fds[fd].events) continue;
P_fdf(fd);
P_READ(fds[fd].revents);
+ if (fds[fd].revents)
+ (*r_io)++;
}
}
#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)) {
int r;
- m4_define(`hm_rv_fd',`')
- m4_define(`hm_rv_any',`')
- m4_define(`hm_rv_len',`')
- m4_define(`hm_rv_must',`')
- m4_define(`hm_rv_succfail',`')
- m4_define(`hm_rv_fcntl',`')
+ hm_create_nothing
$2
hm_create_hqcall_vars
$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',`
m4_define(`hm_rv_must',`
r= 0;
')
+ m4_define(`hm_rv_select',`hm_rv_succfail')
+ m4_define(`hm_rv_poll',`hm_rv_succfail')
m4_define(`hm_rv_fcntl',`
unsigned flg = P_fdf(fd);
if (cmd == F_GETFL) {
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
hm_create_nothing
- m4_define(`hm_arg_fdset_io',`Pfdset($'`1,$'`2);')
- m4_define(`hm_arg_pollfds_io',`Ppollfds($'`1,$'`2);')
+ m4_define(`hm_arg_fdset_io',`Pfdset($'`1,$'`2,&r);')
+ m4_define(`hm_arg_pollfds_io',`Ppollfds($'`1,$'`2,&r);')
m4_define(`hm_arg_addr_out',`Paddr($'`1,$'`2);')
$3
m4_define(`hm_arg_bytes_out',`r= Pbytes($'`2,$'`4);')
$3
- P_updatetime();
+ hm_create_nothing
+ m4_define(`hm_rv_selectpoll',`
+ if (($'`1) && !r) Pformat("select/poll returning 0 but infinite timeout");
+ ')
+ m4_define(`hm_rv_select',`hm_rv_selectpoll(!to)')
+ m4_define(`hm_rv_poll',`hm_rv_selectpoll(timeout<0)')
+ $2
+
return r;
}
')
m4_include(`hsyscalls.i4')
int Hclose(int fd) {
- int r;
P_fdf(fd);
fdtab.buf[fd]= 0;
- hm_rv_succfail
- return r;
+ return P_succfail();
}
~ianmdlvl / adns.git / blobdiff