diff options
| author | Jan Kiszka <jan.kiszka@siemens.com> | 2009-06-24 14:42:28 +0200 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2009-06-29 08:52:45 -0500 |
| commit | a13a4126c8b94355bbe43e47275b97ce5bef003c (patch) | |
| tree | be9f257c4e3956047481cbb2756813be3d023a94 /slirp/ip_input.c | |
| parent | ad196a9d0c14f681f010bb4b979030ec125ba976 (diff) | |
| download | qemu-a13a4126c8b94355bbe43e47275b97ce5bef003c.zip qemu-a13a4126c8b94355bbe43e47275b97ce5bef003c.tar.gz qemu-a13a4126c8b94355bbe43e47275b97ce5bef003c.tar.bz2 | |
slirp: Rework internal configuration
The user mode IP stack is currently only minimally configurable /wrt to
its virtual IP addresses. This is unfortunate if some guest has a fixed
idea of which IP addresses to use.
Therefore this patch prepares the stack for fully configurable IP
addresses and masks. The user interface and default addresses remain
untouched in this step, they will be enhanced in the following patch.
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'slirp/ip_input.c')
| -rw-r--r-- | slirp/ip_input.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/slirp/ip_input.c b/slirp/ip_input.c index c37412e..7a3c88b 100644 --- a/slirp/ip_input.c +++ b/slirp/ip_input.c @@ -134,18 +134,19 @@ ip_input(struct mbuf *m) } if (slirp_restrict) { - if (memcmp(&ip->ip_dst.s_addr, &special_addr, 3)) { + if ((ip->ip_dst.s_addr & vnetwork_mask.s_addr) == + vnetwork_addr.s_addr) { if (ip->ip_dst.s_addr == 0xffffffff && ip->ip_p != IPPROTO_UDP) goto bad; } else { - int host = ntohl(ip->ip_dst.s_addr) & 0xff; struct ex_list *ex_ptr; - if (host == 0xff) + if ((ip->ip_dst.s_addr & ~vnetwork_mask.s_addr) == + ~vnetwork_mask.s_addr) goto bad; for (ex_ptr = exec_list; ex_ptr; ex_ptr = ex_ptr->ex_next) - if (ex_ptr->ex_addr == host) + if (ex_ptr->ex_addr.s_addr == ip->ip_dst.s_addr) break; if (!ex_ptr) |