From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36940) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a8U3S-0005PK-TH for qemu-devel@nongnu.org; Mon, 14 Dec 2015 09:24:47 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1a8U3O-0003S1-Cf for qemu-devel@nongnu.org; Mon, 14 Dec 2015 09:24:46 -0500 Received: from mx1.redhat.com ([209.132.183.28]:43076) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a8U3O-0003Rx-5J for qemu-devel@nongnu.org; Mon, 14 Dec 2015 09:24:42 -0500 References: <20151214134939.GA3142@var.bordeaux.inria.fr> <1450101088-14575-1-git-send-email-samuel.thibault@ens-lyon.org> <1450101088-14575-2-git-send-email-samuel.thibault@ens-lyon.org> From: Thomas Huth Message-ID: <566ED124.9020706@redhat.com> Date: Mon, 14 Dec 2015 15:24:36 +0100 MIME-Version: 1.0 In-Reply-To: <1450101088-14575-2-git-send-email-samuel.thibault@ens-lyon.org> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH 2/9] slirp: Generalizing and neutralizing ARP code List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Samuel Thibault , qemu-devel@nongnu.org Cc: zhanghailiang , Li Zhijian , Stefan Hajnoczi , Jason Wang , Dave Gilbert , Vasiliy Tolstov , Huangpeng , Gonglei , Jan Kiszka , Guillaume Subiron On 14/12/15 14:51, Samuel Thibault wrote: > From: Guillaume Subiron > > Basically, this patch replaces "arp" by "resolution" every time "arp" > means "mac resolution" and not specifically ARP. > > This prepares for IPv6 support. > > Signed-off-by: Guillaume Subiron > Signed-off-by: Samuel Thibault > --- > slirp/mbuf.c | 2 +- > slirp/mbuf.h | 2 +- > slirp/slirp.c | 4 ++-- > 3 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/slirp/mbuf.c b/slirp/mbuf.c > index 795fc29..bc942b6 100644 > --- a/slirp/mbuf.c > +++ b/slirp/mbuf.c > @@ -91,7 +91,7 @@ m_get(Slirp *slirp) > m->m_len = 0; > m->m_nextpkt = NULL; > m->m_prevpkt = NULL; > - m->arp_requested = false; > + m->resolution_requested = false; > m->expiration_date = (uint64_t)-1; > end_error: > DEBUG_ARG("m = %p", m); > diff --git a/slirp/mbuf.h b/slirp/mbuf.h > index b144f1c..38fedf4 100644 > --- a/slirp/mbuf.h > +++ b/slirp/mbuf.h > @@ -79,7 +79,7 @@ struct mbuf { > int m_len; /* Amount of data in this mbuf */ > > Slirp *slirp; > - bool arp_requested; > + bool resolution_requested; > uint64_t expiration_date; > /* start of dynamic buffer area, must be last element */ > union { > diff --git a/slirp/slirp.c b/slirp/slirp.c > index 35f819a..1d5d172 100644 > --- a/slirp/slirp.c > +++ b/slirp/slirp.c > @@ -786,7 +786,7 @@ int if_encap(Slirp *slirp, struct mbuf *ifm) > struct ethhdr *reh = (struct ethhdr *)arp_req; > struct arphdr *rah = (struct arphdr *)(arp_req + ETH_HLEN); > > - if (!ifm->arp_requested) { > + if (!ifm->resolution_requested) { > /* If the client addr is not known, send an ARP request */ > memset(reh->h_dest, 0xff, ETH_ALEN); > memcpy(reh->h_source, special_ethaddr, ETH_ALEN - 4); > @@ -812,7 +812,7 @@ int if_encap(Slirp *slirp, struct mbuf *ifm) > rah->ar_tip = iph->ip_dst.s_addr; > slirp->client_ipaddr = iph->ip_dst; > slirp_output(slirp->opaque, arp_req, sizeof(arp_req)); > - ifm->arp_requested = true; > + ifm->resolution_requested = true; > > /* Expire request and drop outgoing packet after 1 second */ > ifm->expiration_date = qemu_clock_get_ns(QEMU_CLOCK_REALTIME) + 1000000000ULL; Reviewed-by: Thomas Huth