[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v5 3/5] slirp: Common lhost/fhost union
From: |
Dr. David Alan Gilbert (git) |
Subject: |
[Qemu-devel] [PATCH v5 3/5] slirp: Common lhost/fhost union |
Date: |
Mon, 3 Apr 2017 18:18:41 +0100 |
From: "Dr. David Alan Gilbert" <address@hidden>
The socket structure has a pair of unions for lhost and fhost
addresses; the unions are identical so split them out into
a separate union declaration.
Signed-off-by: Dr. David Alan Gilbert <address@hidden>
---
slirp/socket.h | 18 ++++++++----------
1 file changed, 8 insertions(+), 10 deletions(-)
diff --git a/slirp/socket.h b/slirp/socket.h
index 8feed2a..c1be77e 100644
--- a/slirp/socket.h
+++ b/slirp/socket.h
@@ -15,6 +15,12 @@
* Our socket structure
*/
+union slirp_sockaddr {
+ struct sockaddr_storage ss;
+ struct sockaddr_in sin;
+ struct sockaddr_in6 sin6;
+};
+
struct socket {
struct socket *so_next,*so_prev; /* For a linked list of sockets */
@@ -31,22 +37,14 @@ struct socket {
struct tcpiphdr *so_ti; /* Pointer to the original ti within
* so_mconn, for non-blocking connections */
int so_urgc;
- union { /* foreign host */
- struct sockaddr_storage ss;
- struct sockaddr_in sin;
- struct sockaddr_in6 sin6;
- } fhost;
+ union slirp_sockaddr fhost; /* Foreign host */
#define so_faddr fhost.sin.sin_addr
#define so_fport fhost.sin.sin_port
#define so_faddr6 fhost.sin6.sin6_addr
#define so_fport6 fhost.sin6.sin6_port
#define so_ffamily fhost.ss.ss_family
- union { /* local host */
- struct sockaddr_storage ss;
- struct sockaddr_in sin;
- struct sockaddr_in6 sin6;
- } lhost;
+ union slirp_sockaddr lhost; /* Local host */
#define so_laddr lhost.sin.sin_addr
#define so_lport lhost.sin.sin_port
#define so_laddr6 lhost.sin6.sin6_addr
--
2.9.3
- [Qemu-devel] [PATCH v5 0/5 for 2.10] SLIRP VMStatification, Dr. David Alan Gilbert (git), 2017/04/03
- [Qemu-devel] [PATCH v5 1/5] slirp: VMState conversion; tcpcb, Dr. David Alan Gilbert (git), 2017/04/03
- [Qemu-devel] [PATCH v5 2/5] slirp: VMStatify sbuf, Dr. David Alan Gilbert (git), 2017/04/03
- [Qemu-devel] [PATCH v5 3/5] slirp: Common lhost/fhost union,
Dr. David Alan Gilbert (git) <=
- [Qemu-devel] [PATCH v5 5/5] slirp: VMStatify remaining except for loop, Dr. David Alan Gilbert (git), 2017/04/03
- [Qemu-devel] [PATCH v5 4/5] slirp: VMStatify socket level, Dr. David Alan Gilbert (git), 2017/04/03
- Re: [Qemu-devel] [PATCH v5 0/5 for 2.10] SLIRP VMStatification, no-reply, 2017/04/03