#include <assert.h>
#include <stdlib.h>
+#ifndef OUTPUTSTREAM
+# define OUTPUTSTREAM stdout
+#endif
+
#include "adns.h"
static void failure(const char *what, adns_status st) {
failure("submit",r);
} else {
ri= adns_rr_info(types[ti], &rrtn,&fmtn,0, 0,0);
- putchar(' ');
+ putc(' ',stdout);
dumptype(ri,rrtn,fmtn);
fprintf(stdout," submitted\n");
}
for (i=0; i<ans->nrrs; i++) {
r= adns_rr_info(ans->type, 0,0,0, ans->rrs.bytes+i*len,&show);
if (r) failure("info",r);
- printf(" %s\n",show);
+ fprintf(stdout," %s\n",show);
free(show);
}
}
#define HARNESS_H_INCLUDED
#include <sys/time.h>
+#include <sys/socket.h>
#include <unistd.h>
+#include "internal.h"
+
/* We override several system calls with #define's */
int Hgettimeofday(struct timeval *tv, struct timezone *tz);
-int Hselect(int n, fd_set reads, fd_set writes, fd_set excepts, struct timeval *to);
+int Hselect(int n, fd_set *rfds, fd_set *wfds, fd_set *efds, struct timeval *to);
int Hsocket(int domain, int type, int protocol);
-int Hfcntl(int fd, int cmd, long arg);
+int Hfcntl(int fd, int cmd, ...);
int Hconnect(int fd, struct sockaddr *addr, int addrlen);
int Hclose(int fd);
int Hwrite(int fd, const void *buf, size_t len);
/* There is a Q function (Q for Question) for each such syscall;
- * it constructs a string representing the call, and
- * calls Tsyscall() on it.
+ * it constructs a string representing the call, and calls Q_str
+ * on it, or constructs it in vb and calls Q_vb;
*/
-void Tsyscall(const char *string);
-
void Qgettimeofday(void);
-void Qselect(int n, fd_set rfds, fd_set wfds, fd_set efds, const struct timeval *t);
+void Qselect(int n, const fd_set *rfds, const fd_set *wfds, const fd_set *efds,
+ const struct timeval *to);
void Qsocket(int type);
-void Qfcntl(int fd, int cmd, long arg);
+void Qfcntl_setfl(int fd, int cmd, long arg);
+void Qfcntl_other(int fd, int cmd);
void Qconnect(int fd, struct sockaddr *addr, int addrlen);
void Qclose(int fd);
-void Qsendto(int fd, const void *msg, int msglen, unsigned int flags,
+void Qsendto(int fd, const void *msg, int msglen,
const struct sockaddr *addr, int addrlen);
-void Qrecvfrom(int fd, int buflen, unsigned int flags, int *addrlen);
+void Qrecvfrom(int fd, int buflen, int addrlen);
void Qread(int fd, size_t len);
void Qwrite(int fd, const void *buf, size_t len);
+void Q_str(const char *str);
+void Q_vb(void);
+
+/* General help functions */
+
+void Tfailed(const char *why);
+void Toutputerr(void);
+void Tnomem(void);
+void Tfsyscallr(const char *fmt, ...) PRINTFFORMAT(1,2);
+void Tensureoutputfile(void);
+
+void Tvbf(const char *fmt, ...) PRINTFFORMAT(1,2);
+void Tvbvf(const char *fmt, va_list al);
+void Tvbfdset(int max, const fd_set *set);
+void Tvbaddr(const struct sockaddr *addr, int addrlen);
+void Tvbbytes(const void *buf, int len);
+void Tvberrno(int e);
+void Tvba(const char *str);
+
+/* Shared globals */
+
+extern vbuf vb;
+extern FILE *Toutputfile;
+
+extern const struct Terrno { const char *n; int v; } Terrnos[];
+
#endif
* Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
+#include <fcntl.h>
+#include <string.h>
+#include <errno.h>
+
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+
#include "harness.h"
#include "internal.h"
-static vbuf vb;
+vbuf vb;
+FILE *Toutputfile= 0;
+
+const struct Terrno Terrnos[]= {
+ { "EAGAIN", EAGAIN },
+ { "EINPROGRESS", EINPROGRESS },
+ { "EINTR", EINTR },
+ { "EINVAL", EINVAL },
+ { "EMSGSIZE", EMSGSIZE },
+ { "ENOBUFS", ENOBUFS },
+ { "ENOENT", ENOENT },
+ { "ENOPROTOOPT", ENOPROTOOPT },
+ { "ENOSPC", ENOSPC },
+ { "EWOULDBLOCK", EWOULDBLOCK },
+ { 0, 0 }
+};
void Qgettimeofday(void) {
- Tsyscall("gettimeofday()");
+ Q_str("gettimeofday()");
}
-void Qselect(int n, fd_set rfds, fd_set wfds, fd_set efds, const struct timeval *t) {
- char buf[100];
-
- sprintf(buf,"select(%d, [",n);
+void Qselect(int n, const fd_set *rfds, const fd_set *wfds, const fd_set *efds,
+ const struct timeval *to) {
vb.used= 0;
- Tvba(&vb,buf);
- Tvbfdset(&vb,n,rfds);
- Tvba(&vb,"], [");
- Tvbfdset(&vb,n,wfds);
- Tvba(&vb,"], [");
- Tvbfdset(&vb,n,efds);
- if (t) {
- sprintf(buf,"], %ld.%06ld)",t->tv_sec,t->tv_usec);
- Tvba(&vb,buf);
+ Tvbf("select(%d,",n);
+ Tvbfdset(n,rfds);
+ Tvba(",");
+ Tvbfdset(n,wfds);
+ Tvba(",");
+ Tvbfdset(n,efds);
+ if (to) {
+ Tvbf(", %ld.%06ld)",to->tv_sec,to->tv_usec);
} else {
- Tvba(&vb,"], NULL)");
+ Tvba(", NULL)");
}
- Tvbfin();
- Tsyscall(vb.buf);
+ Q_vb();
}
void Qsocket(int type) {
switch (type) {
- case SOCK_STREAM: Tsyscall("socket(,SOCK_STREAM,)"); break;
- case SOCK_DGRAM: Tsyscall("socket(,SOCK_DGRAM,)"); break;
+ case SOCK_STREAM: Q_str("socket(,SOCK_STREAM,)"); break;
+ case SOCK_DGRAM: Q_str("socket(,SOCK_DGRAM,)"); break;
default: abort();
}
}
-void Qfcntl(int fd, int cmd, long arg) {
- static char buf[100];
+void Qfcntl_setfl(int fd, int cmd, long arg) {
+ vb.used= 0;
+ Tvbf("fcntl(%d, F_SETFL, %ld)",fd,arg);
+ Q_vb();
+}
+
+void Qfcntl_other(int fd, int cmd) {
+ assert(cmd==F_GETFL);
+ vb.used= 0;
+ Tvbf("fcntl(%d, F_GETFL)",fd);
+ Q_vb();
+}
+
+void Qconnect(int fd, struct sockaddr *addr, int addrlen) {
+ vb.used= 0;
+ Tvbf("connect(%d, ",fd);
+ Tvbaddr(addr,addrlen);
+ Tvba(")");
+ Q_vb();
+}
+
+void Qclose(int fd) {
+ vb.used= 0;
+ Tvbf("close(%d)",fd);
+ Q_vb();
+}
+
+void Qsendto(int fd, const void *msg, int msglen,
+ const struct sockaddr *addr, int addrlen) {
+ vb.used= 0;
+ Tvbf("sendto(%d,,,, ",fd);
+ Tvbaddr(addr,addrlen);
+ Tvba(")");
+ Tvbbytes(msg,msglen);
+ Q_vb();
+}
+
+void Qrecvfrom(int fd, int buflen, int addrlen) {
+ vb.used= 0;
+ Tvbf("recvfrom(%d,,%d,,,%d)",fd,buflen,addrlen);
+ Q_vb();
+}
+
+void Qread(int fd, size_t len) {
+ vb.used= 0;
+ Tvbf("read(%d,,%lu)",fd,(unsigned long)len);
+ Q_vb();
+}
+
+void Qwrite(int fd, const void *buf, size_t len) {
+ vb.used= 0;
+ Tvbf("write(%d,,)",fd);
+ Tvbbytes(buf,len);
+ Q_vb();
+}
+
+
+void Tvbaddr(const struct sockaddr *addr, int len) {
+ const struct sockaddr_in *ai= (const struct sockaddr_in*)addr;
+
+ assert(len==sizeof(struct sockaddr_in));
+ assert(ai->sin_family==AF_INET);
+ Tvbf(" %s:%u",inet_ntoa(ai->sin_addr),htons(ai->sin_port));
+}
+
+void Tvbbytes(const void *buf, int len) {
+ const byte *bp;
+ int i;
+
+ if (!len) { Tvba(" empty"); return; }
+ for (i=0, bp=buf; i<len; i++, bp++) {
+ if (!(i&31)) Tvba("\n ");
+ else if (!(i&3)) Tvba(" ");
+ Tvbf("%02x",*bp);
+ }
+}
+
+void Tvbfdset(int max, const fd_set *fds) {
+ int i;
+ const char *comma= "";
+
+ Tvba(" [");
+ for (i=0; i<max; i++) {
+ if (!FD_ISSET(i,fds)) continue;
+ Tvba(comma);
+ Tvbf("%d",i);
+ comma= ",";
+ }
+ Tvba("]");
+}
+
+void Tvberrno(int e) {
+ const struct Terrno *te;
- switch (cmd) {
- case F_GETFL:
- sprintf(buf,"fcntl(%d, %s, %ld)",
+ for (te= Terrnos; te->n && te->v != e; te++);
+ if (te->n) Tvba(te->n);
+ else Tvbf("E#%d",e);
}
-void Qconnect(int fd, struct sockaddr *addr, int addrlen);
-void Qclose(int fd);
+void Tvba(const char *str) {
+ if (!adns__vbuf_appendstr(&vb,str)) Tnomem();
+}
-void Qsendto(int fd, const void *msg, int msglen, unsigned int flags,
- const struct sockaddr *addr, int addrlen);
-void Qrecvfrom(int fd, int buflen, unsigned int flags, int *addrlen);
+void Tvbvf(const char *fmt, va_list al) {
+ char buf[1000];
+ buf[sizeof(buf)-2]= '\t';
+ vsnprintf(buf,sizeof(buf),fmt,al);
+ assert(buf[sizeof(buf)-2] == '\t');
-void Qread(int fd, size_t len);
-void Qwrite(int fd, const void *buf, size_t len);
+ Tvba(buf);
+}
+
+void Tvbf(const char *fmt, ...) {
+ va_list al;
+ va_start(al,fmt);
+ Tvbvf(fmt,al);
+ va_end(al);
+}
+
+
+void Tfailed(const char *why) {
+ fprintf(stderr,"adns test harness: failure: %s: %s\n",why,strerror(errno));
+ exit(-1);
+}
+
+void Tnomem(void) {
+ Tfailed("unable to malloc/realloc");
+}
+
+void Toutputerr(void) {
+ Tfailed("write error on test harness output");
+}
+
+void Tensureoutputfile(void) {
+ /* fixme: allow sending it elsewhere */
+ Toutputfile= stdout;
+}
* Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
+#include <assert.h>
+#include <string.h>
+#include <fcntl.h>
+#include <errno.h>
+
#include "harness.h"
static int begin_set;
static struct timeval begin;
+void Q_str(const char *str) {
+ Tensureoutputfile();
+ if (fprintf(Toutputfile," %s\n",str) == EOF) Toutputerr();
+ if (fflush(Toutputfile)) Toutputerr();
+}
+
+void Q_vb(void) {
+ if (!adns__vbuf_append(&vb,"",1)) Tnomem();
+ Q_str(vb.buf);
+}
+
+static void Rvb(void) {
+ Q_vb();
+}
+
+static void Rf(const char *fmt, ...) PRINTFFORMAT(1,2);
+static void Rf(const char *fmt, ...) {
+ va_list al;
+
+ va_start(al,fmt);
+ Tvbvf(fmt,al);
+ va_end(al);
+ Rvb();
+}
+
+static void Rerrno(const char *call) {
+ int e;
+
+ e= errno;
+ Tvbf("%s ",call);
+ Tvberrno(e);
+ Rvb();
+ errno= e;
+}
+
int Hgettimeofday(struct timeval *tv, struct timezone *tz) {
int r;
struct timeval diff;
r= gettimeofday(tv,0); if (r) Tfailed("gettimeofday");
+ vb.used= 0;
if (!begin_set) {
- printf(" gettimeofday= %ld.%06ld",tv->tv_sec,tv->tv_usec);
+ Tvbf("gettimeofday= %ld.%06ld",tv->tv_sec,tv->tv_usec);
begin= *tv;
begin_set= 1;
} else {
}
assert(diff.tv_sec >= 0);
assert(diff.tv_usec >= 0);
- Tprintf(" gettimeofday= +%ld.%06ld\n",diff.tv_sec,diff.tv_usec);
+ Tvbf("gettimeofday= +%ld.%06ld",diff.tv_sec,diff.tv_usec);
}
+ Rvb();
+
return 0;
}
-int Hselect(int n, fd_set reads, fd_set writes, fd_set excepts, struct timeval *to) {
- Qselect(n,reads,writes,excepts,to);
+int Hselect(int n, fd_set *rfds, fd_set *wfds, fd_set *efds, struct timeval *to) {
+ int r;
+
+ Qselect(n,rfds,wfds,efds,to);
- r= select(n,reads,writes,excepts,to);
+ r= select(n,rfds,wfds,efds,to);
if (r==-1) {
- Terrorno("select");
+ Rerrno("select");
} else {
- Tprintf(" select= %d",r);
- Tfdset(reads); Tfdset(writes); Tfdset(excepts);
- Tprintf("\n");
+ vb.used= 0;
+ Tvbf("select= %d",r);
+ Tvbfdset(n,rfds);
+ Tvbfdset(n,wfds);
+ Tvbfdset(n,efds);
+ Rvb();
}
if (to) memset(to,0x5a,sizeof(*to));
+
+ return r;
}
int Hsocket(int domain, int type, int protocol) {
+ int r;
+
assert(domain == AF_INET);
Qsocket(type);
- r= socket(domain,type,protocol); if (r) Tfailed("socket");
+ r= socket(domain,type,protocol); if (r==-1) Tfailed("socket");
- Tprintf(" socket= %d\n",r);
+ Rf("socket= %d",r);
return r;
}
-int Hfcntl(int fd, int cmd, long arg) {
- Qfcntl(fd,cmd,arg);
-
- r= fcntl(fd, cmd, arg); if (r==-1) Tfailed("fcntl");
+int Hfcntl(int fd, int cmd, ...) {
+ long arg;
+ int r;
+ va_list al;
+
+ if (cmd == F_SETFL) {
+ va_start(al,cmd);
+ arg= va_arg(al,long);
+ va_end(al);
+ Qfcntl_setfl(fd,cmd,arg);
+ r= fcntl(fd, cmd, arg);
+ } else {
+ Qfcntl_other(fd,cmd);
+ r= fcntl(fd, cmd);
+ }
- Tprintf(" fcntl= %d\n",r);
+ if (r==-1) Tfailed("fcntl");
+ Rf("fcntl= %d",r);
return r;
}
int Hconnect(int fd, struct sockaddr *addr, int addrlen) {
+ int r;
+
Qconnect(fd,addr,addrlen);
r= connect(fd, addr, addrlen);
if (r) {
- Terrno("connect");
+ Rerrno("connect");
} else {
- Tprintf(" connect= OK\n");
+ Rf("connect= ok");
}
return r;
}
int Hsendto(int fd, const void *msg, int msglen, unsigned int flags,
const struct sockaddr *addr, int addrlen) {
- assert(!flags)
+ int r;
+
+ assert(!flags);
Qsendto(fd,msg,msglen,addr,addrlen);
r= sendto(fd,msg,msglen,flags,addr,addrlen);
if (r==-1) {
- Terrno("sendto");
+ Rerrno("sendto");
} else {
- Tprintf(" sendto= %d\n",r);
+ Rf("sendto= %d",r);
}
return r;
}
int Hrecvfrom(int fd, void *buf, int buflen, unsigned int flags,
struct sockaddr *addr, int *addrlen) {
- assert(!flags)
- Qrecvfrom(fd,buflen,addr,*addrlen);
+ int r;
+
+ assert(!flags);
+ Qrecvfrom(fd,buflen,*addrlen);
r= recvfrom(fd,buf,buflen,flags,addr,addrlen);
if (r==-1) {
- Terrno("recvfrom");
+ Rerrno("recvfrom");
} else {
- Tprintf(" recvfrom=",r);
- Taddr(addr,addrlen);
- Tbuf(buf,r);
- Tprintf("\n");
+ vb.used= 0;
+ Tvbf("recvfrom= %d",r);
+ Tvbaddr(addr,*addrlen);
+ Tvbbytes(buf,r);
+ Rvb();
}
return r;
}
int Hread(int fd, void *buf, size_t len) {
+ int r;
+
Qread(fd,len);
r= read(fd,buf,len);
if (r==-1) {
- Terrno("read");
+ Rerrno("read");
} else {
- Tprintf(" read=");
- Tbuf(buf,r);
- Tprintf("\n");
+ vb.used= 0;
+ Tvba("read=");
+ Tvbbytes(buf,r);
+ Rvb();
}
return r;
}
int Hwrite(int fd, const void *buf, size_t len) {
+ int r;
+
Qwrite(fd,buf,len);
r= write(fd,buf,len);
if (r==-1) {
- Terrno("write");
+ Rerrno("write");
} else {
- Tprintf(" write= %d\n",r);
+ Rf("write= %d",r);
}
return r;