diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2018-06-01 14:58:53 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2018-06-01 14:58:53 +0100 |
| commit | 9be4af13305f24d2dabf94bb53e6b65c76d08bb2 (patch) | |
| tree | 7a337d256dec06e000d56e76b0c621983fa2f5fa /slirp/arp_table.c | |
| parent | c25e8bba1f546ea72744ccfab77f8a9e8a323be8 (diff) | |
| parent | 47335eeea8f1d14b7c6a1dd585a25a9166721168 (diff) | |
| download | focaccia-qemu-9be4af13305f24d2dabf94bb53e6b65c76d08bb2.tar.gz focaccia-qemu-9be4af13305f24d2dabf94bb53e6b65c76d08bb2.zip | |
Merge remote-tracking branch 'remotes/thibault/tags/samuel-thibault' into staging
slirp updates Alexey Kardashevskiy slirp: Improve debugging messages Andreas Gustafsson, Samuel Thibault, James Clarke slirp: Improve bandwidth in GDB remote debugging and FreeBSD guests Benjamin Drung: slirp/dhcp: Add domainname option Cédric Le Goater (3): slirp/ncsi: fix "Get Version ID" payload length slirp/ncsi: add a "Get Parameters" response slirp/ncsi: add checksum support Nia Alarie: net/slirp: Convert atoi to qemu_strtoi to allow error checking # gpg: Signature made Fri 01 Jun 2018 14:54:45 BST # gpg: using RSA key 996849C1CF560478 # gpg: Good signature from "Samuel Thibault <samuel.thibault@aquilenet.fr>" # gpg: aka "Samuel Thibault <sthibault@debian.org>" # gpg: aka "Samuel Thibault <samuel.thibault@gnu.org>" # gpg: aka "Samuel Thibault <samuel.thibault@inria.fr>" # gpg: aka "Samuel Thibault <samuel.thibault@labri.fr>" # gpg: aka "Samuel Thibault <samuel.thibault@ens-lyon.org>" # gpg: aka "Samuel Thibault <samuel.thibault@u-bordeaux.fr>" # gpg: WARNING: This key is not certified with sufficiently trusted signatures! # gpg: It is not certain that the signature belongs to the owner. # Primary key fingerprint: 900C B024 B679 31D4 0F82 304B D017 8C76 7D06 9EE6 # Subkey fingerprint: 3A3A 5D46 4660 E867 610C A427 9968 49C1 CF56 0478 * remotes/thibault/tags/samuel-thibault: slirp/ncsi: add checksum support slirp/ncsi: add a "Get Parameters" response slirp/ncsi: fix "Get Version ID" payload length slirp: Send window updates to guest after window was closed net/slirp: Convert atoi to qemu_strtoi to allow error checking slirp/debug: Print IP addresses in human readable form slirp: disable Nagle in ingoing connections slirp: disable Nagle in outgoing connections slirp: Add domainname option to slirp's DHCP server Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'slirp/arp_table.c')
| -rw-r--r-- | slirp/arp_table.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/slirp/arp_table.c b/slirp/arp_table.c index bac608f97f..f81963bb88 100644 --- a/slirp/arp_table.c +++ b/slirp/arp_table.c @@ -33,7 +33,7 @@ void arp_table_add(Slirp *slirp, uint32_t ip_addr, uint8_t ethaddr[ETH_ALEN]) int i; DEBUG_CALL("arp_table_add"); - DEBUG_ARG("ip = %s", inet_ntoa(*(struct in_addr *)&ip_addr)); + DEBUG_ARG("ip = %s", inet_ntoa((struct in_addr){.s_addr = ip_addr})); DEBUG_ARGS((dfd, " hw addr = %02x:%02x:%02x:%02x:%02x:%02x\n", ethaddr[0], ethaddr[1], ethaddr[2], ethaddr[3], ethaddr[4], ethaddr[5])); @@ -67,7 +67,7 @@ bool arp_table_search(Slirp *slirp, uint32_t ip_addr, int i; DEBUG_CALL("arp_table_search"); - DEBUG_ARG("ip = %s", inet_ntoa(*(struct in_addr *)&ip_addr)); + DEBUG_ARG("ip = %s", inet_ntoa((struct in_addr){.s_addr = ip_addr})); /* If broadcast address */ if (ip_addr == 0xffffffff || ip_addr == broadcast_addr) { |