msghdr.c: move all mmsghdr parsers to a separate file

* msghdr.h (print_struct_msghdr): New prototype.
* msghdr.c (print_msghdr): Rename to print_struct_msghdr, remove
static qualifier, all callers changed.
(decode_mmsghdr, decode_mmsgvec, dumpiov_in_mmsghdr): Move to ...
* mmsghdr.c: ... new file.
* Makefile.am (strace_SOURCES): Add it.

diff --git a/Makefile.am b/Makefile.am
index 97f0b306897cc4ed1194905798c97b043046faef..ecdafbf7a92ea58583e0b3ced8c985f47d61bc2d 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -152,6 +152,7 @@ strace_SOURCES =    \
        membarrier.c    \
        memfd_create.c  \
        mknod.c         \
+       mmsghdr.c       \
        mount.c         \
        mpers_type.h    \
        mq.c            \

diff --git a/mmsghdr.c b/mmsghdr.c
new file mode 100644 (file)
index 0000000..b79bd7d
--- /dev/null
+++ b/mmsghdr.c
@@ -0,0 +1,90 @@
+/*
+ * Copyright (c) 2010 Andreas Schwab <schwab@linux-m68k.org>
+ * Copyright (c) 2012-2013 Denys Vlasenko <vda.linux@googlemail.com>
+ * Copyright (c) 2014 Masatake YAMATO <yamato@redhat.com>
+ * Copyright (c) 2010-2016 Dmitry V. Levin <ldv@altlinux.org>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "defs.h"
+#include "msghdr.h"
+
+static int
+decode_mmsghdr(struct tcb *tcp, const int *const p_user_msg_namelen,
+              const long addr, const bool use_msg_len)
+{
+       struct mmsghdr mmsg;
+       int fetched = fetch_struct_mmsghdr(tcp, addr, &mmsg);
+
+       if (fetched) {
+               tprints("{msg_hdr=");
+               print_struct_msghdr(tcp, &mmsg.msg_hdr, p_user_msg_namelen,
+                                   use_msg_len ? mmsg.msg_len : -1UL);
+               tprintf(", msg_len=%u}", mmsg.msg_len);
+       } else {
+               printaddr(addr);
+       }
+
+       return fetched;
+}
+
+void
+decode_mmsgvec(struct tcb *tcp, unsigned long addr, unsigned int len,
+              bool use_msg_len)
+{
+       if (syserror(tcp)) {
+               printaddr(addr);
+       } else {
+               unsigned int i, fetched;
+
+               tprints("[");
+               for (i = 0; i < len; ++i, addr += fetched) {
+                       if (i)
+                               tprints(", ");
+                       fetched = decode_mmsghdr(tcp, 0, addr, use_msg_len);
+                       if (!fetched)
+                               break;
+               }
+               tprints("]");
+       }
+}
+
+void
+dumpiov_in_mmsghdr(struct tcb *tcp, long addr)
+{
+       unsigned int len = tcp->u_rval;
+       unsigned int i, fetched;
+       struct mmsghdr mmsg;
+
+       for (i = 0; i < len; ++i, addr += fetched) {
+               fetched = fetch_struct_mmsghdr(tcp, addr, &mmsg);
+               if (!fetched)
+                       break;
+               tprintf(" = %lu buffers in vector %u\n",
+                       (unsigned long) mmsg.msg_hdr.msg_iovlen, i);
+               dumpiov_upto(tcp, mmsg.msg_hdr.msg_iovlen,
+                       (long) mmsg.msg_hdr.msg_iov, mmsg.msg_len);
+       }
+}

diff --git a/msghdr.c b/msghdr.c
index 316e0ef6f61460c4df8f0459956f036b161095ec..b805aa33f3a8d35af0c9e8ffee9841c93d70d332 100644 (file)
--- a/msghdr.c
+++ b/msghdr.c
@@ -332,10 +332,10 @@ decode_msg_control(struct tcb *tcp, unsigned long addr,
        free(buf);
 }
 
-static void
-print_msghdr(struct tcb *tcp, const struct msghdr *msg,
-            const int *const p_user_msg_namelen,
-            const unsigned long data_size)
+void
+print_struct_msghdr(struct tcb *tcp, const struct msghdr *msg,
+                   const int *const p_user_msg_namelen,
+                   const unsigned long data_size)
 {
        const int msg_namelen =
                p_user_msg_namelen && (int) msg->msg_namelen > *p_user_msg_namelen
@@ -387,7 +387,7 @@ decode_msghdr(struct tcb *tcp, const int *const p_user_msg_namelen,
        struct msghdr msg;
 
        if (addr && verbose(tcp) && fetch_struct_msghdr(tcp, addr, &msg))
-               print_msghdr(tcp, &msg, p_user_msg_namelen, data_size);
+               print_struct_msghdr(tcp, &msg, p_user_msg_namelen, data_size);
        else
                printaddr(addr);
 }
@@ -400,61 +400,3 @@ dumpiov_in_msghdr(struct tcb *tcp, long addr, unsigned long data_size)
        if (fetch_struct_msghdr(tcp, addr, &msg))
                dumpiov_upto(tcp, msg.msg_iovlen, (long)msg.msg_iov, data_size);
 }
-
-static int
-decode_mmsghdr(struct tcb *tcp, const int *const p_user_msg_namelen,
-              const long addr, const bool use_msg_len)
-{
-       struct mmsghdr mmsg;
-       int fetched = fetch_struct_mmsghdr(tcp, addr, &mmsg);
-
-       if (fetched) {
-               tprints("{msg_hdr=");
-               print_msghdr(tcp, &mmsg.msg_hdr, p_user_msg_namelen,
-                            use_msg_len ? mmsg.msg_len : -1UL);
-               tprintf(", msg_len=%u}", mmsg.msg_len);
-       } else {
-               printaddr(addr);
-       }
-
-       return fetched;
-}
-
-void
-decode_mmsgvec(struct tcb *tcp, unsigned long addr, unsigned int len,
-              bool use_msg_len)
-{
-       if (syserror(tcp)) {
-               printaddr(addr);
-       } else {
-               unsigned int i, fetched;
-
-               tprints("[");
-               for (i = 0; i < len; ++i, addr += fetched) {
-                       if (i)
-                               tprints(", ");
-                       fetched = decode_mmsghdr(tcp, 0, addr, use_msg_len);
-                       if (!fetched)
-                               break;
-               }
-               tprints("]");
-       }
-}
-
-void
-dumpiov_in_mmsghdr(struct tcb *tcp, long addr)
-{
-       unsigned int len = tcp->u_rval;
-       unsigned int i, fetched;
-       struct mmsghdr mmsg;
-
-       for (i = 0; i < len; ++i, addr += fetched) {
-               fetched = fetch_struct_mmsghdr(tcp, addr, &mmsg);
-               if (!fetched)
-                       break;
-               tprintf(" = %lu buffers in vector %u\n",
-                       (unsigned long)mmsg.msg_hdr.msg_iovlen, i);
-               dumpiov_upto(tcp, mmsg.msg_hdr.msg_iovlen,
-                       (long)mmsg.msg_hdr.msg_iov, mmsg.msg_len);
-       }
-}

diff --git a/msghdr.h b/msghdr.h
index 9cf9854764348f90478a15fd9cdc40662a9092b4..41a07d70f04570640fc80ad8a817b7d7e317c0a1 100644 (file)
--- a/msghdr.h
+++ b/msghdr.h
@@ -11,4 +11,7 @@ struct mmsghdr {
 };
 # endif
 
+struct tcb;
+extern void print_struct_msghdr(struct tcb *, const struct msghdr *, const int *, unsigned long);
+
 #endif /* MSGHDR_H_ */