From: "Philippe Mathieu-Daudé" <f4bug@amsat.org>
To: Samuel Thibault <samuel.thibault@ens-lyon.org>,
Jan Kiszka <jan.kiszka@siemens.com>,
"Michael S . Tsirkin" <mst@redhat.com>,
Paolo Bonzini <pbonzini@redhat.com>,
Eric Blake <eblake@redhat.com>, Thomas Huth <thuth@redhat.com>
Cc: "Philippe Mathieu-Daudé" <f4bug@amsat.org>, qemu-devel@nongnu.org
Subject: [Qemu-devel] [PATCH 09/12] slirp: add in6_dhcp_multicast()
Date: Mon, 8 Jan 2018 14:29:01 -0300 [thread overview]
Message-ID: <20180108172904.8772-10-f4bug@amsat.org> (raw)
In-Reply-To: <20180108172904.8772-1-f4bug@amsat.org>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
slirp/dhcpv6.h | 3 +++
slirp/udp6.c | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/slirp/dhcpv6.h b/slirp/dhcpv6.h
index 9189cd3f2d..3373f6cb89 100644
--- a/slirp/dhcpv6.h
+++ b/slirp/dhcpv6.h
@@ -17,6 +17,9 @@
0x00, 0x00, 0x00, 0x00,\
0x00, 0x01, 0x00, 0x02 } }
+#define in6_dhcp_multicast(a)\
+ in6_equal(a, &(struct in6_addr)ALLDHCP_MULTICAST)
+
void dhcpv6_input(struct sockaddr_in6 *srcsas, struct mbuf *m);
#endif
diff --git a/slirp/udp6.c b/slirp/udp6.c
index 9fa314bc2d..7c4a6b003a 100644
--- a/slirp/udp6.c
+++ b/slirp/udp6.c
@@ -65,7 +65,7 @@ void udp6_input(struct mbuf *m)
/* handle DHCPv6 */
if (ntohs(uh->uh_dport) == DHCPV6_SERVER_PORT &&
(in6_equal(&ip->ip_dst, &slirp->vhost_addr6) ||
- in6_equal(&ip->ip_dst, &(struct in6_addr)ALLDHCP_MULTICAST))) {
+ in6_dhcp_multicast(&ip->ip_dst))) {
m->m_data += iphlen;
m->m_len -= iphlen;
dhcpv6_input(&lhost, m);
--
2.15.1
next prev parent reply other threads:[~2018-01-08 17:29 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-01-08 17:28 [Qemu-devel] [PATCH 00/12] add HOST_SUPPORTS_UNALIGNED_ACCESS, reduce slirp warnings Philippe Mathieu-Daudé
2018-01-08 17:28 ` [Qemu-devel] [PATCH 01/12] slirp: remove QEMU_PACKED from structures with don't require it Philippe Mathieu-Daudé
2018-01-08 20:13 ` Thomas Huth
2018-01-09 20:54 ` Samuel Thibault
2018-01-08 17:28 ` [Qemu-devel] [PATCH 02/12] slirp: struct icmp/ethhdr ARE packed Philippe Mathieu-Daudé
2018-01-08 17:43 ` Thomas Huth
2018-01-08 17:28 ` [Qemu-devel] [PATCH 03/12] slirp: avoid IN6_IS_ADDR_UNSPECIFIED(), rather use in6_zero() Philippe Mathieu-Daudé
2018-01-09 21:04 ` Samuel Thibault
2018-01-08 17:28 ` [Qemu-devel] [PATCH 04/12] slirp: add in6_multicast() and use it instead of IN6_IS_ADDR_MULTICAST() Philippe Mathieu-Daudé
2018-01-08 20:10 ` Thomas Huth
2018-01-09 16:33 ` Richard Henderson
2018-01-09 17:08 ` Thomas Huth
2018-01-09 21:18 ` Samuel Thibault
2018-01-08 17:28 ` [Qemu-devel] [PATCH 05/12] slirp: poison IN6_*_ADDR_*() macros to avoid them Philippe Mathieu-Daudé
2018-01-08 17:46 ` Thomas Huth
2018-01-08 17:28 ` [Qemu-devel] [PATCH 06/12] slirp: remove unused header Philippe Mathieu-Daudé
2018-01-08 18:54 ` Thomas Huth
2018-01-09 21:21 ` Samuel Thibault
2018-01-08 17:28 ` [Qemu-devel] [PATCH 07/12] slirp: remove unnecessary Philippe Mathieu-Daudé
2018-01-08 19:01 ` Thomas Huth
2018-01-09 21:23 ` Samuel Thibault
2018-01-08 17:29 ` [Qemu-devel] [PATCH 08/12] slirp: removed unused code Philippe Mathieu-Daudé
2018-01-08 19:02 ` Thomas Huth
2018-01-09 21:24 ` Samuel Thibault
2018-01-08 17:29 ` Philippe Mathieu-Daudé [this message]
2018-01-09 21:26 ` [Qemu-devel] [PATCH 09/12] slirp: add in6_dhcp_multicast() Samuel Thibault
2018-01-08 17:29 ` [Qemu-devel] [PATCH 10/12] configure: disable unaligned access warning on x86 arch Philippe Mathieu-Daudé
2018-01-08 17:32 ` Peter Maydell
2018-01-08 17:53 ` Michael S. Tsirkin
2018-01-08 18:24 ` Philippe Mathieu-Daudé
2018-01-08 17:29 ` [Qemu-devel] [PATCH 11/12] configure: add HOST_SUPPORTS_UNALIGNED_ACCESS Philippe Mathieu-Daudé
2018-01-08 17:29 ` [Qemu-devel] [RFC PATCH 12/12] slirp: use HOST_SUPPORTS_UNALIGNED_ACCESS Philippe Mathieu-Daudé
2018-01-09 9:52 ` Paolo Bonzini
2018-01-09 21:30 ` Samuel Thibault
2018-01-08 19:41 ` [Qemu-devel] [PATCH 00/12] add HOST_SUPPORTS_UNALIGNED_ACCESS, reduce slirp warnings no-reply
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180108172904.8772-10-f4bug@amsat.org \
--to=f4bug@amsat.org \
--cc=eblake@redhat.com \
--cc=jan.kiszka@siemens.com \
--cc=mst@redhat.com \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=samuel.thibault@ens-lyon.org \
--cc=thuth@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).