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=b64dbd7a32353c983ba9711d3810b1716e954b85;hpb=79833e62bc1a9625cc29b644e89be02b01e24dec;p=adns.git

diff --git a/regress/hcommon.c.m4 b/regress/hcommon.c.m4
index b64dbd7..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-1999 Ian Jackson <ian@davenant.greenend.org.uk>
-m4_dnl
-m4_dnl  It is part of adns, which is
-m4_dnl    Copyright (C) 1997-1999 Ian Jackson <ian@davenant.greenend.org.uk>
-m4_dnl    Copyright (C) 1999 Tony Finch <dot@dotat.at>
+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,19 +20,23 @@ 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)
 
-#include <fcntl.h>
 #include <string.h>
 #include <errno.h>
+#include <stdlib.h>
+#include <stdarg.h>
 
+#include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
 
+#include <unistd.h>
+#include <fcntl.h>
+
 #include "harness.h"
 #include "internal.h"
 
@@ -41,6 +45,7 @@ FILE *Toutputfile= 0;
 struct timeval currenttime;
 
 const struct Terrno Terrnos[]= {
+  { "EBADF",                     EBADF                        },
   { "EAGAIN",                    EAGAIN                       },
   { "EINPROGRESS",               EINPROGRESS                  },
   { "EINTR",                     EINTR                        },
@@ -51,13 +56,22 @@ const struct Terrno Terrnos[]= {
   { "ENOPROTOOPT",               ENOPROTOOPT                  },
   { "ENOSPC",                    ENOSPC                       },
   { "EWOULDBLOCK",               EWOULDBLOCK                  },
+  { "EHOSTUNREACH",              EHOSTUNREACH                 },
+  { "ECONNRESET",                ECONNRESET                   },
+  { "ECONNREFUSED",              ECONNREFUSED                 },
+  { "EPIPE",                     EPIPE                        },
+  { "ENOTSOCK",                  ENOTSOCK                     },
   {  0,                          0                            }
 };
 
+const int Tnerrnos= sizeof(Terrnos)/sizeof(Terrnos[0]) - 1;
+
 static vbuf vbw;
 
 int Hgettimeofday(struct timeval *tv, struct timezone *tz) {
+  Tensuresetup();
   Tmust("gettimeofday","tz",!tz);
+  T_gettimeofday_hook();
   *tv= currenttime;
   return 0;
 }
@@ -89,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', `
@@ -102,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
@@ -113,22 +131,28 @@ void Q$1(hm_args_massage($3,void)) {
 }
 ')
 
+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) {
   const byte *bp;
   int i;
 
-  if (!len) { Tvba(" empty"); return; }
+  if (!len) { Tvba("\n     ."); return; }
   for (i=0, bp=buf; i<len; i++, bp++) {
     if (!(i&31)) Tvba("\n     ");
     else if (!(i&3)) Tvba(" ");
@@ -141,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; i<max; i++) {
     if (!FD_ISSET(i,fds)) continue;
@@ -181,11 +210,9 @@ void Tvbpollfds(const struct pollfd *fds, int nfds) {
 void Tvberrno(int e) {
   const struct Terrno *te;
 
-  assert(e != EBADF);
-  assert(e != EFAULT);
   for (te= Terrnos; te->n && te->v != e; te++);
-  if (te->n) Tvba(te->n);
-  else Tvbf("E#%d",e);
+  assert(te->n);
+  Tvba(te->n);
 }
 
 void Tvba(const char *str) {
@@ -227,3 +254,22 @@ void Tnomem(void) {
 void Toutputerr(void) {
   Tfailed("write error on test harness output");
 }
+
+void Hexit(int rv) {
+  Tensuresetup();
+  vb.used= 0;
+  Tvbf("exit %d", rv);
+  Q_vb();
+  Texit(0);
+}
+
+pid_t Hgetpid(void) {
+  return 2264; /* just some number */
+}
+
+void Tcommonshutdown(void) {
+  Tshutdown();
+  adns__vbuf_free(&vb);
+  adns__vbuf_free(&vbw);
+  Tmallocshutdown();
+}