mirror/lwip
1
0
Fork 0
mirror of https://github.com/lwip-tcpip/lwip.git synced 2024-10-04 05:39:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

removed unused return values of tcp_listen_input & tcp_timewait_input; fixed unused variable warning

Browse Source
This commit is contained in:
goldsimon 2016-03-24 15:06:31 +01:00
parent 9b0a0841e9
commit 5b0a47ca87
1 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/core/tcp_in.c
View File

@ -88,8 +88,8 @@ static err_t tcp_process(struct tcp_pcb *pcb);
static void tcp_receive(struct tcp_pcb *pcb); static void tcp_receive(struct tcp_pcb *pcb);
static void tcp_parseopt(struct tcp_pcb *pcb); static void tcp_parseopt(struct tcp_pcb *pcb);
static err_t tcp_listen_input(struct tcp_pcb_listen *pcb); static void tcp_listen_input(struct tcp_pcb_listen *pcb);
static err_t tcp_timewait_input(struct tcp_pcb *pcb); static void tcp_timewait_input(struct tcp_pcb *pcb);
/** /**
* The initial input processing of TCP. It verifies the TCP header, demultiplexes * The initial input processing of TCP. It verifies the TCP header, demultiplexes
@ -530,7 +530,7 @@ dropped:
* @note the segment which arrived is saved in global variables, therefore only the pcb * @note the segment which arrived is saved in global variables, therefore only the pcb
* involved is passed as a parameter to this function * involved is passed as a parameter to this function
*/ */
static err_t static void
tcp_listen_input(struct tcp_pcb_listen *pcb) tcp_listen_input(struct tcp_pcb_listen *pcb)
{ {
struct tcp_pcb *npcb; struct tcp_pcb *npcb;
@ -538,7 +538,7 @@ tcp_listen_input(struct tcp_pcb_listen *pcb)
if (flags & TCP_RST) { if (flags & TCP_RST) {
/* An incoming RST should be ignored. Return. */ /* An incoming RST should be ignored. Return. */
return ERR_OK; return;
} }
/* In the LISTEN state, we check for incoming SYN segments, /* In the LISTEN state, we check for incoming SYN segments,
@ -554,7 +554,7 @@ tcp_listen_input(struct tcp_pcb_listen *pcb)
#if TCP_LISTEN_BACKLOG #if TCP_LISTEN_BACKLOG
if (pcb->accepts_pending >= pcb->backlog) { if (pcb->accepts_pending >= pcb->backlog) {
LWIP_DEBUGF(TCP_DEBUG, ("tcp_listen_input: listen backlog exceeded for port %"U16_F"\n", tcphdr->dest)); LWIP_DEBUGF(TCP_DEBUG, ("tcp_listen_input: listen backlog exceeded for port %"U16_F"\n", tcphdr->dest));
return ERR_ABRT; return;
} }
#endif /* TCP_LISTEN_BACKLOG */ #endif /* TCP_LISTEN_BACKLOG */
npcb = tcp_alloc(pcb->prio); npcb = tcp_alloc(pcb->prio);
@ -566,7 +566,8 @@ tcp_listen_input(struct tcp_pcb_listen *pcb)
LWIP_DEBUGF(TCP_DEBUG, ("tcp_listen_input: could not allocate PCB\n")); LWIP_DEBUGF(TCP_DEBUG, ("tcp_listen_input: could not allocate PCB\n"));
TCP_STATS_INC(tcp.memerr); TCP_STATS_INC(tcp.memerr);
TCP_EVENT_ACCEPT(pcb, NULL, pcb->callback_arg, ERR_MEM, err); TCP_EVENT_ACCEPT(pcb, NULL, pcb->callback_arg, ERR_MEM, err);
return ERR_MEM; LWIP_UNUSED_ARG(err); /* err not useful here */
return;
} }
#if TCP_LISTEN_BACKLOG #if TCP_LISTEN_BACKLOG
pcb->accepts_pending++; pcb->accepts_pending++;
@ -606,11 +607,11 @@ tcp_listen_input(struct tcp_pcb_listen *pcb)
rc = tcp_enqueue_flags(npcb, TCP_SYN | TCP_ACK); rc = tcp_enqueue_flags(npcb, TCP_SYN | TCP_ACK);
if (rc != ERR_OK) { if (rc != ERR_OK) {
tcp_abandon(npcb, 0); tcp_abandon(npcb, 0);
return rc; return;
} }
return tcp_output(npcb); tcp_output(npcb);
} }
return ERR_OK; return;
} }
/** /**
@ -622,7 +623,7 @@ tcp_listen_input(struct tcp_pcb_listen *pcb)
* @note the segment which arrived is saved in global variables, therefore only the pcb * @note the segment which arrived is saved in global variables, therefore only the pcb
* involved is passed as a parameter to this function * involved is passed as a parameter to this function
*/ */
static err_t static void
tcp_timewait_input(struct tcp_pcb *pcb) tcp_timewait_input(struct tcp_pcb *pcb)
{ {
/* RFC 1337: in TIME_WAIT, ignore RST and ACK FINs + any 'acceptable' segments */ /* RFC 1337: in TIME_WAIT, ignore RST and ACK FINs + any 'acceptable' segments */
@ -631,7 +632,7 @@ tcp_timewait_input(struct tcp_pcb *pcb)
* acceptable since we only send ACKs) * acceptable since we only send ACKs)
* - second check the RST bit (... return) */ * - second check the RST bit (... return) */
if (flags & TCP_RST) { if (flags & TCP_RST) {
return ERR_OK; return;
} }
/* - fourth, check the SYN bit, */ /* - fourth, check the SYN bit, */
if (flags & TCP_SYN) { if (flags & TCP_SYN) {
@ -641,7 +642,7 @@ tcp_timewait_input(struct tcp_pcb *pcb)
/* If the SYN is in the window it is an error, send a reset */ /* If the SYN is in the window it is an error, send a reset */
tcp_rst(ackno, seqno + tcplen, ip_current_dest_addr(), tcp_rst(ackno, seqno + tcplen, ip_current_dest_addr(),
ip_current_src_addr(), tcphdr->dest, tcphdr->src); ip_current_src_addr(), tcphdr->dest, tcphdr->src);
return ERR_OK; return;
} }
} else if (flags & TCP_FIN) { } else if (flags & TCP_FIN) {
/* - eighth, check the FIN bit: Remain in the TIME-WAIT state. /* - eighth, check the FIN bit: Remain in the TIME-WAIT state.
@ -652,9 +653,9 @@ tcp_timewait_input(struct tcp_pcb *pcb)
if ((tcplen > 0)) { if ((tcplen > 0)) {
/* Acknowledge data, FIN or out-of-window SYN */ /* Acknowledge data, FIN or out-of-window SYN */
pcb->flags |= TF_ACK_NOW; pcb->flags |= TF_ACK_NOW;
return tcp_output(pcb); tcp_output(pcb);
} }
return ERR_OK; return;
} }
/** /**