X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=adns.git;a=blobdiff_plain;f=regress%2Fhrecord.c;h=c059434e7ac522e951a40535da38a99095921fff;hp=c60f93c2286c93782a8f1c915e1dcac6187d69e5;hb=5c6cd9e070869430d1833751512d47300599f54c;hpb=239d2e4dfb6fcfc26fe3f740efae8f6944b99799

diff --git a/regress/hrecord.c b/regress/hrecord.c
index c60f93c..c059434 100644
--- a/regress/hrecord.c
+++ b/regress/hrecord.c
@@ -12,7 +12,7 @@ void Tshutdown(void) {
 static void R_recordtime(void) {
   int r;
   struct timeval tv, tvrel;
-  Tensureoutputfile();
+  Tensurerecordfile();
   r= gettimeofday(&tv,0); if (r) Tfailed("gettimeofday syscallbegin");
   tvrel.tv_sec= tv.tv_sec - currenttime.tv_sec;
   tvrel.tv_usec= tv.tv_usec - currenttime.tv_usec;
@@ -20,7 +20,7 @@ static void R_recordtime(void) {
   Tvbf("\n +%ld.%06ld",(long)tvrel.tv_sec,(long)tvrel.tv_usec);
   currenttime= tv;
 }
-void Tensureoutputfile(void) {
+void Tensurerecordfile(void) {
   const char *fdstr;
   int fd, r;
   if (Toutputfile) return;
@@ -36,7 +36,7 @@ void Tensureoutputfile(void) {
 }
 void Q_vb(void) {
   if (!adns__vbuf_append(&vb,"",1)) Tnomem();
-  Tensureoutputfile();
+  Tensurerecordfile();
   if (fprintf(Toutputfile," %s\n",vb.buf) == EOF) Toutputerr();
   if (fflush(Toutputfile)) Toutputerr();
 }
@@ -81,9 +81,9 @@ int Hpoll(	struct pollfd *fds , int nfds , int timeout 	) {
 #endif
 int Hsocket(	int domain , int type , int protocol 	) {
  int r, e;
-	Tmust("socket","domain",domain==AF_INET); 
+  Tmust("socket","domain",domain==PF_INET || domain==PF_INET6); 
   Tmust("socket","type",type==SOCK_STREAM || type==SOCK_DGRAM); 
- Qsocket(	 type 	);
+ Qsocket(	domain , type 	);
  r= socket(	domain , type , protocol 	);
  e= errno;
  vb.used= 0;
@@ -142,6 +142,36 @@ int Hconnect(	int fd , const struct sockaddr *addr , int addrlen 	) {
  errno= e;
  return r;
 }
+int Hbind(	int fd , const struct sockaddr *addr , int addrlen 	) {
+ int r, e;
+ Qbind(	fd , addr , addrlen 	);
+ r= bind(	fd , addr , addrlen 	);
+ e= errno;
+ vb.used= 0;
+ Tvba("bind=");
+  if (r) { Tvberrno(e); goto x_error; }
+  Tvba("OK");
+ x_error:
+ R_recordtime();
+ R_vb();
+ errno= e;
+ return r;
+}
+int Hlisten(	int fd , int backlog 	) {
+ int r, e;
+ Qlisten(	fd , backlog 	);
+ r= listen(	fd , backlog 	);
+ e= errno;
+ vb.used= 0;
+ Tvba("listen=");
+  if (r) { Tvberrno(e); goto x_error; }
+  Tvba("OK");
+ x_error:
+ R_recordtime();
+ R_vb();
+ errno= e;
+ return r;
+}
 int Hclose(	int fd 	) {
  int r, e;
  Qclose(	fd 	);