OrgApache/incubator-nuttx
OrgApache
/
incubator-nuttx
mirror of https://github.com/apache/incubator-nuttx.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into ipv6

This commit is contained in:
Gregory Nutt 2015-01-17 17:08:22 -06:00
parent 86f617cc88 cfbe12adb2
commit 2a2c925259
3 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
net/socket/net_close.c
View File

@ -273,6 +273,7 @@ end_wait:
*
****************************************************************************/
#ifdef CONFIG_NET_TCP
static inline void netclose_txnotify(FAR struct socket *psock,
FAR struct tcp_conn_s *conn)
{
@ -311,6 +312,7 @@ static inline void netclose_txnotify(FAR struct socket *psock,
}
#endif /* CONFIG_NET_IPv6 */
}
#endif /* CONFIG_NET_TCP */
/****************************************************************************
* Function: netclose_disconnect

2
net/socket/recvfrom.c
View File

@ -1077,6 +1077,7 @@ static void recvfromo_pkt_rxnotify(FAR struct pkt_conn_s *conn)
*
****************************************************************************/
#ifdef CONFIG_NET_UDP
static inline void recvfrom_udp_rxnotify(FAR struct socket *psock,
FAR struct udp_conn_s *conn)
{
@ -1115,6 +1116,7 @@ static inline void recvfrom_udp_rxnotify(FAR struct socket *psock,
}
#endif /* CONFIG_NET_IPv6 */
}
#endif /* CONFIG_NET_UDP */
/****************************************************************************
* Function: pkt_recvfrom

11
net/socket/sendto.c
View File

@ -310,6 +310,7 @@ static uint16_t sendto_interrupt(FAR struct net_driver_s *dev, FAR void *conn,
*
****************************************************************************/
#ifdef CONFIG_NET_UDP
static inline void sendto_txnotify(FAR struct socket *psock,
FAR struct udp_conn_s *conn)
{
@ -348,6 +349,7 @@ static inline void sendto_txnotify(FAR struct socket *psock,
}
#endif /* CONFIG_NET_IPv6 */
}
#endif /* CONFIG_NET_UDP */
/****************************************************************************
* Public Functions
@ -424,10 +426,8 @@ ssize_t psock_sendto(FAR struct socket *psock, FAR const void *buf,
{
#ifdef CONFIG_NET_UDP
FAR struct udp_conn_s *conn;
#ifdef CONFIG_NET_IPv6
FAR const struct sockaddr_in6 *into = (const struct sockaddr_in6 *)to;
#else
FAR const struct sockaddr_in *into = (const struct sockaddr_in *)to;
#ifdef CONFIG_NET_ARP_SEND
FAR const struct sockaddr_in *into;
#endif
struct sendto_s state;
net_lock_t save;
@ -484,6 +484,7 @@ ssize_t psock_sendto(FAR struct socket *psock, FAR const void *buf,
/* Make sure that the IP address mapping is in the ARP table */
#ifdef CONFIG_NET_ARP_SEND
into = (FAR const struct sockaddr_in *)to;
ret = arp_send(into->sin_addr.s_addr);
if (ret < 0)
{
@ -582,7 +583,7 @@ ssize_t psock_sendto(FAR struct socket *psock, FAR const void *buf,
return state.st_sndlen;
#else
err = ENOSYS;
#endif
#endif /* CONFIG_NET_UDP */
errout:
set_errno(err);