mirror/lwip
1
0
Fork 0
mirror of https://github.com/lwip-tcpip/lwip.git synced 2024-10-04 05:39:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Disabled queueing more than 1 packet on a ARP entry, as I suspect this clashes with the TCP segment queueing.

Browse Source
This commit is contained in:
likewise 2004-12-27 14:44:19 +00:00
parent a549ec0382
commit dfa96852f0
1 changed files with 38 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

84
src/netif/etharp.c
View File

@ -390,10 +390,10 @@ update_arp_entry(struct netif *netif, struct ip_addr *ipaddr, struct eth_addr *e
/* this is where we will send out queued packets! */ /* this is where we will send out queued packets! */
#if ARP_QUEUEING #if ARP_QUEUEING
while (arp_table[i].p != NULL) { while (arp_table[i].p != NULL) {
/* get the first packet on the queue (if any) */ /* get the first packet on the queue */
struct pbuf *p = arp_table[i].p; struct pbuf *p = arp_table[i].p;
/* Ethernet header */ /* Ethernet header */
struct eth_hdr *ethhdr = p->payload;; struct eth_hdr *ethhdr = p->payload;
/* remember (and reference) remainder of queue */ /* remember (and reference) remainder of queue */
/* note: this will also terminate the p pbuf chain */ /* note: this will also terminate the p pbuf chain */
arp_table[i].p = pbuf_dequeue(p); arp_table[i].p = pbuf_dequeue(p);
@ -571,36 +571,27 @@ etharp_arp_input(struct netif *netif, struct eth_addr *ethaddr, struct pbuf *p)
/** /**
* Resolve and fill-in Ethernet address header for outgoing packet. * Resolve and fill-in Ethernet address header for outgoing packet.
* *
* If ARP has the Ethernet address in cache, the given packet is * For IP multicast and broadcast, corresponding Ethernet addresses
* returned, ready to be sent. * are selected and the packet is transmitted on the link.
* *
* If ARP does not have the Ethernet address in cache the packet is * For unicast addresses, the packet is submitted to etharp_query(). In
* queued (if enabled and space available) and a ARP request is sent. * case the IP address is outside the local network, the IP address of
* This ARP request is returned as a pbuf, which should be sent by * the gateway is used.
* the caller.
*
* A returned non-NULL packet should be sent by the caller.
*
* If ARP failed to allocate resources, NULL is returned.
* *
* @param netif The lwIP network interface which the IP packet will be sent on. * @param netif The lwIP network interface which the IP packet will be sent on.
* @param ipaddr The IP address of the packet destination. * @param ipaddr The IP address of the packet destination.
* @param pbuf The pbuf(s) containing the IP packet to be sent. * @param pbuf The pbuf(s) containing the IP packet to be sent.
* *
* @return If non-NULL, a packet ready to be sent by caller.
*
* @return * @return
* - ERR_BUF Could not make room for Ethernet header. * - ERR_RTE No route to destination (no gateway to external networks),
* - ERR_MEM Hardware address unknown, and no more ARP entries available * or the return type of either etharp_query() or netif->linkoutput().
* to query for address or queue the packet.
* - ERR_RTE No route to destination (no gateway to external networks).
*/ */
err_t err_t
etharp_output(struct netif *netif, struct ip_addr *ipaddr, struct pbuf *q) etharp_output(struct netif *netif, struct ip_addr *ipaddr, struct pbuf *q)
{ {
struct eth_addr *dest, *srcaddr, mcastaddr; struct eth_addr *dest, *srcaddr, mcastaddr;
struct eth_hdr *ethhdr; struct eth_hdr *ethhdr;
err_t result = ERR_OK; u8_t i;
/* make room for Ethernet header - should not fail */ /* make room for Ethernet header - should not fail */
if (pbuf_header(q, sizeof(struct eth_hdr)) != 0) { if (pbuf_header(q, sizeof(struct eth_hdr)) != 0) {
@ -615,13 +606,13 @@ etharp_output(struct netif *netif, struct ip_addr *ipaddr, struct pbuf *q)
/* Determine on destination hardware address. Broadcasts and multicasts /* Determine on destination hardware address. Broadcasts and multicasts
* are special, other IP addresses are looked up in the ARP table. */ * are special, other IP addresses are looked up in the ARP table. */
/* destination IP address is an IP broadcast address? */ /* broadcast destination IP address? */
if (ip_addr_isany(ipaddr) || ip_addr_isbroadcast(ipaddr, netif)) { if (ip_addr_isbroadcast(ipaddr, netif)) {
/* broadcast on Ethernet also */ /* broadcast on Ethernet also */
dest = (struct eth_addr *)&ethbroadcast; dest = (struct eth_addr *)&ethbroadcast;
/* destination IP address is an IP multicast address? */ /* multicast destination IP address? */
} else if (ip_addr_ismulticast(ipaddr)) { } else if (ip_addr_ismulticast(ipaddr)) {
/* Hash IP multicast address to MAC address. */ /* Hash IP multicast address to MAC address.*/
mcastaddr.addr[0] = 0x01; mcastaddr.addr[0] = 0x01;
mcastaddr.addr[1] = 0x00; mcastaddr.addr[1] = 0x00;
mcastaddr.addr[2] = 0x5e; mcastaddr.addr[2] = 0x5e;
@ -630,7 +621,7 @@ etharp_output(struct netif *netif, struct ip_addr *ipaddr, struct pbuf *q)
mcastaddr.addr[5] = ip4_addr4(ipaddr); mcastaddr.addr[5] = ip4_addr4(ipaddr);
/* destination Ethernet address is multicast */ /* destination Ethernet address is multicast */
dest = &mcastaddr; dest = &mcastaddr;
/* destination IP address is an IP unicast address */ /* unicast destination IP address? */
} else { } else {
/* outside local network? */ /* outside local network? */
if (!ip_addr_netcmp(ipaddr, &(netif->ip_addr), &(netif->netmask))) { if (!ip_addr_netcmp(ipaddr, &(netif->ip_addr), &(netif->netmask))) {
@ -640,7 +631,7 @@ etharp_output(struct netif *netif, struct ip_addr *ipaddr, struct pbuf *q)
ipaddr = &(netif->gw); ipaddr = &(netif->gw);
/* no default gateway available */ /* no default gateway available */
} else { } else {
/* no route to destination error */ /* no route to destination error (default gateway missing) */
return ERR_RTE; return ERR_RTE;
} }
} }
@ -648,23 +639,17 @@ etharp_output(struct netif *netif, struct ip_addr *ipaddr, struct pbuf *q)
return etharp_query(netif, ipaddr, q); return etharp_query(netif, ipaddr, q);
} }
/* destination Ethernet address known */ /* continuation for multicast/broadcast destinations */
if (dest != NULL) { /* obtain source Ethernet address of the given interface */
u8_t i; srcaddr = (struct eth_addr *)netif->hwaddr;
/* obtain source Ethernet address of the given interface */ ethhdr = q->payload;
srcaddr = (struct eth_addr *)netif->hwaddr; for (i = 0; i < netif->hwaddr_len; i++) {
/* A valid IP->MAC address mapping was found, fill in the ethhdr->dest.addr[i] = dest->addr[i];
* Ethernet header for the outgoing packet */ ethhdr->src.addr[i] = srcaddr->addr[i];
ethhdr = q->payload;
for (i = 0; i < netif->hwaddr_len; i++) {
ethhdr->dest.addr[i] = dest->addr[i];
ethhdr->src.addr[i] = srcaddr->addr[i];
}
ethhdr->type = htons(ETHTYPE_IP);
/* send packet */
result = netif->linkoutput(netif, q);
} }
return result; ethhdr->type = htons(ETHTYPE_IP);
/* send packet directly on the link */
return netif->linkoutput(netif, q);
} }
/** /**
@ -707,9 +692,9 @@ err_t etharp_query(struct netif *netif, struct ip_addr *ipaddr, struct pbuf *q)
u8_t k; /* Ethernet address octet index */ u8_t k; /* Ethernet address octet index */
/* non-unicast address? */ /* non-unicast address? */
if (ip_addr_isany(ipaddr) || if (ip_addr_isbroadcast(ipaddr, netif) ||
ip_addr_isbroadcast(ipaddr, netif) || ip_addr_ismulticast(ipaddr) ||
ip_addr_ismulticast(ipaddr)) { ip_addr_isany(ipaddr)) {
LWIP_DEBUGF(ETHARP_DEBUG | DBG_TRACE, ("etharp_query: will not add non-unicast IP address to ARP cache\n")); LWIP_DEBUGF(ETHARP_DEBUG | DBG_TRACE, ("etharp_query: will not add non-unicast IP address to ARP cache\n"));
return ERR_ARG; return ERR_ARG;
} }
@ -718,7 +703,12 @@ err_t etharp_query(struct netif *netif, struct ip_addr *ipaddr, struct pbuf *q)
i = find_entry(ipaddr, ETHARP_TRY_HARD); i = find_entry(ipaddr, ETHARP_TRY_HARD);
/* could not find or create entry? */ /* could not find or create entry? */
if (i < 0) return (err_t)i; if (i < 0)
{
LWIP_DEBUGF(ETHARP_DEBUG | DBG_TRACE, ("etharp_query: could not create ARP entry\n"));
if (q) LWIP_DEBUGF(ETHARP_DEBUG | DBG_TRACE, ("etharp_query: packet dropped\n"));
return (err_t)i;
}
/* mark a fresh entry as pending (we just sent a request) */ /* mark a fresh entry as pending (we just sent a request) */
if (arp_table[i].state == ETHARP_STATE_EMPTY) { if (arp_table[i].state == ETHARP_STATE_EMPTY) {
@ -730,7 +720,7 @@ err_t etharp_query(struct netif *netif, struct ip_addr *ipaddr, struct pbuf *q)
((arp_table[i].state == ETHARP_STATE_PENDING) || ((arp_table[i].state == ETHARP_STATE_PENDING) ||
(arp_table[i].state == ETHARP_STATE_STABLE))); (arp_table[i].state == ETHARP_STATE_STABLE)));
/* do we have a pending entry? */ /* do we have a pending entry? or an implicit query request? */
if ((arp_table[i].state == ETHARP_STATE_PENDING) || (q == NULL)) { if ((arp_table[i].state == ETHARP_STATE_PENDING) || (q == NULL)) {
/* try to resolve it; send out ARP request */ /* try to resolve it; send out ARP request */
result = etharp_request(netif, ipaddr); result = etharp_request(netif, ipaddr);
@ -765,9 +755,11 @@ err_t etharp_query(struct netif *netif, struct ip_addr *ipaddr, struct pbuf *q)
/* ... in the empty queue */ /* ... in the empty queue */
pbuf_ref(p); pbuf_ref(p);
arp_table[i].p = p; arp_table[i].p = p;
#if 0 /* multi-packet-queueing disabled, see bug #11400 */
} else { } else {
/* ... at tail of non-empty queue */ /* ... at tail of non-empty queue */
pbuf_queue(arp_table[i].p, p); pbuf_queue(arp_table[i].p, p);
#endif
} }
LWIP_DEBUGF(ETHARP_DEBUG | DBG_TRACE, ("etharp_query: queued packet %p on ARP entry %d\n", (void *)q, i)); LWIP_DEBUGF(ETHARP_DEBUG | DBG_TRACE, ("etharp_query: queued packet %p on ARP entry %d\n", (void *)q, i));
result = ERR_OK; result = ERR_OK;