Changeset 1691 for zzufTweet

Timestamp:

Jan 17, 2007, 6:14:22 PM (16 years ago)

Author:

Sam Hocevar

Message:

• recvmsg() support by Rémi Denis-Courmont.
• Minor code reorganisation.

Location:

zzuf/trunk

Files:

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

zzuf/trunk/AUTHORS

@@ -5 +5 @@
 
 other contributors:
- 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)
+ Rémi Denis-Courmont <rdenis#simphalempin:com> (readv, recvmsg)
+ Clément Stenac <zorglub#diwi:org> (pread)
+ Dominik Kuhlen <dominik.kuhlen#gmit-gmbh:de> (recvfrom)
 

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(), \fBrecvfrom\fR(), \fBclose\fR()
+\fBaccept\fR(), \fBsocket\fR(), \fBrecv\fR(), \fBrecvfrom\fR(), \fBrecvmsg\fR(),
+\fBclose\fR()
 .TP
 Standard IO streams:

zzuf/trunk/src/lib-fd.c

@@ -55 +55 @@
 #endif
 
+/* Local prototypes */
+static void fuzz_iovec   (int fd, const struct iovec *iov, ssize_t ret);
+static void offset_check (int fd);
+
 /* Library functions that we divert */
 static int     (*open_orig)    (const char *file, int oflag, ...);
@@ -66 +70 @@
 static int     (*recvfrom_orig)(int s, void *buf, size_t len, int flags,
                                 struct sockaddr *from, SOCKLEN_T *fromlen);
+static int     (*recvmsg_orig) (int s,  struct msghdr *hdr, int flags);
 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);
@@ -217 +222 @@
 }
 
-static void offset_check(int fd)
-{
-    /* Sanity check, can be OK though (for instance with a character device) */
-#ifdef HAVE_LSEEK64
-    off64_t ret;
-    LOADSYM(lseek64);
-    ret = lseek64_orig(fd, 0, SEEK_CUR);
-#else
-    off_t ret;
-    LOADSYM(lseek);
-    ret = lseek_orig(fd, 0, SEEK_CUR);
-#endif
-    if(ret != -1 && ret != _zz_getpos(fd))
-        debug("warning: offset inconsistency");
+int recvmsg(int s, struct msghdr *hdr, int flags)
+{
+    ssize_t ret;
+
+    LOADSYM(recvmsg);
+    ret = recvmsg_orig(s, hdr, flags);
+    if(!_zz_ready || !_zz_iswatched(s) || _zz_disabled)
+        return ret;
+
+    fuzz_iovec(s, hdr->msg_iov, ret);
+    debug("%s(%i, %p, %x) = %li", __func__, s, hdr, flags, (long int)ret);
+
+    return ret;
 }
 
@@ -272 +276 @@
         return ret;
 
+    fuzz_iovec(fd, iov, ret);
     debug("%s(%i, %p, %i) = %li", __func__, fd, iov, count, (long int)ret);
-
-    while(ret > 0)
-    {
-        void *b = iov->iov_base;
-        size_t len = iov->iov_len;
-
-        if(len > (size_t)ret)
-            len = ret;
-
-        _zz_fuzz(fd, b, len);
-        _zz_addpos(fd, len);
-
-        iov++;
-        ret -= len;
-    }
 
     offset_check(fd);
@@ -374 +364 @@
 }
 
+/* XXX: the following functions are local */
+
+static void fuzz_iovec (int fd, const struct iovec *iov, ssize_t ret)
+{
+    /* NOTE: We assume that iov countains at least <ret> bytes. */
+    while(ret > 0)
+    {
+        void *b = iov->iov_base;
+        size_t len = iov->iov_len;
+
+        if(len > (size_t)ret)
+            len = ret;
+
+        _zz_fuzz(fd, b, len);
+        _zz_addpos(fd, len);
+
+        iov++;
+        ret -= len;
+    }
+}
+
+static void offset_check(int fd)
+{
+    /* Sanity check, can be OK though (for instance with a character device) */
+#ifdef HAVE_LSEEK64
+    off64_t ret;
+    LOADSYM(lseek64);
+    ret = lseek64_orig(fd, 0, SEEK_CUR);
+#else
+    off_t ret;
+    LOADSYM(lseek);
+    ret = lseek_orig(fd, 0, SEEK_CUR);
+#endif
+    if(ret != -1 && ret != _zz_getpos(fd))
+        debug("warning: offset inconsistency");
+}
+