Changeset 1686Tweet

Timestamp:

Jan 17, 2007, 4:07:35 PM (16 years ago)

Author:

Sam Hocevar

Message:

• recvfrom() support from Dominik Kuhlen.

Location:

zzuf/trunk

Files:

• AUTHORS (modified) (1 diff)
• doc/zzuf.1 (modified) (1 diff)
• src/lib-fd.c (modified) (3 diffs)

zzuf/trunk/AUTHORS

@@ -7 +7 @@
  Rémi Denis-Courmont <rdenis#simphalempin:com> (readv support)
  Clément Stenac <zorglub#diwi:org> (pread support)
+ Dominik Kuhlen <dominik.kuhlen#gmit-gmbh:de> (recvfrom support)
 

zzuf/trunk/doc/zzuf.1

@@ -322 +322 @@
 Unix file descriptor handling:
 \fBopen\fR(), \fBlseek\fR(), \fBread\fR(), \fBreadv\fR(), \fBpread\fR(),
-\fBaccept\fR(), \fBsocket\fR(), \fBclose\fR()
+\fBaccept\fR(), \fBsocket\fR(), \fBrecvfrom\fR(), \fBclose\fR()
 .TP
 Standard IO streams:

zzuf/trunk/src/lib-fd.c

@@ -4 +4 @@
  *                2007 Rémi Denis-Courmont <rdenis#simphalempin:com>
  *                2007 Clément Stenac <zorglub#diwi:org>
+ *                2007 Dominik Kuhlen <dominik.kuhlen#gmit-gmbh:de>
  *                All Rights Reserved
  *
@@ -62 +63 @@
                                 SOCKLEN_T *addrlen);
 static int     (*socket_orig)  (int domain, int type, int protocol);
+static int     (*recvfrom_orig)(int s,  void  *buf,  size_t len, int flags,
+                                struct sockaddr *from, SOCKLEN_T *fromlen);
 static ssize_t (*read_orig)    (int fd, void *buf, size_t count);
 static ssize_t (*readv_orig)   (int fd, const struct iovec *iov, int count);
@@ -151 +154 @@
 }
 
+int recvfrom(int s,  void  *buf,  size_t len, int flags,
+             struct sockaddr *from, SOCKLEN_T *fromlen) 
+{
+    int ret;
+
+    LOADSYM(recvfrom);
+    ret = recvfrom_orig(s, buf, len, flags, from, fromlen);
+    if(!_zz_ready || _zz_disabled || !_zz_network)
+        return ret;
+
+    if(ret > 0) 
+    {
+        char *b = buf;
+
+        _zz_fuzz(s, buf, ret);
+        _zz_addpos(s, ret);
+
+        if(ret >= 4)
+            debug("%s(%i, %p, %li) = %i \"%c%c%c%c...", __FUNCTION__, s, buf,
+                  (long int)len, ret, b[0], b[1], b[2], b[3]);
+        else
+            debug("%s(%i, %p, %li) = %i \"%c...", __FUNCTION__, s, buf,
+                  (long int)len, ret, b[0]);
+    }
+    else
+        debug("%s(%i, %p, %li) = %i", __FUNCTION__, s, buf, (long int)len, ret);
+
+    return ret;
+}
+
 static void offset_check(int fd)
 {