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

Networking: Hook in send and revcfrom Unix domain socket logic; still needs hooks for sendto logic

Browse Source
This commit is contained in:
Gregory Nutt 2015-01-26 18:47:48 -06:00
parent 597b579943
commit a88b824f96
3 changed files with 95 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

85
net/socket/recvfrom.c
View File

@ -68,6 +68,7 @@
#include "tcp/tcp.h"
#include "udp/udp.h"
#include "pkt/pkt.h"
#include "local/local.h"
#include "socket/socket.h"
/****************************************************************************
@ -1580,7 +1581,7 @@ static ssize_t tcp_recvfrom(FAR struct socket *psock, FAR void *buf, size_t len,
****************************************************************************/
ssize_t psock_recvfrom(FAR struct socket *psock, FAR void *buf, size_t len,
int flags,FAR struct sockaddr *from,
int flags, FAR struct sockaddr *from,
FAR socklen_t *fromlen)
{
ssize_t ret;
@ -1645,30 +1646,72 @@ ssize_t psock_recvfrom(FAR struct socket *psock, FAR void *buf, size_t len,
/* Read from the network interface driver buffer */
/* Or perform the TCP/IP or UDP recv() operation */
#if defined(CONFIG_NET_PKT)
if (psock->s_type == SOCK_RAW)
switch (psock->s_type)
{
ret = pkt_recvfrom(psock, buf, len, from);
}
else
#ifdef CONFIG_NET_PKT
case SOCK_RAW:
{
ret = pkt_recvfrom(psock, buf, len, from);
}
break;
#endif /* CONFIG_NET_PKT */
#if defined(CONFIG_NET_TCP) || defined(CONFIG_NET_LOCAL)
case SOCK_STREAM:
{
#ifdef CONFIG_NET_LOCAL
#ifdef CONFIG_NET_TCP
if (psock->s_domain == PF_LOCAL)
#endif
#if defined(CONFIG_NET_TCP)
if (psock->s_type == SOCK_STREAM)
{
ret = tcp_recvfrom(psock, buf, len, from);
}
else
{
ret = psock_local_recvfrom(psock, buf, len, flags,
from, fromlen);
}
#endif /* CONFIG_NET_LOCAL */
#ifdef CONFIG_NET_TCP
#ifdef CONFIG_NET_LOCAL
else
#endif
#if defined(CONFIG_NET_UDP)
if (psock->s_type == SOCK_DGRAM)
{
ret = udp_recvfrom(psock, buf, len, from);
}
else
{
ret = tcp_recvfrom(psock, buf, len, from);
}
#endif /* CONFIG_NET_TCP */
}
break;
#endif /* CONFIG_NET_TCP || CONFIG_NET_LOCAL */
#if defined(CONFIG_NET_UDP) || defined(CONFIG_NET_LOCAL)
case SOCK_DGRAM:
{
#ifdef CONFIG_NET_LOCAL
#ifdef CONFIG_NET_UDP
if (psock->s_domain == PF_LOCAL)
#endif
{
ndbg("ERROR: Unsupported socket type: %d\n", psock->s_type);
ret = -ENOSYS;
{
ret = psock_local_recvfrom(psock, buf, len, flags,
from, fromlen);
}
#endif /* CONFIG_NET_LOCAL */
#ifdef CONFIG_NET_UDP
#ifdef CONFIG_NET_LOCAL
else
#endif
{
ret = udp_recvfrom(psock, buf, len, from);
}
#endif /* CONFIG_NET_UDP */
}
break;
#endif /* CONFIG_NET_UDP || CONFIG_NET_LOCAL */
default:
{
ndbg("ERROR: Unsupported socket type: %d\n", psock->s_type);
ret = -ENOSYS;
}
break;
}
/* Set the socket state to idle */

25
net/socket/send.c
View File

@ -45,6 +45,7 @@
#include "tcp/tcp.h"
#include "pkt/pkt.h"
#include "local/local.h"
#include "socket/socket.h"
/****************************************************************************
@ -138,17 +139,31 @@ ssize_t psock_send(FAR struct socket *psock, FAR const void *buf, size_t len,
case SOCK_RAW:
{
ret = psock_pkt_send(psock, buf, len);
break;
}
break;
#endif
#if defined(CONFIG_NET_TCP)
case SOCK_STREAM:
{
ret = psock_tcp_send(psock, buf, len);
break;
}
#ifdef CONFIG_NET_LOCAL
#ifdef CONFIG_NET_TCP
if (psock->s_domain == PF_LOCAL)
#endif
{
ret = psock_local_send(psock, buf, len, flags);
}
#endif /* CONFIG_NET_LOCAL */
#ifdef CONFIG_NET_TCP
#ifdef CONFIG_NET_LOCAL
else
#endif
{
ret = psock_tcp_send(psock, buf, len);
}
#endif /* CONFIG_NET_TCP */
}
break;
default:
{

12
net/socket/sendto.c
View File

@ -467,6 +467,12 @@ ssize_t psock_sendto(FAR struct socket *psock, FAR const void *buf,
break;
#endif
#ifdef CONFIG_NET_IPv6
case AF_LOCAL:
minlen = sizeof(sa_family_t);
break;
#endif
default:
ndbg("ERROR: Unrecognized address family: %d\n", to->sa_family);
err = EAFNOSUPPORT;
@ -511,9 +517,13 @@ ssize_t psock_sendto(FAR struct socket *psock, FAR const void *buf,
}
#endif
/* Perform the UDP sendto operation */
#ifdef CONFIG_NET_LOCAL
/* Perform the Unix domain sendto operation */
# warning Missing logic
#endif
#ifdef CONFIG_NET_UDP
/* Perform the UDP sendto operation */
/* Set the socket state to sending */
psock->s_flags = _SS_SETSTATE(psock->s_flags, _SF_SEND);