patrick/zephyr
1
0
Fork 0
Code Issues Pull requests Actions 7 Packages Projects Releases Wiki Activity

net: tcp2: Send TCP data to caller

Browse source 
Add a net_context backpointer and receiver user data to the tcp
structure. Once the desired callback and user data is set in
net_tcp_recv(), net_context_packet_received() can be called at
TCP reception in tcp_data_get(), moving the TCP data to the
recipient. IP and TCP protocol headers are sent as NULL, they
are not used by e.g. the socket code.

Signed-off-by: Patrik Flykt <patrik.flykt@intel.com>
Signed-off-by: Oleg Zhurakivskyy <oleg.zhurakivskyy@intel.com>
This commit is contained in:
Oleg Zhurakivskyy 2019-10-22 15:04:02 +03:00 committed by Jukka Rissanen
parent 2eb1bef4c8
commit 851042e8e6
2 changed files with 23 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
subsys/net/ip/tcp2.c
View file

@ -514,6 +514,18 @@ static size_t tcp_data_get(struct tcp *conn, struct net_pkt *pkt)
}
tcp_free(buf);
if (conn->context->recv_cb) {
struct net_pkt *up = net_pkt_clone(pkt, K_NO_WAIT);
net_pkt_cursor_init(up);
net_pkt_set_overwrite(up, true);
net_pkt_skip(up, 40);
net_context_packet_received(
(struct net_conn *)conn->context->conn_handler,
up, NULL, NULL, conn->recv_user_data);
}
}
return len;
@ -1120,11 +1132,17 @@ int net_tcp_accept(struct net_context *context, net_tcp_accept_cb_t cb,
int net_tcp_recv(struct net_context *context, net_context_recv_cb_t cb,
void *user_data)
{
ARG_UNUSED(context);
ARG_UNUSED(cb);
ARG_UNUSED(user_data);
struct tcp *conn = context->tcp;
return -EPROTOTYPE;
NET_DBG("context: %p, cb: %p, user_data: %p", context, cb, user_data);
context->recv_cb = cb;
if (conn) {
conn->recv_user_data = user_data;
}
return 0;
}
void net_tcp_init(void)

1
subsys/net/ip/tcp2_priv.h
View file

@ -158,6 +158,7 @@ union tcp_endpoint {
struct tcp { /* TCP connection */
sys_snode_t next;
void *recv_user_data;
enum tcp_state state;
u32_t seq;
u32_t ack;