falso
/
qemu-irix
mirror of https://github.com/n64decomp/qemu-irix.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

slirp: Common lhost/fhost union 

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 <dgilbert@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
This commit is contained in:
Dr. David Alan Gilbert 2017-02-20 18:50:18 +00:00 committed by Samuel Thibault
parent 2a7cab9e17
commit 7eddf37c63
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
slirp/socket.h
View File

@ -15,6 +15,12 @@
* Our socket structure * Our socket structure
*/ */
union slirp_sockaddr {
struct sockaddr_storage ss;
struct sockaddr_in sin;
struct sockaddr_in6 sin6;
};
struct socket { struct socket {
struct socket *so_next,*so_prev; /* For a linked list of sockets */ 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 struct tcpiphdr *so_ti; /* Pointer to the original ti within
* so_mconn, for non-blocking connections */ * so_mconn, for non-blocking connections */
int so_urgc; int so_urgc;
union { /* foreign host */ union slirp_sockaddr fhost; /* Foreign host */
struct sockaddr_storage ss;
struct sockaddr_in sin;
struct sockaddr_in6 sin6;
} fhost;
#define so_faddr fhost.sin.sin_addr #define so_faddr fhost.sin.sin_addr
#define so_fport fhost.sin.sin_port #define so_fport fhost.sin.sin_port
#define so_faddr6 fhost.sin6.sin6_addr #define so_faddr6 fhost.sin6.sin6_addr
#define so_fport6 fhost.sin6.sin6_port #define so_fport6 fhost.sin6.sin6_port
#define so_ffamily fhost.ss.ss_family #define so_ffamily fhost.ss.ss_family
union { /* local host */ union slirp_sockaddr lhost; /* Local host */
struct sockaddr_storage ss;
struct sockaddr_in sin;
struct sockaddr_in6 sin6;
} lhost;
#define so_laddr lhost.sin.sin_addr #define so_laddr lhost.sin.sin_addr
#define so_lport lhost.sin.sin_port #define so_lport lhost.sin.sin_port
#define so_laddr6 lhost.sin6.sin6_addr #define so_laddr6 lhost.sin6.sin6_addr