From: Dmitry V. Levin <ldv@altlinux.org>
Date: Tue, 21 Jun 2016 16:45:40 +0000 (+0000)
Subject: Export print_sockaddr function
X-Git-Tag: v4.13~116
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3bf9c190f17b69ff90023fa721efa79dac62c7fc;p=strace

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 f40842dc..2297a711 100644
--- 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 9135c5b4..9deff8f9 100644
--- 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("}");
 
 }