test: udp-preload: Remove now-obsolete `bound'

[secnet.git] / test / udp-preload.c

diff --git a/test/udp-preload.c b/test/udp-preload.c
index e3133a8428a8062f41e332cc9cfa01e406c66f92..ec3be09540ad654b0541419f627dfdaab0ae72da 100644 (file)
--- a/test/udp-preload.c
+++ b/test/udp-preload.c
@@ -80,10 +80,6 @@ WRAPS(DEF_OLD)
 
 typedef struct{
     int af;
-    union {
-       struct sockaddr_in v4;
-       struct sockaddr_in6 v6;
-    } bound;
 } fdinfo;
 static fdinfo **table;
 static int tablesz;
@@ -98,13 +94,14 @@ static fdinfo *lookup(int fd) {
 static int addrport2str(char buf[ADDRPORTSTRLEN+1],
                        const struct sockaddr *addr, socklen_t addrlen) {
     const void *addrv=addr;
+    const void *iav;
     const struct sockaddr_in  *sin;
     const struct sockaddr_in6 *sin6;
     uint16_t port;
     socklen_t el;
     switch (addr->sa_family) {
-    case AF_INET : sin =addrv; el=sizeof(*sin ); port=sin ->sin_port;  break;
-    case AF_INET6: sin6=addrv; el=sizeof(*sin6); port=sin6->sin6_port; break;
+    case AF_INET:  sin =addrv; el=sizeof(*sin ); iav=&sin ->sin_addr ; port=sin ->sin_port ; break;
+    case AF_INET6: sin6=addrv; el=sizeof(*sin6); iav=&sin6->sin6_addr; port=sin6->sin6_port; break;
     default: errno=ESRCH; return -1;
     }
 //fprintf(stderr,"af=%lu el=%lu addrlen=%lu\n",
@@ -113,7 +110,7 @@ static int addrport2str(char buf[ADDRPORTSTRLEN+1],
 //     (unsigned long)addrlen);
     if (addrlen!=el) { errno=EINVAL; return -1; }
     char *p=buf;
-    if (!inet_ntop(addr->sa_family,addr,p,INET6_ADDRSTRLEN)) return -1;
+    if (!inet_ntop(addr->sa_family,iav,p,INET6_ADDRSTRLEN)) return -1;
     p+=strlen(p);
     sprintf(p,",%u",(unsigned)ntohs(port));
     return 0;
@@ -135,7 +132,6 @@ WRAP(socket) {
     table[fd]=malloc(sizeof(*table[fd]));
     if (!table[fd]) goto fail;
     table[fd]->af=domain;
-    table[fd]->bound.v4.sin_family=0;
     return fd;
 
  fail:
@@ -160,6 +156,7 @@ WRAP(bind) {
     *p++='/';
     if (addrport2str(p,addr,addrlen)) return -1;
 //fprintf(stderr,"binding %s\n",sun.sun_path);
+    if (unlink(sun.sun_path) && errno!=ENOENT) return -1;
     return old_bind(fd,(const void*)&sun,sizeof(sun));
 }