[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 7/9] slirp: Common lhost/fhost union
From: |
Samuel Thibault |
Subject: |
[Qemu-devel] [PULL 7/9] slirp: Common lhost/fhost union |
Date: |
Sat, 29 Apr 2017 18:47:48 +0200 |
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>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Reviewed-by: Juan Quintela <address@hidden>
Signed-off-by: Samuel Thibault <address@hidden>
---
slirp/socket.h | 18 ++++++++----------
1 file changed, 8 insertions(+), 10 deletions(-)
diff --git a/slirp/socket.h b/slirp/socket.h
index 8feed2aea4..c1be77eaf3 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.11.0
- [Qemu-devel] [PULL 0/9] slirp updates, Samuel Thibault, 2017/04/29
- [Qemu-devel] [PULL 3/9] slirp: tftp, copy sockaddr_size, Samuel Thibault, 2017/04/29
- [Qemu-devel] [PULL 4/9] slirp: fix pinging the virtual ipv4 DNS server, Samuel Thibault, 2017/04/29
- [Qemu-devel] [PULL 1/9] slirp: allow host port 0 for hostfwd, Samuel Thibault, 2017/04/29
- [Qemu-devel] [PULL 7/9] slirp: Common lhost/fhost union,
Samuel Thibault <=
- [Qemu-devel] [PULL 2/9] slirp/smb: Replace constant strings by glib string, Samuel Thibault, 2017/04/29
- [Qemu-devel] [PULL 9/9] slirp: VMStatify remaining except for loop, Samuel Thibault, 2017/04/29
- [Qemu-devel] [PULL 6/9] slirp: VMStatify sbuf, Samuel Thibault, 2017/04/29
- [Qemu-devel] [PULL 8/9] slirp: VMStatify socket level, Samuel Thibault, 2017/04/29
- [Qemu-devel] [PULL 5/9] slirp: VMState conversion; tcpcb, Samuel Thibault, 2017/04/29
- Re: [Qemu-devel] [PULL 0/9] slirp updates, no-reply, 2017/04/29