slirp: Generalizing and neutralizing ARP code

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 <maethor@subiron.org>
Signed-off-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>

3 files changed, 4 insertions, 4 deletions

diff --git a/mbuf.c b/mbuf.c
index aa4e133..daedec8 100644
--- a/mbuf.c
+++ b/mbuf.c
@@ -90,7 +90,7 @@ struct mbuf *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/mbuf.h b/mbuf.h
index 51ac81c..33c4471 100644
--- a/mbuf.h
+++ b/mbuf.h
@@ -78,7 +78,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.c b/slirp.c
index b74b3c7..591cf6e 100644
--- a/slirp.c
+++ b/slirp.c
@@ -780,7 +780,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);
@@ -806,7 +806,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 =