X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=regress%2Fhcommon.c.m4;h=f3c77d9de1e55263d91e9d926dbd7ba0be4696e3;hb=fc440c64836370db9d8cb1a25f09c9df0786f865;hp=05ce3f4a71a0536c7239b1b3207437d25661d6ae;hpb=cb0a827b8a83aa3a3775c10e42131d1501390041;p=adns.git diff --git a/regress/hcommon.c.m4 b/regress/hcommon.c.m4 index 05ce3f4..f3c77d9 100644 --- a/regress/hcommon.c.m4 +++ b/regress/hcommon.c.m4 @@ -2,16 +2,16 @@ m4_dnl hcommon.c m4_dnl (part of complex test harness, not of the library) m4_dnl - routines used for both record and playback -m4_dnl This file is -m4_dnl Copyright (C) 1997-2000 Ian Jackson -m4_dnl -m4_dnl It is part of adns, which is -m4_dnl Copyright (C) 1997-2000 Ian Jackson -m4_dnl Copyright (C) 1999-2000 Tony Finch +m4_dnl This file is part of adns, which is +m4_dnl Copyright (C) 1997-2000,2003,2006,2014-2016,2020 Ian Jackson +m4_dnl Copyright (C) 2014 Mark Wooding +m4_dnl Copyright (C) 1999-2000,2003,2006 Tony Finch +m4_dnl Copyright (C) 1991 Massachusetts Institute of Technology +m4_dnl (See the file INSTALL for full details.) m4_dnl m4_dnl This program is free software; you can redistribute it and/or modify m4_dnl it under the terms of the GNU General Public License as published by -m4_dnl the Free Software Foundation; either version 2, or (at your option) +m4_dnl the Free Software Foundation; either version 3, or (at your option) m4_dnl any later version. m4_dnl m4_dnl This program is distributed in the hope that it will be useful, @@ -20,8 +20,7 @@ m4_dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the m4_dnl GNU General Public License for more details. m4_dnl m4_dnl You should have received a copy of the GNU General Public License -m4_dnl along with this program; if not, write to the Free Software Foundation, -m4_dnl Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +m4_dnl along with this program; if not, write to the Free Software Foundation. m4_include(hmacros.i4) @@ -65,11 +64,14 @@ const struct Terrno Terrnos[]= { { 0, 0 } }; +const int Tnerrnos= sizeof(Terrnos)/sizeof(Terrnos[0]) - 1; + static vbuf vbw; int Hgettimeofday(struct timeval *tv, struct timezone *tz) { - Tensurerecordfile(); + Tensuresetup(); Tmust("gettimeofday","tz",!tz); + T_gettimeofday_hook(); *tv= currenttime; return 0; } @@ -101,6 +103,10 @@ void Q$1(hm_args_massage($3,void)) { m4_define(`hm_arg_must', `') m4_define(`hm_arg_socktype', ` Tvbf($'`1==SOCK_STREAM ? " $'`1=SOCK_STREAM" : " $'`1=SOCK_DGRAM");') + m4_define(`hm_arg_addrfam', ` + Tvbf($'`1==AF_INET ? " $'`1=AF_INET" : + $'`1==AF_INET6 ? " $'`1=AF_INET6" : + " $'`1=AF_???");') m4_define(`hm_arg_ign', `') m4_define(`hm_arg_fd', `Tvbf(" $'`1=%d",$'`1);') m4_define(`hm_arg_fcntl_cmd_arg', ` @@ -114,7 +120,7 @@ void Q$1(hm_args_massage($3,void)) { m4_define(`hm_arg_addr_in', `Tvba(" $'`1="); Tvbaddr($'`1,$'`2);') m4_define(`hm_arg_bytes_in', `') m4_define(`hm_arg_bytes_out', `Tvbf(" $'`4=%lu",(unsigned long)$'`4);') - m4_define(`hm_arg_addr_out', `Tvbf(" *$'`2=%d",$'`2);') + m4_define(`hm_arg_addr_out', `') $3 hm_create_nothing @@ -129,12 +135,17 @@ m4_define(`hm_specsyscall', `') m4_include(`hsyscalls.i4') +hm_stdsyscall_close + 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)); + char buf[ADNS_ADDR2TEXT_BUFLEN]; + int err, port; + int sz= sizeof(buf); + + err= adns_addr2text(addr, 0, buf,&sz, &port); + assert(!err); + + Tvbf(strchr(buf, ':') ? "[%s]:%d" : "%s:%d", buf,port); } void Tvbbytes(const void *buf, int len) { @@ -154,6 +165,11 @@ void Tvbfdset(int max, const fd_set *fds) { int i; const char *comma= ""; + if (!fds) { + Tvba("null"); + return; + } + Tvba("["); for (i=0; idata - (char*)mallocedlist.head) - -void *Hmalloc(size_t sz) { - struct malloced *newnode; - const char *mfavar; - char *ep; - - assert(sz); - - newnode= malloc(MALLOCHSZ + sz); if (!newnode) Tnomem(); - - LIST_LINK_TAIL(mallocedlist,newnode); - newnode->sz= sz; - newnode->count= ++malloccount; - if (!mallocfailat) { - mfavar= getenv("ADNS_REGRESS_MALLOCFAILAT"); - if (mfavar) { - mallocfailat= strtoul(mfavar,&ep,10); - if (!mallocfailat || *ep) Tfailed("ADNS_REGRESS_MALLOCFAILAT bad value"); - } else { - mallocfailat= ~0UL; - } - } - assert(newnode->count != mallocfailat); - memset(&newnode->data,0xc7,sz); - return &newnode->data; -} - -void Hfree(void *ptr) { - struct malloced *oldnode; - - if (!ptr) return; - - oldnode= (void*)((char*)ptr - MALLOCHSZ); - LIST_UNLINK(mallocedlist,oldnode); - memset(&oldnode->data,0x38,oldnode->sz); - free(oldnode); +void Hexit(int rv) { + Tensuresetup(); + vb.used= 0; + Tvbf("exit %d", rv); + Q_vb(); + Texit(0); } -void *Hrealloc(void *op, size_t nsz) { - struct malloced *oldnode; - void *np; - size_t osz; - - if (op) { oldnode= (void*)((char*)op - MALLOCHSZ); osz= oldnode->sz; } else { osz= 0; } - np= Hmalloc(nsz); - memcpy(np,op, osz>nsz ? nsz : osz); - Hfree(op); - return np; +pid_t Hgetpid(void) { + return 2264; /* just some number */ } -void Hexit(int rv) { - struct malloced *loopnode; - +void Tcommonshutdown(void) { Tshutdown(); adns__vbuf_free(&vb); adns__vbuf_free(&vbw); - if (mallocedlist.head) { - fprintf(stderr,"adns test harness: memory leaked:"); - for (loopnode=mallocedlist.head; loopnode; loopnode=loopnode->next) - fprintf(stderr," %lu",loopnode->count); - putc('\n',stderr); - if (ferror(stderr)) exit(-1); - } - exit(rv); + Tmallocshutdown(); }