diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2015-02-17 07:37:44 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2015-02-17 07:37:44 -0600 |
| commit | 480fa9b47778b9089a8e25129f913239a638c5c3 (patch) | |
| tree | bcfdb60c75f771ae58b07e8f9c2a3b018eb9b461 /nuttx/net/socket/recvfrom.c | |
| parent | 25392034e99f6ecac1c5987c226e32324dfe6f67 (diff) | |
| download | px4-nuttx-480fa9b47778b9089a8e25129f913239a638c5c3.tar.gz px4-nuttx-480fa9b47778b9089a8e25129f913239a638c5c3.tar.bz2 px4-nuttx-480fa9b47778b9089a8e25129f913239a638c5c3.zip | |
Move some useful internal logic from recvfrom.c and udp_callback.c and put them in ip.h where they can be used more generally
Diffstat (limited to 'nuttx/net/socket/recvfrom.c')
| -rw-r--r-- | nuttx/net/socket/recvfrom.c | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/nuttx/net/socket/recvfrom.c b/nuttx/net/socket/recvfrom.c index 3ca7b125e..13d42061a 100644 --- a/nuttx/net/socket/recvfrom.c +++ b/nuttx/net/socket/recvfrom.c @@ -971,20 +971,23 @@ static inline void recvfrom_udpsender(struct net_driver_s *dev, struct recvfrom_ FAR struct udp_conn_s *conn = (FAR struct udp_conn_s*)pstate->rf_sock->s_conn; FAR struct sockaddr_in6 *infrom6 = (FAR struct sockaddr_in6 *)infrom; + /* Hybrid dual-stack IPv6/IPv4 implementations recognize a special + * class of addresses, the IPv4-mapped IPv6 addresses. + */ + if (conn->domain == PF_INET6) { + in_addr_t ipv4addr; + + /* Encode the IPv4 address as an IPv4-mapped IPv6 address */ + infrom6->sin6_family = AF_INET6; infrom6->sin6_port = udp->srcport; *fromlen = sizeof(struct sockaddr_in6); - memset(infrom6->sin6_addr.s6_addr, 0, - sizeof(infrom6->sin6_addr.s6_addr) - sizeof(in_addr_t)); - - infrom6->sin6_addr.s6_addr[10] = 0xff; - infrom6->sin6_addr.s6_addr[11] = 0xff; - - memcpy(&infrom6->sin6_addr.s6_addr[12], ipv4->srcipaddr - sizeof(in_addr_t)); + ipv4addr = net_ip4addr_conv32(ipv4->srcipaddr); + ip6_map_ipv4addr(ipv4addr, + (net_ipv6addr_t)src_addr6.sin6_addr.s6_addr16); } else #endif |