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

Correct name of fields in struct sockaddr_in6: sin6_port and sin6_family, not sin_port and sin_family

Browse Source
This commit is contained in:
Gregory Nutt 2015-01-20 18:14:09 -06:00
parent 0aa1fdf021
commit 5d31687e75
7 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/netinet/in.h
View File

@ -143,8 +143,8 @@ struct in6_addr
struct sockaddr_in6
{
sa_family_t sin_family; /* Address family: AF_INET */
uint16_t sin_port; /* Port in network byte order */
sa_family_t sin6_family; /* Address family: AF_INET */
uint16_t sin6_port; /* Port in network byte order */
struct in6_addr sin6_addr; /* IPv6 internet address */
};

8
net/netdev/netdev_ioctl.c
View File

@ -147,8 +147,8 @@ static int ioctl_addipv6route(FAR struct rtentry *rtentry)
net_ipv6addr_t netmask;
net_ipv6addr_t router;
addr = (FAR struct sockaddr_in6 *)rtentry->rt_target;
target = (net_ipv6addr_t)addr->sin6_addr.u6_addr16;
addr = (FAR struct sockaddr_in6 *)rtentry->rt_target;
target = (net_ipv6addr_t)addr->sin6_addr.u6_addr16;
addr = (FAR struct sockaddr_in6 *)rtentry->rt_netmask;
netmask = (net_ipv6addr_t)addr->sin6_addr.u6_addr16;
@ -264,8 +264,8 @@ static void ioctl_getipv6addr(FAR struct sockaddr_storage *outaddr,
FAR const net_ipv6addr_t inaddr)
{
FAR struct sockaddr_in6 *dest = (FAR struct sockaddr_in6 *)outaddr;
dest->sin_family = AF_INET6;
dest->sin_port = 0;
dest->sin6_family = AF_INET6;
dest->sin6_port = 0;
memcpy(dest->sin6_addr.in6_u.u6_addr8, inaddr, 16);
}
#endif

4
net/socket/accept.c
View File

@ -135,8 +135,8 @@ static inline void accept_tcpsender(FAR struct socket *psock,
FAR struct sockaddr_in6 *inaddr = (FAR struct sockaddr_in6 *)addr;
DEBUGASSERT(psock->s_domain == PF_INET6);
inaddr->sin_family = AF_INET6;
inaddr->sin_port = conn->rport;
inaddr->sin6_family = AF_INET6;
inaddr->sin6_port = conn->rport;
net_ipv6addr_copy(inaddr->sin6_addr.s6_addr, conn->u.ipv6.raddr);
}
#endif /* CONFIG_NET_IPv6 */

14
net/socket/getsockname.c
View File

