sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix udp recvfrom to correctly return addrlen

Browse Source 
According to POSIX the length of the source address of the received
message shall be stored in the object pointed to by the address_len
argument.

This patch fixes two places where this did not happen correctly.

Signed-off-by: Michael Jung <michael.jung@secore.ly>
This commit is contained in:
Michael Jung 2022-04-27 11:24:30 +02:00 committed by Xiang Xiao
parent ded4fd33c1
commit 61f3bd10a5
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
net/udp/udp_recvfrom.c
View File

@ -244,6 +244,7 @@ static inline void udp_readahead(struct udp_recvfrom_s *pstate)
pstate->ir_recvlen = recvlen;
pstate->ir_buffer += recvlen;
pstate->ir_buflen -= recvlen;
*pstate->ir_fromlen = src_addr_size;
}
else
{
@ -320,6 +321,7 @@ static inline void udp_sender(FAR struct net_driver_s *dev,
{
FAR struct sockaddr_in *infrom =
(FAR struct sockaddr_in *)pstate->ir_from;
FAR socklen_t *fromlen = pstate->ir_fromlen;
if (infrom)
{
@ -334,7 +336,6 @@ static inline void udp_sender(FAR struct net_driver_s *dev,
{
FAR struct sockaddr_in6 *infrom6 =
(FAR struct sockaddr_in6 *)infrom;
FAR socklen_t *fromlen = pstate->ir_fromlen;
FAR struct udp_hdr_s *udp = UDPIPv6BUF;
FAR struct ipv6_hdr_s *ipv6 = IPv6BUF;
in_addr_t ipv4addr;
@ -356,6 +357,7 @@ static inline void udp_sender(FAR struct net_driver_s *dev,
infrom->sin_family = AF_INET;
infrom->sin_port = udp->srcport;
*fromlen = sizeof(struct sockaddr_in);
net_ipv4addr_copy(infrom->sin_addr.s_addr,
net_ip4addr_conv32(ipv4->srcipaddr));