dany/u-boot-megous
1
0
Fork 0
mirror of https://xff.cz/git/u-boot/ synced 2025-10-27 08:33:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

net: sandbox: Allow fake eth to handle more than 1 packet response

Browse Source 
Use up to the max allocated receive buffers so as to be able to test
more complex situations.

Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
This commit is contained in:
Joe Hershberger
2018-09-26 16:48:57 -05:00
parent 76a503439e
commit c67a420781
2 changed files with 52 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
arch/sandbox/include/asm/eth.h
View File

@@ -55,16 +55,18 @@ typedef int sandbox_eth_tx_hand_f(struct udevice *dev, void *pkt,
* fake_host_hwaddr - MAC address of mocked machine * fake_host_hwaddr - MAC address of mocked machine
* fake_host_ipaddr - IP address of mocked machine * fake_host_ipaddr - IP address of mocked machine
* disabled - Will not respond * disabled - Will not respond
* recv_packet_buffer - buffer of the packet returned as received * recv_packet_buffer - buffers of the packet returned as received
* recv_packet_length - length of the packet returned as received * recv_packet_length - lengths of the packet returned as received
* recv_packets - number of packets returned
* tx_handler - function to generate responses to sent packets * tx_handler - function to generate responses to sent packets
*/ */
struct eth_sandbox_priv { struct eth_sandbox_priv {
uchar fake_host_hwaddr[ARP_HLEN]; uchar fake_host_hwaddr[ARP_HLEN];
struct in_addr fake_host_ipaddr; struct in_addr fake_host_ipaddr;
bool disabled; bool disabled;
uchar *recv_packet_buffer; uchar * recv_packet_buffer[PKTBUFSRX];
int recv_packet_length; int recv_packet_length[PKTBUFSRX];
int recv_packets;
sandbox_eth_tx_hand_f *tx_handler; sandbox_eth_tx_hand_f *tx_handler;
}; };

57
drivers/net/sandbox.c
View File

@@ -71,11 +71,15 @@ int sandbox_eth_arp_req_to_reply(struct udevice *dev, void *packet,
if (ntohs(arp->ar_op) != ARPOP_REQUEST) if (ntohs(arp->ar_op) != ARPOP_REQUEST)
return -EAGAIN; return -EAGAIN;
/* Don't allow the buffer to overrun */
if (priv->recv_packets >= PKTBUFSRX)
return 0;
/* store this as the assumed IP of the fake host */ /* store this as the assumed IP of the fake host */
priv->fake_host_ipaddr = net_read_ip(&arp->ar_tpa); priv->fake_host_ipaddr = net_read_ip(&arp->ar_tpa);
/* Formulate a fake response */ /* Formulate a fake response */
eth_recv = (void *)priv->recv_packet_buffer; eth_recv = (void *)priv->recv_packet_buffer[priv->recv_packets];
memcpy(eth_recv->et_dest, eth->et_src, ARP_HLEN); memcpy(eth_recv->et_dest, eth->et_src, ARP_HLEN);
memcpy(eth_recv->et_src, priv->fake_host_hwaddr, ARP_HLEN); memcpy(eth_recv->et_src, priv->fake_host_hwaddr, ARP_HLEN);
eth_recv->et_protlen = htons(PROT_ARP); eth_recv->et_protlen = htons(PROT_ARP);
@@ -91,7 +95,9 @@ int sandbox_eth_arp_req_to_reply(struct udevice *dev, void *packet,
memcpy(&arp_recv->ar_tha, &arp->ar_sha, ARP_HLEN); memcpy(&arp_recv->ar_tha, &arp->ar_sha, ARP_HLEN);
net_copy_ip(&arp_recv->ar_tpa, &arp->ar_spa); net_copy_ip(&arp_recv->ar_tpa, &arp->ar_spa);
priv->recv_packet_length = ETHER_HDR_SIZE + ARP_HDR_SIZE; priv->recv_packet_length[priv->recv_packets] =
ETHER_HDR_SIZE + ARP_HDR_SIZE;
++priv->recv_packets;
return 0; return 0;
} }
@@ -127,8 +133,12 @@ int sandbox_eth_ping_req_to_reply(struct udevice *dev, void *packet,
if (icmp->type != ICMP_ECHO_REQUEST) if (icmp->type != ICMP_ECHO_REQUEST)
return -EAGAIN; return -EAGAIN;
/* Don't allow the buffer to overrun */
if (priv->recv_packets >= PKTBUFSRX)
return 0;
/* reply to the ping */ /* reply to the ping */
eth_recv = (void *)priv->recv_packet_buffer; eth_recv = (void *)priv->recv_packet_buffer[priv->recv_packets];
memcpy(eth_recv, packet, len); memcpy(eth_recv, packet, len);
ipr = (void *)eth_recv + ETHER_HDR_SIZE; ipr = (void *)eth_recv + ETHER_HDR_SIZE;
icmpr = (struct icmp_hdr *)&ipr->udp_src; icmpr = (struct icmp_hdr *)&ipr->udp_src;
@@ -144,7 +154,8 @@ int sandbox_eth_ping_req_to_reply(struct udevice *dev, void *packet,
icmpr->checksum = 0; icmpr->checksum = 0;
icmpr->checksum = compute_ip_checksum(icmpr, ICMP_HDR_SIZE); icmpr->checksum = compute_ip_checksum(icmpr, ICMP_HDR_SIZE);
priv->recv_packet_length = len; priv->recv_packet_length[priv->recv_packets] = len;
++priv->recv_packets;
return 0; return 0;
} }
@@ -201,7 +212,11 @@ static int sb_eth_start(struct udevice *dev)
debug("eth_sandbox: Start\n"); debug("eth_sandbox: Start\n");
priv->recv_packet_buffer = net_rx_packets[0]; priv->recv_packets = 0;
for (int i = 0; i < PKTBUFSRX; i++) {
priv->recv_packet_buffer[i] = net_rx_packets[i];
priv->recv_packet_length[i] = 0;
}
return 0; return 0;
} }
@@ -227,18 +242,37 @@ static int sb_eth_recv(struct udevice *dev, int flags, uchar **packetp)
skip_timeout = false; skip_timeout = false;
} }
if (priv->recv_packet_length) { if (priv->recv_packets) {
int lcl_recv_packet_length = priv->recv_packet_length; int lcl_recv_packet_length = priv->recv_packet_length[0];
debug("eth_sandbox: received packet %d\n", debug("eth_sandbox: received packet[%d], %d waiting\n",
priv->recv_packet_length); lcl_recv_packet_length, priv->recv_packets - 1);
priv->recv_packet_length = 0; *packetp = priv->recv_packet_buffer[0];
*packetp = priv->recv_packet_buffer;
return lcl_recv_packet_length; return lcl_recv_packet_length;
} }
return 0; return 0;
} }
static int sb_eth_free_pkt(struct udevice *dev, uchar *packet, int length)
{
struct eth_sandbox_priv *priv = dev_get_priv(dev);
int i;
if (!priv->recv_packets)
return 0;
--priv->recv_packets;
for (i = 0; i < priv->recv_packets; i++) {
priv->recv_packet_length[i] = priv->recv_packet_length[i + 1];
memcpy(priv->recv_packet_buffer[i],
priv->recv_packet_buffer[i + 1],
priv->recv_packet_length[i + 1]);
}
priv->recv_packet_length[priv->recv_packets] = 0;
return 0;
}
static void sb_eth_stop(struct udevice *dev) static void sb_eth_stop(struct udevice *dev)
{ {
debug("eth_sandbox: Stop\n"); debug("eth_sandbox: Stop\n");
@@ -257,6 +291,7 @@ static const struct eth_ops sb_eth_ops = {
.start = sb_eth_start, .start = sb_eth_start,
.send = sb_eth_send, .send = sb_eth_send,
.recv = sb_eth_recv, .recv = sb_eth_recv,
.free_pkt = sb_eth_free_pkt,
.stop = sb_eth_stop, .stop = sb_eth_stop,
.write_hwaddr = sb_eth_write_hwaddr, .write_hwaddr = sb_eth_write_hwaddr,
}; };