@ -242,10 +242,10 @@ int ipv6_getsockname(FAR struct socket *psock, FAR struct sockaddr *addr,
case SOCK_STREAM:
{
FAR struct tcp_conn_s *tcp_conn = (FAR struct tcp_conn_s *)psock->s_conn;
outaddr->sin_port = tcp_conn->lport; /* Already in network byte order */
outaddr->sin6_port = tcp_conn->lport; /* Already in network byte order */
#ifdef CONFIG_NETDEV_MULTINIC
lipaddr = &tcp_conn->u.ipv6.laddr;
ripaddr = &tcp_conn->u.ipv6.raddr;
lipaddr = &tcp_conn->u.ipv6.laddr;
ripaddr = &tcp_conn->u.ipv6.raddr;
#endif
}
break;
@ -255,10 +255,10 @@ int ipv6_getsockname(FAR struct socket *psock, FAR struct sockaddr *addr,
case SOCK_DGRAM:
{
FAR struct udp_conn_s *udp_conn = (FAR struct udp_conn_s *)psock->s_conn;
outaddr->sin_port = udp_conn->lport; /* Already in network byte order */
outaddr->sin6_port = udp_conn->lport; /* Already in network byte order */
#ifdef CONFIG_NETDEV_MULTINIC
lipaddr = &udp_conn->u.ipv6.laddr;
ripaddr = &udp_conn->u.ipv6.raddr;
lipaddr = &udp_conn->u.ipv6.laddr;
ripaddr = &udp_conn->u.ipv6.raddr;
#endif
}
break;
@ -294,7 +294,7 @@ int ipv6_getsockname(FAR struct socket *psock, FAR struct sockaddr *addr,
/* Set the address family and the IP address */
#if defined(CONFIG_NET_TCP) || defined(CONFIG_NET_UDP)
outaddr->sin_family = AF_INET6;
outaddr->sin6_family = AF_INET6;
memcpy(outaddr->sin6_addr.in6_u.u6_addr8, dev->d_ipv6addr, 16);
*addrlen = sizeof(struct sockaddr_in6);
#endif

8
net/socket/recvfrom.c
View File

@ -586,8 +586,8 @@ static inline void recvfrom_tcpsender(FAR struct net_driver_s *dev,
FAR struct tcp_hdr_s *tcp = TCPIPv6BUF;
FAR struct ipv6_hdr_s *ipv6 = IPv6BUF;
infrom->sin_family = AF_INET6;
infrom->sin_port = tcp->srcport;
infrom->sin6_family = AF_INET6;
infrom->sin6_port = tcp->srcport;
net_ipv6addr_copy(infrom->sin6_addr.s6_addr, ipv6->srcipaddr);
}
@ -861,8 +861,8 @@ static inline void recvfrom_udpsender(struct net_driver_s *dev, struct recvfrom_
FAR struct udp_hdr_s *udp = UDPIPv6BUF;
FAR struct ipv6_hdr_s *ipv6 = IPv6BUF;
infrom->sin_family = AF_INET6;
infrom->sin_port = udp->srcport;
infrom->sin6_family = AF_INET6;
infrom->sin6_port = udp->srcport;
net_ipv6addr_copy(infrom->sin6_addr.s6_addr, ipv6->srcipaddr);
}

8
net/tcp/tcp_conn.c
View File

@ -577,9 +577,9 @@ static inline int tcp_ipv6_bind(FAR struct tcp_conn_s *conn,
#ifdef CONFIG_NETDEV_MULTINIC
port = tcp_selectport(PF_INET6,
(FAR const union ip_addr_u ipaddr *)addr->sin6_addr.in6_u.u6_addr16,
ntohs(addr->sin_port));
ntohs(addr->sin6_port));
#else
port = tcp_selectport(ntohs(addr->sin_port));
port = tcp_selectport(ntohs(addr->sin6_port));
#endif
net_unlock(flags);
@ -591,7 +591,7 @@ static inline int tcp_ipv6_bind(FAR struct tcp_conn_s *conn,
/* Save the local address in the connection structure. */
conn->lport = addr->sin_port;
conn->lport = addr->sin6_port;
#ifdef CONFIG_NETDEV_MULTINIC
net_ipv6addr_copy(conn->u.ipv6.laddr, addr->sin6_addr.in6_u.u6_addr16);
@ -1165,7 +1165,7 @@ int tcp_connect(FAR struct tcp_conn_s *conn, FAR const struct sockaddr *addr)
/* Save MSS and the port from the sockaddr (already in network order) */
conn->mss = MIN_IPv6_TCP_INITIAL_MSS;
conn->rport = inaddr->sin_port;
conn->rport = inaddr->sin6_port;
/* The sockaddr address is 32-bits in network order. */

4
net/udp/udp_conn.c
View File

@ -604,7 +604,7 @@ int udp_bind(FAR struct udp_conn_s *conn, FAR const struct sockaddr *addr)
/* Get the port number that we are binding to */
portno = inaddr->sin_port;
portno = inaddr->sin6_port;
#ifdef CONFIG_NETDEV_MULTINIC
/* Bind the local IP address to the connection. NOTE this address may
@ -725,7 +725,7 @@ int udp_connect(FAR struct udp_conn_s *conn, FAR const struct sockaddr *addr)
FAR const struct sockaddr_in6 *inaddr =
(FAR const struct sockaddr_in6 *)addr;
conn->rport = inaddr->sin_port;
conn->rport = inaddr->sin6_port;
net_ipv6addr_copy(conn->u.ipv6.raddr, inaddr->sin6_addr.s6_addr16);
}
#endif /* CONFIG_NET_IPv6 */