mirror/lwip
1
0
Fork 0
mirror of https://github.com/lwip-tcpip/lwip.git synced 2024-10-01 12:24:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added some more asserts to check that pcb->state != LISTEN

Browse Source
This commit is contained in:
goldsimon 2011-06-26 17:07:13 +00:00
parent d0026793bf
commit 4444db2990
2 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/core/tcp.c
View File

@ -601,6 +601,9 @@ tcp_recved(struct tcp_pcb *pcb, u16_t len)
{ {
int wnd_inflation; int wnd_inflation;
/* pcb->state LISTEN not allowed here */
LWIP_ASSERT("don't call tcp_recved for listen-pcbs",
pcb->state != LISTEN);
LWIP_ASSERT("tcp_recved: len would wrap rcv_wnd\n", LWIP_ASSERT("tcp_recved: len would wrap rcv_wnd\n",
len <= 0xffff - pcb->rcv_wnd ); len <= 0xffff - pcb->rcv_wnd );
@ -1321,7 +1324,9 @@ tcp_new_ip6(void)
*/ */
void void
tcp_arg(struct tcp_pcb *pcb, void *arg) tcp_arg(struct tcp_pcb *pcb, void *arg)
{ {
/* This function is allowed to be called for both listen pcbs and
connection pcbs. */
pcb->callback_arg = arg; pcb->callback_arg = arg;
} }
#if LWIP_CALLBACK_API #if LWIP_CALLBACK_API
@ -1336,6 +1341,7 @@ tcp_arg(struct tcp_pcb *pcb, void *arg)
void void
tcp_recv(struct tcp_pcb *pcb, tcp_recv_fn recv) tcp_recv(struct tcp_pcb *pcb, tcp_recv_fn recv)
{ {
LWIP_ASSERT("invalid socket state for recv callback", pcb->state != LISTEN);
pcb->recv = recv; pcb->recv = recv;
} }
@ -1349,6 +1355,7 @@ tcp_recv(struct tcp_pcb *pcb, tcp_recv_fn recv)
void void
tcp_sent(struct tcp_pcb *pcb, tcp_sent_fn sent) tcp_sent(struct tcp_pcb *pcb, tcp_sent_fn sent)
{ {
LWIP_ASSERT("invalid socket state for sent callback", pcb->state != LISTEN);
pcb->sent = sent; pcb->sent = sent;
} }
@ -1363,6 +1370,7 @@ tcp_sent(struct tcp_pcb *pcb, tcp_sent_fn sent)
void void
tcp_err(struct tcp_pcb *pcb, tcp_err_fn err) tcp_err(struct tcp_pcb *pcb, tcp_err_fn err)
{ {
LWIP_ASSERT("invalid socket state for err callback", pcb->state != LISTEN);
pcb->errf = err; pcb->errf = err;
} }
@ -1377,6 +1385,8 @@ tcp_err(struct tcp_pcb *pcb, tcp_err_fn err)
void void
tcp_accept(struct tcp_pcb *pcb, tcp_accept_fn accept) tcp_accept(struct tcp_pcb *pcb, tcp_accept_fn accept)
{ {
/* This function is allowed to be called for both listen pcbs and
connection pcbs. */
pcb->accept = accept; pcb->accept = accept;
} }
#endif /* LWIP_CALLBACK_API */ #endif /* LWIP_CALLBACK_API */
@ -1391,6 +1401,7 @@ tcp_accept(struct tcp_pcb *pcb, tcp_accept_fn accept)
void void
tcp_poll(struct tcp_pcb *pcb, tcp_poll_fn poll, u8_t interval) tcp_poll(struct tcp_pcb *pcb, tcp_poll_fn poll, u8_t interval)
{ {
LWIP_ASSERT("invalid socket state for poll", pcb->state != LISTEN);
#if LWIP_CALLBACK_API #if LWIP_CALLBACK_API
pcb->poll = poll; pcb->poll = poll;
#else /* LWIP_CALLBACK_API */ #else /* LWIP_CALLBACK_API */

4
src/core/tcp_out.c
View File

@ -901,6 +901,10 @@ tcp_output(struct tcp_pcb *pcb)
s16_t i = 0; s16_t i = 0;
#endif /* TCP_CWND_DEBUG */ #endif /* TCP_CWND_DEBUG */
/* pcb->state LISTEN not allowed here */
LWIP_ASSERT("don't call tcp_output for listen-pcbs",
pcb->state != LISTEN);
/* First, check if we are invoked by the TCP input processing /* First, check if we are invoked by the TCP input processing
code. If so, we do not output anything. Instead, we rely on the code. If so, we do not output anything. Instead, we rely on the
input processing code to call us when input processing is done input processing code to call us when input processing is done