vitalif
/
mirror_qemu
mirror of https://github.com/proxmox/mirror_qemu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'kiszka/queues/slirp' into staging 

* kiszka/queues/slirp:
  slirp: Handle whole 127.0.0.0/8 network as local addresses.
master
Anthony Liguori 2012-08-06 13:59:59 -05:00
parent f777501cc9 648cd33e73
commit 22d48de65c
3 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
slirp/main.h
View File

@ -31,6 +31,7 @@ extern char *exec_shell;
extern u_int curtime;
extern fd_set *global_readfds, *global_writefds, *global_xfds;
extern struct in_addr loopback_addr;
extern in_addr_t loopback_mask;
extern char *username;
extern char *socket_path;
extern int towrite_max;

3
slirp/slirp.c
View File

@ -29,6 +29,8 @@
/* host loopback address */
struct in_addr loopback_addr;
/* host loopback network mask */
in_addr_t loopback_mask;
/* emulated hosts use the MAC addr 52:55:IP:IP:IP:IP */
static const uint8_t special_ethaddr[ETH_ALEN] = {
@ -191,6 +193,7 @@ static void slirp_init_once(void)
#endif
loopback_addr.s_addr = htonl(INADDR_LOOPBACK);
loopback_mask = htonl(IN_CLASSA_NET);
}
static void slirp_state_save(QEMUFile *f, void *opaque);

7
slirp/tcp_subr.c
View File

@ -435,8 +435,11 @@ tcp_connect(struct socket *inso)
so->so_fport = addr.sin_port;
so->so_faddr = addr.sin_addr;
/* Translate connections from localhost to the real hostname */
if (so->so_faddr.s_addr == 0 || so->so_faddr.s_addr == loopback_addr.s_addr)
so->so_faddr = slirp->vhost_addr;
if (so->so_faddr.s_addr == 0 ||
(so->so_faddr.s_addr & loopback_mask) ==
(loopback_addr.s_addr & loopback_mask)) {
so->so_faddr = slirp->vhost_addr;
}
/* Close the accept() socket, set right state */
if (inso->so_state & SS_FACCEPTONCE) {