motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-20 16:42:04 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

slirp: Make Socket structure IPv6 compatible

Browse source 
This patch replaces foreign and local address/port couples in Socket
structure by 2 sockaddr_storage which can be casted in sockaddr_in.
Direct access to address and port is still possible thanks to some
\#define, so retrocompatibility of the existing code is assured.

The ss_family field of sockaddr_storage is declared after each socket
creation.

The whole structure is also saved/restored when a Qemu session is
saved/restored.

This prepares for IPv6 support.

Signed-off-by: Guillaume Subiron <maethor@subiron.org>
Signed-off-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>
This commit is contained in:
Guillaume Subiron 2015-12-19 22:24:58 +01:00 • committed by Jason Wang
parent 18137fba35
commit eae303ff23
7 changed files with 78 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

2
slirp/tcp_subr.c
View file

@ -413,6 +413,7 @@ void tcp_connect(struct socket *inso)
free(so); /* NOT sofree */
return;
}
so->so_lfamily = AF_INET;
so->so_laddr = inso->so_laddr;
so->so_lport = inso->so_lport;
}
@ -430,6 +431,7 @@ void tcp_connect(struct socket *inso)
qemu_setsockopt(s, SOL_SOCKET, SO_OOBINLINE, &opt, sizeof(int));
socket_set_nodelay(s);
so->so_ffamily = AF_INET;
so->so_fport = addr.sin_port;
so->so_faddr = addr.sin_addr;
/* Translate connections from localhost to the real hostname */