net/: Whenever the network initializes an IPv4 address, it must clear sin_zero.

This commit is contained in:
patacongo
2020-02-25 08:53:39 -06:00
committed by GitHub
parent 42d97079de
commit 861efdf8a3
9 changed files with 12 additions and 0 deletions
+1
View File
@@ -141,6 +141,7 @@ int ipv4_getpeername(FAR struct socket *psock, FAR struct sockaddr *addr,
outaddr->sin_family = psock->s_domain; outaddr->sin_family = psock->s_domain;
outaddr->sin_addr.s_addr = ripaddr; outaddr->sin_addr.s_addr = ripaddr;
memset(outaddr->sin_zero, 0, sizeof(outaddr->sin_zero));
*addrlen = sizeof(struct sockaddr_in); *addrlen = sizeof(struct sockaddr_in);
/* Return success */ /* Return success */
+3
View File
@@ -137,6 +137,7 @@ int ipv4_getsockname(FAR struct socket *psock, FAR struct sockaddr *addr,
{ {
outaddr->sin_family = psock->s_domain; outaddr->sin_family = psock->s_domain;
outaddr->sin_addr.s_addr = 0; outaddr->sin_addr.s_addr = 0;
memset(outaddr->sin_zero, 0, sizeof(outaddr->sin_zero));
*addrlen = sizeof(struct sockaddr_in); *addrlen = sizeof(struct sockaddr_in);
return OK; return OK;
@@ -166,6 +167,8 @@ int ipv4_getsockname(FAR struct socket *psock, FAR struct sockaddr *addr,
outaddr->sin_family = psock->s_domain; outaddr->sin_family = psock->s_domain;
outaddr->sin_addr.s_addr = dev->d_ipaddr; outaddr->sin_addr.s_addr = dev->d_ipaddr;
memset(outaddr->sin_zero, 0, sizeof(outaddr->sin_zero));
*addrlen = sizeof(struct sockaddr_in); *addrlen = sizeof(struct sockaddr_in);
net_unlock(); net_unlock();
+1
View File
@@ -142,6 +142,7 @@ static int ifconf_ipv4_callback(FAR struct net_driver_s *dev, FAR void *arg)
inaddr->sin_family = AF_INET; inaddr->sin_family = AF_INET;
inaddr->sin_port = 0; inaddr->sin_port = 0;
net_ipv4addr_copy(inaddr->sin_addr.s_addr, dev->d_ipaddr); net_ipv4addr_copy(inaddr->sin_addr.s_addr, dev->d_ipaddr);
memset(inaddr->sin_zero, 0, sizeof(inaddr->sin_zero));
} }
/* Increment the size of the buffer in any event */ /* Increment the size of the buffer in any event */
+2
View File
@@ -286,6 +286,7 @@ static void ioctl_get_ipv4addr(FAR struct sockaddr *outaddr,
dest->sin_family = AF_INET; dest->sin_family = AF_INET;
dest->sin_port = 0; dest->sin_port = 0;
dest->sin_addr.s_addr = inaddr; dest->sin_addr.s_addr = inaddr;
memset(dest->sin_zero, 0, sizeof(dest->sin_zero));
} }
#endif #endif
@@ -310,6 +311,7 @@ static void inline ioctl_get_ipv4broadcast(FAR struct sockaddr *outaddr,
dest->sin_family = AF_INET; dest->sin_family = AF_INET;
dest->sin_port = 0; dest->sin_port = 0;
dest->sin_addr.s_addr = net_ipv4addr_broadcast(inaddr, netmask); dest->sin_addr.s_addr = net_ipv4addr_broadcast(inaddr, netmask);
memset(dest->sin_zero, 0, sizeof(dest->sin_zero));
} }
#endif #endif
+1
View File
@@ -117,6 +117,7 @@ static inline void accept_tcpsender(FAR struct socket *psock,
inaddr->sin_family = AF_INET; inaddr->sin_family = AF_INET;
inaddr->sin_port = conn->rport; inaddr->sin_port = conn->rport;
net_ipv4addr_copy(inaddr->sin_addr.s_addr, conn->u.ipv4.raddr); net_ipv4addr_copy(inaddr->sin_addr.s_addr, conn->u.ipv4.raddr);
memset(inaddr->sin_zero, 0, sizeof(inaddr->sin_zero));
*addrlen = sizeof(struct sockaddr_in); *addrlen = sizeof(struct sockaddr_in);
} }
+1
View File
@@ -372,6 +372,7 @@ static inline void tcp_sender(FAR struct net_driver_s *dev,
net_ipv4addr_copy(infrom->sin_addr.s_addr, net_ipv4addr_copy(infrom->sin_addr.s_addr,
net_ip4addr_conv32(ipv4->srcipaddr)); net_ip4addr_conv32(ipv4->srcipaddr));
memset(infrom->sin_zero, 0, sizeof(infrom->sin_zero));
} }
} }
#endif /* CONFIG_NET_IPv4 */ #endif /* CONFIG_NET_IPv4 */
+1
View File
@@ -165,6 +165,7 @@ static uint16_t udp_datahandler(FAR struct net_driver_s *dev,
net_ipv4addr_copy(src_addr4.sin_addr.s_addr, net_ipv4addr_copy(src_addr4.sin_addr.s_addr,
net_ip4addr_conv32(ipv4->srcipaddr)); net_ip4addr_conv32(ipv4->srcipaddr));
memset(src_addr4.sin_zero, 0, sizeof(src_addr4.sin_zero));
src_addr_size = sizeof(src_addr4); src_addr_size = sizeof(src_addr4);
src_addr = &src_addr4; src_addr = &src_addr4;
+1
View File
@@ -375,6 +375,7 @@ static inline void udp_sender(FAR struct net_driver_s *dev,
net_ipv4addr_copy(infrom->sin_addr.s_addr, net_ipv4addr_copy(infrom->sin_addr.s_addr,
net_ip4addr_conv32(ipv4->srcipaddr)); net_ip4addr_conv32(ipv4->srcipaddr));
memset(infrom->sin_zero, 0, sizeof(infrom->sin_zero));
} }
} }
} }
+1
View File
@@ -681,6 +681,7 @@ ssize_t psock_udp_sendto(FAR struct socket *psock, FAR const void *buf,
addr4->sin_family = AF_INET; addr4->sin_family = AF_INET;
addr4->sin_port = conn->rport; addr4->sin_port = conn->rport;
net_ipv4addr_copy(addr4->sin_addr.s_addr, conn->u.ipv4.raddr); net_ipv4addr_copy(addr4->sin_addr.s_addr, conn->u.ipv4.raddr);
memset(addr4->sin_zero, 0, sizeof(addr4->sin_zero));
} }
#endif /* CONFIG_NET_IPv4 */ #endif /* CONFIG_NET_IPv4 */