michaelh/zephyr
1
0
Fork 0
Code Releases Activity

net: tcp2: Add a mutex to TCP connection

Browse source 
The TCP connection might be concurrently modified from the
TR/TX threads, so add a mutex to protect from the concurrent
modification.

Signed-off-by: Oleg Zhurakivskyy <oleg.zhurakivskyy@intel.com>
This commit is contained in:
Oleg Zhurakivskyy 2020-03-11 15:00:47 +02:00 • committed by Jukka Rissanen
commit bedd4e01fd
2 changed files with 7 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -608,6 +608,8 @@ static struct tcp *tcp_conn_alloc(void)
memset(conn, 0, sizeof(*conn)); memset(conn, 0, sizeof(*conn));
k_mutex_init(&conn->lock);
conn->state = TCP_LISTEN; conn->state = TCP_LISTEN;
conn->win = tcp_window; conn->win = tcp_window;
@ -790,6 +792,8 @@ static void tcp_in(struct tcp *conn, struct net_pkt *pkt)
u8_t next = 0, fl = th ? th->th_flags : 0; u8_t next = 0, fl = th ? th->th_flags : 0;
size_t len; size_t len;
k_mutex_lock(&conn->lock, K_FOREVER);
NET_DBG("%s", log_strdup(tcp_conn_state(conn, pkt))); NET_DBG("%s", log_strdup(tcp_conn_state(conn, pkt)));
if (th && th->th_off < 5) { if (th && th->th_off < 5) {
@ -898,6 +902,8 @@ next_state:
next = 0; next = 0;
goto next_state; goto next_state;
} }
k_mutex_unlock(&conn->lock);
} }
/* close() has been called on the socket */ /* close() has been called on the socket */

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

@ -141,6 +141,7 @@ union tcp_endpoint {
struct tcp { /* TCP connection */ struct tcp { /* TCP connection */
sys_snode_t next; sys_snode_t next;
struct net_context *context; struct net_context *context;
struct k_mutex lock;
void *recv_user_data; void *recv_user_data;
enum tcp_state state; enum tcp_state state;
u32_t seq; u32_t seq;