Export print_sockaddr function

* defs.h (print_sockaddr): New prototype.
* net.c (print_sockaddr): Remove static keyword.
Change type of address pointer to "const void *".
(print_cmsg_ip_recverr, print_group_req): Remove redundant casts
in print_sockaddr invocations.

diff --git a/defs.h b/defs.h
index f40842dc7f6b8f993c333f68d421f75426923633..2297a71113495034b2fef1fca8446a4231d4e9dd 100644 (file)
--- a/defs.h
+++ b/defs.h
@@ -647,6 +647,7 @@ extern void printpathn(struct tcb *, long, unsigned int);
 #define TIMESPEC_TEXT_BUFSIZE \
                (sizeof(intmax_t)*3 * 2 + sizeof("{tv_sec=%jd, tv_nsec=%jd}"))
 extern void printfd(struct tcb *, int);
+extern void print_sockaddr(struct tcb *tcp, const void *, int);
 extern bool print_sockaddr_by_inode(const unsigned long, const enum sock_proto);
 extern bool print_sockaddr_by_inode_cached(const unsigned long);
 extern void print_dirfd(struct tcb *, int);

diff --git a/net.c b/net.c
index 9135c5b4fb6c6f4c1c5177897e99d239e7f98146..9deff8f93a7b0f19a99ca19daecf66117d1e36cc 100644 (file)
--- a/net.c
+++ b/net.c
@@ -135,9 +135,11 @@ typedef union {
 #endif
 } sockaddr_buf_t;
 
-static void
-print_sockaddr(struct tcb *tcp, const sockaddr_buf_t *addr, const int addrlen)
+void
+print_sockaddr(struct tcb *tcp, const void *const buf, const int addrlen)
 {
+       const sockaddr_buf_t *const addr = buf;
+
        tprints("{sa_family=");
        printxval(addrfams, addr->sa.sa_family, "AF_???");
        tprints(", ");
@@ -428,8 +430,7 @@ print_cmsg_ip_recverr(struct tcb *tcp, const void *cmsg_data,
                ", ee_info=%u, ee_data=%u, offender=",
                err->ee_errno, err->ee_origin, err->ee_type,
                err->ee_code, err->ee_info, err->ee_data);
-       print_sockaddr(tcp, (const void *) &err->offender,
-               sizeof(err->offender));
+       print_sockaddr(tcp, &err->offender, sizeof(err->offender));
        tprints("}");
 }
 
@@ -1373,8 +1374,7 @@ print_group_req(struct tcb *tcp, long addr, int len)
        }
 
        tprintf("{gr_interface=%u, gr_group=", greq.gr_interface);
-       print_sockaddr(tcp, (const void *) &greq.gr_group,
-                      sizeof(greq.gr_group));
+       print_sockaddr(tcp, &greq.gr_group, sizeof(greq.gr_group));
        tprintf("}");
 
 }