diff options
| author | Nicholas Ngai <nicholas@ngai.me> | 2021-10-12 16:57:27 -0700 |
|---|---|---|
| committer | Nicholas Ngai <nicholas@ngai.me> | 2021-10-12 16:57:27 -0700 |
| commit | 2cd16e3d565905ab11a925a03a8191e6627350e6 (patch) | |
| tree | 8ef563d18c7da0207179fc15e24af627fc7a7568 /src | |
| parent | 7eb1d46e491edc41a881b6abd4fd1b15823236ae (diff) | |
| download | slirp-2cd16e3d565905ab11a925a03a8191e6627350e6.zip slirp-2cd16e3d565905ab11a925a03a8191e6627350e6.tar.gz slirp-2cd16e3d565905ab11a925a03a8191e6627350e6.tar.bz2 | |
socket: Restore original definition of fhost
Signed-off-by: Nicholas Ngai <nicholas@ngai.me>
Diffstat (limited to 'src')
| -rw-r--r-- | src/socket.h | 13 | ||||
| -rw-r--r-- | src/state.c | 2 |
2 files changed, 2 insertions, 13 deletions
diff --git a/src/socket.h b/src/socket.h index 95510ca..17901ad 100644 --- a/src/socket.h +++ b/src/socket.h @@ -29,16 +29,6 @@ typedef union in4or6_addr in4or6_addr; * Our socket structure */ -union slirp_sockaddr_host { - struct sockaddr sa; - struct sockaddr_storage ss; - struct sockaddr_in sin; - struct sockaddr_in6 sin6; -#ifndef _WIN32 - struct sockaddr_un sun; -#endif -}; - union slirp_sockaddr { struct sockaddr sa; struct sockaddr_storage ss; @@ -63,12 +53,11 @@ struct socket { struct tcpiphdr *so_ti; /* Pointer to the original ti within * so_mconn, for non-blocking connections */ uint32_t so_urgc; - union slirp_sockaddr_host fhost; /* Foreign host */ + 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_fpath fhost.sun.sun_path #define so_ffamily fhost.ss.ss_family union slirp_sockaddr lhost; /* Local host */ diff --git a/src/state.c b/src/state.c index 181d338..22af77b 100644 --- a/src/state.c +++ b/src/state.c @@ -273,7 +273,7 @@ static const VMStateDescription vmstate_slirp_socket = { VMSTATE_UINT16_TEST(so_lport, struct socket, slirp_older_than_v4), /* v4 and newer */ VMSTATE_STRUCT(fhost, struct socket, 4, vmstate_slirp_socket_addr, - union slirp_sockaddr_host), + union slirp_sockaddr), VMSTATE_STRUCT(lhost, struct socket, 4, vmstate_slirp_socket_addr, union slirp_sockaddr), |