diff options
| author | Jan Kiszka <jan.kiszka@siemens.com> | 2011-08-05 12:51:11 +0200 |
|---|---|---|
| committer | Jan Kiszka <jan.kiszka@siemens.com> | 2011-08-05 12:51:11 +0200 |
| commit | 5a371a2e52facac1f79ab2cb1cf75ed661ab11b0 (patch) | |
| tree | 3dc5c833d89bda3801c4af8df7dcd24e83a4a420 /slirp | |
| parent | 81e34a2401f7ffd519bb7f093e833cb48734169f (diff) | |
slirp: Fix types of IP address parameters
Should be uint32_t for IPv4, not int. Also avoid in_addr_t without
proper includes. Fixes build regression on mingw32.
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Diffstat (limited to 'slirp')
| -rw-r--r-- | slirp/arp_table.c | 16 | ||||
| -rw-r--r-- | slirp/slirp.h | 4 |
2 files changed, 10 insertions, 10 deletions
diff --git a/slirp/arp_table.c b/slirp/arp_table.c index 820dee22b0..5d7b8acd1d 100644 --- a/slirp/arp_table.c +++ b/slirp/arp_table.c @@ -24,9 +24,9 @@ #include "slirp.h" -void arp_table_add(Slirp *slirp, int ip_addr, uint8_t ethaddr[ETH_ALEN]) +void arp_table_add(Slirp *slirp, uint32_t ip_addr, uint8_t ethaddr[ETH_ALEN]) { - const in_addr_t broadcast_addr = + const uint32_t broadcast_addr = ~slirp->vnetwork_mask.s_addr | slirp->vnetwork_addr.s_addr; ArpTable *arptbl = &slirp->arp_table; int i; @@ -60,29 +60,29 @@ void arp_table_add(Slirp *slirp, int ip_addr, uint8_t ethaddr[ETH_ALEN]) arptbl->next_victim = (arptbl->next_victim + 1) % ARP_TABLE_SIZE; } -bool arp_table_search(Slirp *slirp, int in_ip_addr, +bool arp_table_search(Slirp *slirp, uint32_t ip_addr, uint8_t out_ethaddr[ETH_ALEN]) { - const in_addr_t broadcast_addr = + const uint32_t broadcast_addr = ~slirp->vnetwork_mask.s_addr | slirp->vnetwork_addr.s_addr; ArpTable *arptbl = &slirp->arp_table; int i; DEBUG_CALL("arp_table_search"); - DEBUG_ARG("ip = 0x%x", in_ip_addr); + DEBUG_ARG("ip = 0x%x", ip_addr); /* Check 0.0.0.0/8 invalid source-only addresses */ - assert((in_ip_addr & htonl(~(0xf << 28))) != 0); + assert((ip_addr & htonl(~(0xf << 28))) != 0); /* If broadcast address */ - if (in_ip_addr == 0xffffffff || in_ip_addr == broadcast_addr) { + if (ip_addr == 0xffffffff || ip_addr == broadcast_addr) { /* return Ethernet broadcast address */ memset(out_ethaddr, 0xff, ETH_ALEN); return 1; } for (i = 0; i < ARP_TABLE_SIZE; i++) { - if (arptbl->table[i].ar_sip == in_ip_addr) { + if (arptbl->table[i].ar_sip == ip_addr) { memcpy(out_ethaddr, arptbl->table[i].ar_sha, ETH_ALEN); DEBUG_ARGS((dfd, " found hw addr = %02x:%02x:%02x:%02x:%02x:%02x\n", out_ethaddr[0], out_ethaddr[1], out_ethaddr[2], diff --git a/slirp/slirp.h b/slirp/slirp.h index 2a070e6126..dcf99d5ca4 100644 --- a/slirp/slirp.h +++ b/slirp/slirp.h @@ -208,9 +208,9 @@ typedef struct ArpTable { int next_victim; } ArpTable; -void arp_table_add(Slirp *slirp, int ip_addr, uint8_t ethaddr[ETH_ALEN]); +void arp_table_add(Slirp *slirp, uint32_t ip_addr, uint8_t ethaddr[ETH_ALEN]); -bool arp_table_search(Slirp *slirp, int in_ip_addr, +bool arp_table_search(Slirp *slirp, uint32_t ip_addr, uint8_t out_ethaddr[ETH_ALEN]); struct Slirp { |