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

net/tcp: replace the common connect prologue

Browse Source 
Signed-off-by: chao.an <anchao@xiaomi.com>
This commit is contained in:
chao.an 2022-02-07 11:49:41 +08:00 committed by Alan Carvalho de Assis
parent af1cf5eaae
commit 8f63596063
3 changed files with 16 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
net/tcp/tcp.h
View File

@ -34,6 +34,7 @@
#include <nuttx/semaphore.h> #include <nuttx/semaphore.h>
#include <nuttx/mm/iob.h> #include <nuttx/mm/iob.h>
#include <nuttx/net/ip.h> #include <nuttx/net/ip.h>
#include <nuttx/net/net.h>
#ifdef CONFIG_NET_TCP_NOTIFIER #ifdef CONFIG_NET_TCP_NOTIFIER
# include <nuttx/wqueue.h> # include <nuttx/wqueue.h>
@ -54,9 +55,9 @@
*/ */
#define tcp_callback_alloc(conn) \ #define tcp_callback_alloc(conn) \
devif_callback_alloc((conn)->dev, &(conn)->list, &(conn)->list_tail) devif_callback_alloc((conn)->dev, &(conn)->sconn.list, &(conn)->sconn.list_tail)
#define tcp_callback_free(conn,cb) \ #define tcp_callback_free(conn,cb) \
devif_conn_callback_free((conn)->dev, (cb), &(conn)->list, &(conn)->list_tail) devif_conn_callback_free((conn)->dev, (cb), &(conn)->sconn.list, &(conn)->sconn.list_tail)
#ifdef CONFIG_NET_TCP_WRITE_BUFFERS #ifdef CONFIG_NET_TCP_WRITE_BUFFERS
/* TCP write buffer access macros */ /* TCP write buffer access macros */
@ -145,8 +146,6 @@ struct tcp_conn_s
{ {
/* Common prologue of all connection structures. */ /* Common prologue of all connection structures. */
dq_entry_t node; /* Implements a doubly linked list */
/* TCP callbacks: /* TCP callbacks:
* *
* Data transfer events are retained in 'list'. Event handlers in 'list' * Data transfer events are retained in 'list'. Event handlers in 'list'
@ -171,8 +170,7 @@ struct tcp_conn_s
* then dev->d_len should also be cleared). * then dev->d_len should also be cleared).
*/ */
FAR struct devif_callback_s *list; struct socket_conn_s sconn;
FAR struct devif_callback_s *list_tail;
/* TCP-specific content follows */ /* TCP-specific content follows */

2
net/tcp/tcp_callback.c
View File

@ -166,7 +166,7 @@ uint16_t tcp_callback(FAR struct net_driver_s *dev,
* not set, then dev->d_len should also be cleared). * not set, then dev->d_len should also be cleared).
*/ */
flags = devif_conn_event(dev, conn, flags, conn->list); flags = devif_conn_event(dev, conn, flags, conn->sconn.list);
/* There may be no new data handler in place at them moment that the new /* There may be no new data handler in place at them moment that the new
* incoming data is received. If the new incoming data was not handled, * incoming data is received. If the new incoming data was not handled,

22
net/tcp/tcp_conn.c
View File

@ -317,7 +317,7 @@ static inline FAR struct tcp_conn_s *
/* Look at the next active connection */ /* Look at the next active connection */
conn = (FAR struct tcp_conn_s *)conn->node.flink; conn = (FAR struct tcp_conn_s *)conn->sconn.node.flink;
} }
return conn; return conn;
@ -384,7 +384,7 @@ static inline FAR struct tcp_conn_s *
/* Look at the next active connection */ /* Look at the next active connection */
conn = (FAR struct tcp_conn_s *)conn->node.flink; conn = (FAR struct tcp_conn_s *)conn->sconn.node.flink;
} }
return conn; return conn;
@ -555,7 +555,7 @@ FAR struct tcp_conn_s *tcp_alloc_conn(void)
/* Mark the connection closed and move it to the free list */ /* Mark the connection closed and move it to the free list */
conn[i].tcpstateflags = TCP_CLOSED; conn[i].tcpstateflags = TCP_CLOSED;
dq_addlast(&conn[i].node, &g_free_tcp_connections); dq_addlast(&conn[i].sconn.node, &g_free_tcp_connections);
} }
} }
@ -595,7 +595,7 @@ void tcp_initialize(void)
/* Mark the connection closed and move it to the free list */ /* Mark the connection closed and move it to the free list */
g_tcp_connections[i].tcpstateflags = TCP_CLOSED; g_tcp_connections[i].tcpstateflags = TCP_CLOSED;
dq_addlast(&g_tcp_connections[i].node, &g_free_tcp_connections); dq_addlast(&g_tcp_connections[i].sconn.node, &g_free_tcp_connections);
} }
#endif #endif
} }
@ -668,7 +668,7 @@ FAR struct tcp_conn_s *tcp_alloc(uint8_t domain)
/* Look at the next active connection */ /* Look at the next active connection */
tmp = (FAR struct tcp_conn_s *)tmp->node.flink; tmp = (FAR struct tcp_conn_s *)tmp->sconn.node.flink;
} }
/* Did we find a connection that we can re-use? */ /* Did we find a connection that we can re-use? */
@ -769,7 +769,7 @@ void tcp_free(FAR struct tcp_conn_s *conn)
* callback for CONFIG_NET_TCP_WRITE_BUFFERS is left. * callback for CONFIG_NET_TCP_WRITE_BUFFERS is left.
*/ */
for (cb = conn->list; cb; cb = next) for (cb = conn->sconn.list; cb; cb = next)
{ {
next = cb->nxtconn; next = cb->nxtconn;
tcp_callback_free(conn, cb); tcp_callback_free(conn, cb);
@ -783,7 +783,7 @@ void tcp_free(FAR struct tcp_conn_s *conn)
{ {
/* Remove the connection from the active list */ /* Remove the connection from the active list */
dq_rem(&conn->node, &g_active_tcp_connections); dq_rem(&conn->sconn.node, &g_active_tcp_connections);
} }
/* Release any read-ahead buffers attached to the connection */ /* Release any read-ahead buffers attached to the connection */
@ -835,7 +835,7 @@ void tcp_free(FAR struct tcp_conn_s *conn)
/* Mark the connection available and put it into the free list */ /* Mark the connection available and put it into the free list */
conn->tcpstateflags = TCP_CLOSED; conn->tcpstateflags = TCP_CLOSED;
dq_addlast(&conn->node, &g_free_tcp_connections); dq_addlast(&conn->sconn.node, &g_free_tcp_connections);
net_unlock(); net_unlock();
} }
@ -892,7 +892,7 @@ FAR struct tcp_conn_s *tcp_nextconn(FAR struct tcp_conn_s *conn)
} }
else else
{ {
return (FAR struct tcp_conn_s *)conn->node.flink; return (FAR struct tcp_conn_s *)conn->sconn.node.flink;
} }
} }
@ -1053,7 +1053,7 @@ FAR struct tcp_conn_s *tcp_alloc_accept(FAR struct net_driver_s *dev,
* Interrupts should already be disabled in this context. * Interrupts should already be disabled in this context.
*/ */
dq_addlast(&conn->node, &g_active_tcp_connections); dq_addlast(&conn->sconn.node, &g_active_tcp_connections);
} }
return conn; return conn;
@ -1325,7 +1325,7 @@ int tcp_connect(FAR struct tcp_conn_s *conn, FAR const struct sockaddr *addr)
/* And, finally, put the connection structure into the active list. */ /* And, finally, put the connection structure into the active list. */
dq_addlast(&conn->node, &g_active_tcp_connections); dq_addlast(&conn->sconn.node, &g_active_tcp_connections);
ret = OK; ret = OK;
errout_with_lock: errout_with_lock: