mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

slirp: Generalizing and neutralizing ARP code

Browse Source 
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>
This commit is contained in:
Guillaume Subiron 2015-12-19 22:24:56 +01:00 committed by Jason Wang
parent 86c9e1e9d7
commit fc3779a118
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
slirp/mbuf.c
View File

@ -91,7 +91,7 @@ m_get(Slirp *slirp)
m->m_len = 0; m->m_len = 0;
m->m_nextpkt = NULL; m->m_nextpkt = NULL;
m->m_prevpkt = NULL; m->m_prevpkt = NULL;
m->arp_requested = false; m->resolution_requested = false;
m->expiration_date = (uint64_t)-1; m->expiration_date = (uint64_t)-1;
end_error: end_error:
DEBUG_ARG("m = %p", m); DEBUG_ARG("m = %p", m);

2
slirp/mbuf.h
View File

@ -79,7 +79,7 @@ struct mbuf {
int m_len; /* Amount of data in this mbuf */ int m_len; /* Amount of data in this mbuf */
Slirp *slirp; Slirp *slirp;
bool arp_requested; bool resolution_requested;
uint64_t expiration_date; uint64_t expiration_date;
/* start of dynamic buffer area, must be last element */ /* start of dynamic buffer area, must be last element */
union { union {

4
slirp/slirp.c
View File

@ -786,7 +786,7 @@ int if_encap(Slirp *slirp, struct mbuf *ifm)
struct ethhdr *reh = (struct ethhdr *)arp_req; struct ethhdr *reh = (struct ethhdr *)arp_req;
struct arphdr *rah = (struct arphdr *)(arp_req + ETH_HLEN); 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 */ /* If the client addr is not known, send an ARP request */
memset(reh->h_dest, 0xff, ETH_ALEN); memset(reh->h_dest, 0xff, ETH_ALEN);
memcpy(reh->h_source, special_ethaddr, ETH_ALEN - 4); 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; rah->ar_tip = iph->ip_dst.s_addr;
slirp->client_ipaddr = iph->ip_dst; slirp->client_ipaddr = iph->ip_dst;
slirp_output(slirp->opaque, arp_req, sizeof(arp_req)); 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 */ /* Expire request and drop outgoing packet after 1 second */
ifm->expiration_date = qemu_clock_get_ns(QEMU_CLOCK_REALTIME) + 1000000000ULL; ifm->expiration_date = qemu_clock_get_ns(QEMU_CLOCK_REALTIME) + 1000000000ULL;