Make ARP replies at least 64 bytes long
PATCH 1/1 Make ARP replies at least 64 bytes long
IEEE 802.3 standard requires Ethernet frames to be at least 64 bytes long.
If it is not the case, they will be considered as runt frames, and may be ignored by netcard and/or OS
--- slirp/slirp.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-)
slirp/slirp.c +8 -4
@@ -599,9 +599,12 @@ static void arp_input(Slirp *slirp, const uint8_t *pkt, int pkt_len) {struct ethhdr *eh = (struct ethhdr *)pkt;struct arphdr *ah = (struct arphdr *)(pkt +ETH_HLEN ); -uint8_t arp_reply[ETH_HLEN +sizeof (struct arphdr )]; -struct ethhdr *reh = (struct ethhdr *)arp_reply; -struct arphdr *rah = (struct arphdr *)(arp_reply +ETH_HLEN ); +union { +uint8_t data[ETH_HLEN +sizeof (struct arphdr )]; +uint8_t payload[64 ];/* Minimum Ethernet frame size */ + } arp_reply; +struct ethhdr *reh = (struct ethhdr *)arp_reply.data; +struct arphdr *rah = (struct arphdr *)(arp_reply.data +ETH_HLEN );int ar_op;struct ex_list *ex_ptr;
@@ -619,6 +622,7 @@ static void arp_input(Slirp *slirp, const uint8_t *pkt, int pkt_len) }return ; arp_ok: +memset (&arp_reply,0 ,sizeof (arp_reply));/* XXX: make an ARP request to have the client address */ memcpy (slirp->client_ethaddr, eh->h_source,ETH_ALEN );
@@ -637,7 +641,7 @@ static void arp_input(Slirp *slirp, const uint8_t *pkt, int pkt_len) rah->ar_sip = ah->ar_tip;memcpy (rah->ar_tha, ah->ar_sha,ETH_ALEN ); rah->ar_tip = ah->ar_sip; -slirp_output (slirp->opaque, arp_reply,sizeof (arp_reply)); +slirp_output (slirp->opaque, (const uint8_t *)&arp_reply,sizeof (arp_reply)); }break ;case ARPOP_REPLY :
Signature · 1 line
1.7.1.GIT
Quoted 15 lines · Hervé Poussineau
IEEE 802.3 standard requires Ethernet frames to be at least 64 bytes long.
If it is not the case, they will be considered as runt frames, and may be ignored by netcard and/or OSSigned-off-by Hervé Poussineau <[email protected]>--- slirp/slirp.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-)slirp/slirp.c +0
-0@@ -599,9 +599,12 @@ static void arp_input(Slirp *slirp, const uint8_t *pkt, int pkt_len) {struct ethhdr *eh = (struct ethhdr *)pkt;
slirp/slirp.c static void arp_input(Slirp *slirp, const uint8_t *pkt, int pkt_len) · line 607
Quoted 10 lines
slirp/slirp.c +6
-3struct arphdr *ah = (struct arphdr *)(pkt +ETH_HLEN ); -uint8_t arp_reply[ETH_HLEN +sizeof (struct arphdr )]; -struct ethhdr *reh = (struct ethhdr *)arp_reply; -struct arphdr *rah = (struct arphdr *)(arp_reply +ETH_HLEN ); +union { +uint8_t data[ETH_HLEN +sizeof (struct arphdr )]; +uint8_t payload[64 ];/* Minimum Ethernet frame size */ + } arp_reply; +struct ethhdr *reh = (struct ethhdr *)arp_reply.data; +struct arphdr *rah = (struct arphdr *)(arp_reply.data +ETH_HLEN );
Hi,
Would you mind explaning the point of the union here? Why not just do something like:
- uint8_t arp_reply[ETH_HLEN + sizeof(struct arphdr)];
+ uint8_t arp_reply[MAX(ETH_HLEN + sizeof(struct arphdr), 64)];
Cheers
Quoted 24 lines
slirp/slirp.c +2
-1int ar_op;struct ex_list *ex_ptr;@@ -619,6 +622,7 @@ static void arp_input(Slirp *slirp, const uint8_t *pkt, int pkt_len) }return ; arp_ok: +memset (&arp_reply,0 ,sizeof (arp_reply));/* XXX: make an ARP request to have the client address */ memcpy (slirp->client_ethaddr, eh->h_source,ETH_ALEN );@@ -637,7 +641,7 @@ static void arp_input(Slirp *slirp, const uint8_t *pkt, int pkt_len) rah->ar_sip = ah->ar_tip;memcpy (rah->ar_tha, ah->ar_sha,ETH_ALEN ); rah->ar_tip = ah->ar_sip; -slirp_output (slirp->opaque, arp_reply,sizeof (arp_reply)); +slirp_output (slirp->opaque, (const uint8_t *)&arp_reply,sizeof (arp_reply)); }break ;case ARPOP_REPLY :Signature · 1 line
1.7.1.GIT
Quoted 37 lines · Edgar E. Iglesias
Quoted 16 lines · Hervé Poussineau
IEEE 802.3 standard requires Ethernet frames to be at least 64 bytes long.
If it is not the case, they will be considered as runt frames, and may be ignored by netcard and/or OSSigned-off-by Hervé Poussineau <[email protected]>--- slirp/slirp.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-)slirp/slirp.c +0
-0@@ -599,9 +599,12 @@ static void arp_input(Slirp *slirp, const uint8_t *pkt, int pkt_len) {struct ethhdr *eh = (struct ethhdr *)pkt;struct arphdr *ah = (struct arphdr *)(pkt +ETH_HLEN );slirp/slirp.c static void arp_input(Slirp *slirp, const uint8_t *pkt, int pkt_len) · line 608
Quoted 10 lines
slirp/slirp.c +6
-3-uint8_t arp_reply[ETH_HLEN +sizeof (struct arphdr )]; -struct ethhdr *reh = (struct ethhdr *)arp_reply; -struct arphdr *rah = (struct arphdr *)(arp_reply +ETH_HLEN ); +union { +uint8_t data[ETH_HLEN +sizeof (struct arphdr )]; +uint8_t payload[64 ];/* Minimum Ethernet frame size */ + } arp_reply; +struct ethhdr *reh = (struct ethhdr *)arp_reply.data; +struct arphdr *rah = (struct arphdr *)(arp_reply.data +ETH_HLEN );Hi,
Would you mind explaning the point of the union here? Why not just do something like:
Review
Quoted 2 lines
(quoted diff) +1
-1- uint8_t arp_reply[ETH_HLEN + sizeof(struct arphdr)]; + uint8_t arp_reply[MAX(ETH_HLEN + sizeof(struct arphdr), 64)];
Good idea. I'll send an updated patch soon.
Hervé