test: udp-preload: Fix inet_ntop calling convention

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

diff --git a/test/udp-preload.c b/test/udp-preload.c
index 653dfa57c01f6b74a69e3c57bd2a98a15a8cbc2c..49457ad42af888c8018d9c342f2f139fc9ef96f8 100644 (file)
--- a/test/udp-preload.c
+++ b/test/udp-preload.c
@@ -60,21 +60,24 @@ static anyfn_type *find_any(const char *name) {
 #define socket_args int domain, int type, int protocol
 #define close_args  int fd
 #define bind_args   int fd, const struct sockaddr *addr, socklen_t addrlen
+#define sendto_args int fd, const void *buf, size_t len, int flags, \
+                    const struct sockaddr *addr, socklen_t addrlen
 #define setsockopt_args  int fd, int level, int optname, \
                          const void *optval, socklen_t optlen
 #define getsockname_args int fd, struct sockaddr *addr, socklen_t *addrlen
 #define WRAPS(X)                                       \
-    X(socket,     (domain,type,protocol))              \
-    X(close,      (fd))                                        \
-    X(bind,       (fd,addr,addrlen))                   \
-    X(setsockopt, (fd,level,optname,optval,optlen))    \
-    X(getsockname,(fd,addr,addrlen))
-
-#define DEF_OLD(fn,args)                               \
-  typedef int fn##_fn_type(fn##_args);                 \
-  static int find_##fn(fn##_args);                     \
+    X(socket,     int,     (domain,type,protocol))             \
+    X(close,      int,     (fd))                                       \
+    X(bind,       int,     (fd,addr,addrlen))                  \
+    X(sendto,     ssize_t, (fd,buf,len,flags,addr,addrlen))    \
+    X(setsockopt, int,     (fd,level,optname,optval,optlen))   \
+    X(getsockname,int,     (fd,addr,addrlen))
+
+#define DEF_OLD(fn,rt,args)                            \
+  typedef rt fn##_fn_type(fn##_args);                  \
+  static rt find_##fn(fn##_args);                      \
   static fn##_fn_type find_##fn, *old_##fn=find_##fn;  \
-  static int find_##fn(fn##_args) {                    \
+  static rt find_##fn(fn##_args) {                     \
     anyfn_type *anyfn;                                 \
     anyfn= find_any(#fn); if (!anyfn) return -1;       \
     old_##fn= (fn##_fn_type*)anyfn;                    \
@@ -84,6 +87,7 @@ static anyfn_type *find_any(const char *name) {
 WRAPS(DEF_OLD)
 
 #define WRAP(fn) int fn(fn##_args)
+#define TWRAP(fn) fn(fn##_args)
 
 typedef struct{
     int af;
@@ -92,7 +96,7 @@ static fdinfo **table;
 static int tablesz;
 
 static fdinfo *lookup(int fd) {
-    if (fd>=tablesz) return 0;
+    if (fd<0 || fd>=tablesz) return 0;
     return table[fd];
 }
 
@@ -146,7 +150,10 @@ static int str2addrport(char *str,
     char *comma=strchr(str,',');
     if (!comma) { errno=ESRCH; return -1; }
     *comma++=0;
-    if (inet_pton(af,str,iav)) return -1;
+    int r=inet_pton(af,str,iav);
+//fprintf(stderr,"inet_pton(%d,\"%s\",)=%d\n",af,str,r);
+    if (r<0) return -1;
+    if (r==0) { errno=ENOTTY; return -1; }
 
     char *ep;
     errno=0;
@@ -159,6 +166,22 @@ static int str2addrport(char *str,
     return 0;
 }
 
+static char *sun_prep(struct sockaddr_un *sun) {
+    const char *dir=getenv("UDP_PRELOAD_DIR");
+    if (!dir) { errno=ECHILD; return 0; }
+
+    memset(sun,0,sizeof(*sun));
+    sun->sun_family=AF_UNIX;
+    int dl = strlen(dir);
+    if (dl + 1 + ADDRPORTSTRLEN + 1 > sizeof(sun->sun_path)) {
+       errno=ENAMETOOLONG; return 0;
+    }
+    strcpy(sun->sun_path,dir);
+    char *p=sun->sun_path+dl;
+    *p++='/';
+    return p;
+}
+
 WRAP(socket) {
     if (!((domain==AF_INET || domain==AF_INET6) &&
          type==SOCK_DGRAM))
@@ -183,7 +206,7 @@ WRAP(socket) {
 }
 
 WRAP(close) {
-    if (fd<tablesz) {
+    if (fd>=0 && fd<tablesz) {
        free(table[fd]);
        table[fd]=0;
     }
@@ -193,18 +216,8 @@ WRAP(close) {
 WRAP(bind) {
     fdinfo *ent=lookup(fd);
     if (!ent) return old_bind(fd,addr,addrlen);
-    const char *dir = getenv("UDP_PRELOAD_DIR");
-    if (!dir) { errno=ECHILD; return -1; }
     struct sockaddr_un sun;
-    memset(&sun,0,sizeof(sun));
-    sun.sun_family=AF_UNIX;
-    int dl = strlen(dir);
-    if (dl + 1 + ADDRPORTSTRLEN + 1 > sizeof(sun.sun_path)) {
-       errno=ENAMETOOLONG; return -1;
-    }
-    strcpy(sun.sun_path,dir);
-    char *p=sun.sun_path+dl;
-    *p++='/';
+    char *p=sun_prep(&sun);
     if (addrport2str(p,addr,addrlen)) return -1;
 //fprintf(stderr,"binding %s\n",sun.sun_path);
     if (unlink(sun.sun_path) && errno!=ENOENT) return -1;
@@ -234,6 +247,41 @@ WRAP(getsockname) {
 //     (unsigned long)sunlen);
        errno=EDOM; return -1;
     }
-    if (str2addrport(sun.sun_path,addr,addrlen)) return -1;
+    char *slash=strrchr(sun.sun_path,'/');
+    if (str2addrport(slash ? slash+1 : sun.sun_path,
+                    addr,addrlen)) return -1;
     return 0;
 }
+
+ssize_t TWRAP(sendto) {
+    fdinfo *ent=lookup(fd);
+    if (!ent) return old_sendto(fd,buf,len,flags,addr,addrlen);
+
+    if (flags) { errno=ENOEXEC; return -1; }
+
+    const char *leaf=getenv("UDP_PRELOAD_SERVER");
+    if (!leaf) leaf="udp";
+    if (strlen(leaf) > ADDRPORTSTRLEN) { errno=ENAMETOOLONG; return -1; }
+    struct sockaddr_un sun;
+    char *p=sun_prep(&sun);
+    strcpy(p,leaf);
+
+    char tbuf[ADDRPORTSTRLEN+1];
+    memset(tbuf,0,sizeof(tbuf));
+    if (addrport2str(tbuf,addr,addrlen)) return -1;
+
+    struct iovec iov[2];
+    iov[0].iov_base=tbuf;
+    iov[0].iov_len=sizeof(tbuf);
+    iov[1].iov_base=(void*)buf;
+    iov[1].iov_len=len;
+    
+    struct msghdr m;
+    memset(&m,0,sizeof(m));
+    m.msg_name=&sun;
+    m.msg_namelen=sizeof(sun);
+    m.msg_iov=iov;
+    m.msg_iovlen=2;
+
+    return sendmsg(fd,&m,0);
+}