diff options
| author | Peter Maydell | 2018-01-15 11:39:29 +0100 |
|---|---|---|
| committer | Peter Maydell | 2018-01-15 11:39:29 +0100 |
| commit | fd06527b80c88c8dde1b35fdc692685b68d2fd93 (patch) | |
| tree | 7e1b1f6e8835a8585fbc3bb929fb563248324598 /slirp/ndp_table.c | |
| parent | Merge remote-tracking branch 'remotes/kraxel/tags/ui-20180112-pull-request' i... (diff) | |
| parent | slirp: add in6_dhcp_multicast() (diff) | |
| download | qemu-fd06527b80c88c8dde1b35fdc692685b68d2fd93.tar.gz qemu-fd06527b80c88c8dde1b35fdc692685b68d2fd93.tar.xz qemu-fd06527b80c88c8dde1b35fdc692685b68d2fd93.zip | |
Merge remote-tracking branch 'remotes/thibault/tags/samuel-thibault' into staging
slirp updates
# gpg: Signature made Sun 14 Jan 2018 17:19:24 GMT
# gpg: using RSA key 0x996849C1CF560478
# 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: add in6_dhcp_multicast()
slirp: removed unused code
slirp: remove unnecessary struct declaration
slirp: remove unused header
slirp: avoid IN6_IS_ADDR_UNSPECIFIED(), rather use in6_zero()
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'slirp/ndp_table.c')
| -rw-r--r-- | slirp/ndp_table.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/slirp/ndp_table.c b/slirp/ndp_table.c index 9d4c39b45c..e1676a0a7b 100644 --- a/slirp/ndp_table.c +++ b/slirp/ndp_table.c @@ -23,7 +23,7 @@ void ndp_table_add(Slirp *slirp, struct in6_addr ip_addr, ethaddr[0], ethaddr[1], ethaddr[2], ethaddr[3], ethaddr[4], ethaddr[5])); - if (IN6_IS_ADDR_MULTICAST(&ip_addr) || IN6_IS_ADDR_UNSPECIFIED(&ip_addr)) { + if (IN6_IS_ADDR_MULTICAST(&ip_addr) || in6_zero(&ip_addr)) { /* Do not register multicast or unspecified addresses */ DEBUG_CALL(" abort: do not register multicast or unspecified address"); return; @@ -60,7 +60,7 @@ bool ndp_table_search(Slirp *slirp, struct in6_addr ip_addr, DEBUG_ARG("ip = %s", addrstr); #endif - assert(!IN6_IS_ADDR_UNSPECIFIED(&ip_addr)); + assert(!in6_zero(&ip_addr)); /* Multicast address: fec0::abcd:efgh/8 -> 33:33:ab:cd:ef:gh */ if (IN6_IS_ADDR_MULTICAST(&ip_addr)) { |