michaelh/zephyr
1
0
Fork 0
Code Releases Activity

net: sockets: Implement bind(), connect(), listen(), accept()

Browse source 
Signed-off-by: Paul Sokolovsky <paul.sokolovsky@linaro.org>
This commit is contained in:
Paul Sokolovsky 2017-06-08 17:14:08 +03:00 • committed by Jukka Rissanen
commit 7567962f3a
2 changed files with 114 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

8
include/net/socket.h
View file

@ -16,10 +16,18 @@ extern "C" {
int zsock_socket(int family, int type, int proto);
int zsock_close(int sock);
int zsock_bind(int sock, const struct sockaddr *addr, socklen_t addrlen);
int zsock_connect(int sock, const struct sockaddr *addr, socklen_t addrlen);
int zsock_listen(int sock, int backlog);
int zsock_accept(int sock, struct sockaddr *addr, socklen_t *addrlen);
#if defined(CONFIG_NET_SOCKETS_POSIX_NAMES)
#define socket zsock_socket
#define close zsock_close
#define bind zsock_bind
#define connect zsock_connect
#define listen zsock_listen
#define accept zsock_accept
#endif
#ifdef __cplusplus

106
subsys/net/lib/sockets/sockets.c
View file

@ -16,6 +16,9 @@
#define SET_ERRNO(x) \
{ int _err = x; if (_err < 0) { errno = -_err; return -1; } }
#define sock_is_eof(ctx) ((ctx)->user_data != NULL)
#define sock_set_eof(ctx) { (ctx)->user_data = INT_TO_POINTER(1); }
int zsock_socket(int family, int type, int proto)
{
struct net_context *ctx;
@ -35,3 +38,106 @@ int zsock_close(int sock)
SET_ERRNO(net_context_put(ctx));
return 0;
}
static void zsock_accepted_cb(struct net_context *new_ctx,
struct sockaddr *addr, socklen_t addrlen,
int status, void *user_data) {
struct net_context *parent = user_data;
NET_DBG("parent=%p, ctx=%p, st=%d", parent, new_ctx, status);
k_fifo_put(&parent->accept_q, new_ctx);
}
static void zsock_received_cb(struct net_context *ctx, struct net_pkt *pkt,
int status, void *user_data) {
unsigned int header_len;
NET_DBG("ctx=%p, pkt=%p, st=%d, user_data=%p", ctx, pkt, status,
user_data);
/* if pkt is NULL, EOF */
if (!pkt) {
struct net_pkt *last_pkt = k_fifo_peek_tail(&ctx->recv_q);
if (!last_pkt) {
/* If there're no packets in the queue, recv() may
* be blocked waiting on it to become non-empty,
* so cancel that wait.
*/
sock_set_eof(ctx);
k_fifo_cancel_wait(&ctx->recv_q);
NET_DBG("Marked socket %p as peer-closed", ctx);
} else {
net_pkt_set_eof(last_pkt, true);
NET_DBG("Set EOF flag on pkt %p", ctx);
}
return;
}
/* Normal packet */
net_pkt_set_eof(pkt, false);
/* We don't care about packet header, so get rid of it asap */
header_len = net_pkt_appdata(pkt) - pkt->frags->data;
net_buf_pull(pkt->frags, header_len);
k_fifo_put(&ctx->recv_q, pkt);
}
int zsock_bind(int sock, const struct sockaddr *addr, socklen_t addrlen)
{
struct net_context *ctx = INT_TO_POINTER(sock);
SET_ERRNO(net_context_bind(ctx, addr, addrlen));
/* For DGRAM socket, we expect to receive packets after call to
* bind(), but for STREAM socket, next expected operation is
* listen(), which doesn't work if recv callback is set.
*/
if (net_context_get_type(ctx) == SOCK_DGRAM) {
SET_ERRNO(net_context_recv(ctx, zsock_received_cb, K_NO_WAIT,
NULL));
}
return 0;
}
int zsock_connect(int sock, const struct sockaddr *addr, socklen_t addrlen)
{
struct net_context *ctx = INT_TO_POINTER(sock);
SET_ERRNO(net_context_connect(ctx, addr, addrlen, NULL, K_FOREVER,
NULL));
SET_ERRNO(net_context_recv(ctx, zsock_received_cb, K_NO_WAIT, NULL));
return 0;
}
int zsock_listen(int sock, int backlog)
{
struct net_context *ctx = INT_TO_POINTER(sock);
SET_ERRNO(net_context_listen(ctx, backlog));
SET_ERRNO(net_context_accept(ctx, zsock_accepted_cb, K_NO_WAIT, ctx));
return 0;
}
int zsock_accept(int sock, struct sockaddr *addr, socklen_t *addrlen)
{
struct net_context *parent = INT_TO_POINTER(sock);
struct net_context *ctx = k_fifo_get(&parent->accept_q, K_FOREVER);
SET_ERRNO(net_context_recv(ctx, zsock_received_cb, K_NO_WAIT, NULL));
if (addr != NULL && addrlen != NULL) {
int len = min(*addrlen, sizeof(ctx->remote));
memcpy(addr, &ctx->remote, len);
*addrlen = sizeof(ctx->remote);
}
/* TODO: Ensure non-negative */
return POINTER_TO_INT(ctx);
}