mirror/lwip
1
0
Fork 0
mirror of https://github.com/lwip-tcpip/lwip.git synced 2024-12-25 18:14:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

tcp_in: favour local variables over ifdef blocks

Browse Source
This commit is contained in:
goldsimon 2017-09-21 10:12:36 +02:00
parent 8f459cc242
commit 7dcc407c53
1 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/core/tcp_in.c
View File

@ -1097,12 +1097,6 @@ tcp_free_acked_segments(struct tcp_pcb *pcb, struct tcp_seg *seg_list, const cha
static void static void
tcp_receive(struct tcp_pcb *pcb) tcp_receive(struct tcp_pcb *pcb)
{ {
#if TCP_QUEUE_OOSEQ
struct tcp_seg *next;
#endif
#if TCP_QUEUE_OOSEQ
struct tcp_seg *prev, *cseg;
#endif /* TCP_QUEUE_OOSEQ */
s16_t m; s16_t m;
u32_t right_wnd_edge; u32_t right_wnd_edge;
int found_dupack = 0; int found_dupack = 0;
@ -1462,21 +1456,22 @@ tcp_receive(struct tcp_pcb *pcb)
tcp_seg_free(old_ooseq); tcp_seg_free(old_ooseq);
} }
} else { } else {
next = pcb->ooseq; struct tcp_seg *next = pcb->ooseq;
/* Remove all segments on ooseq that are covered by inseg already. /* Remove all segments on ooseq that are covered by inseg already.
* FIN is copied from ooseq to inseg if present. */ * FIN is copied from ooseq to inseg if present. */
while (next && while (next &&
TCP_SEQ_GEQ(seqno + tcplen, TCP_SEQ_GEQ(seqno + tcplen,
next->tcphdr->seqno + next->len)) { next->tcphdr->seqno + next->len)) {
struct tcp_seg *tmp;
/* inseg cannot have FIN here (already processed above) */ /* inseg cannot have FIN here (already processed above) */
if ((TCPH_FLAGS(next->tcphdr) & TCP_FIN) != 0 && if ((TCPH_FLAGS(next->tcphdr) & TCP_FIN) != 0 &&
(TCPH_FLAGS(inseg.tcphdr) & TCP_SYN) == 0) { (TCPH_FLAGS(inseg.tcphdr) & TCP_SYN) == 0) {
TCPH_SET_FLAG(inseg.tcphdr, TCP_FIN); TCPH_SET_FLAG(inseg.tcphdr, TCP_FIN);
tcplen = TCP_TCPLEN(&inseg); tcplen = TCP_TCPLEN(&inseg);
} }
prev = next; tmp = next;
next = next->next; next = next->next;
tcp_seg_free(prev); tcp_seg_free(tmp);
} }
/* Now trim right side of inseg if it overlaps with the first /* Now trim right side of inseg if it overlaps with the first
* segment on ooseq */ * segment on ooseq */
@ -1533,7 +1528,7 @@ tcp_receive(struct tcp_pcb *pcb)
while (pcb->ooseq != NULL && while (pcb->ooseq != NULL &&
pcb->ooseq->tcphdr->seqno == pcb->rcv_nxt) { pcb->ooseq->tcphdr->seqno == pcb->rcv_nxt) {
cseg = pcb->ooseq; struct tcp_seg *cseg = pcb->ooseq;
seqno = pcb->ooseq->tcphdr->seqno; seqno = pcb->ooseq->tcphdr->seqno;
pcb->rcv_nxt += TCP_TCPLEN(cseg); pcb->rcv_nxt += TCP_TCPLEN(cseg);
@ -1634,7 +1629,7 @@ tcp_receive(struct tcp_pcb *pcb)
It may start before the newly received segment (possibly adjusted below). */ It may start before the newly received segment (possibly adjusted below). */
u32_t sackbeg = TCP_SEQ_LT(seqno, pcb->ooseq->tcphdr->seqno) ? seqno : pcb->ooseq->tcphdr->seqno; u32_t sackbeg = TCP_SEQ_LT(seqno, pcb->ooseq->tcphdr->seqno) ? seqno : pcb->ooseq->tcphdr->seqno;
#endif /* LWIP_TCP_SACK_OUT */ #endif /* LWIP_TCP_SACK_OUT */
prev = NULL; struct tcp_seg *next, *prev = NULL;
for (next = pcb->ooseq; next != NULL; next = next->next) { for (next = pcb->ooseq; next != NULL; next = next->next) {
if (seqno == next->tcphdr->seqno) { if (seqno == next->tcphdr->seqno) {
/* The sequence number of the incoming segment is the /* The sequence number of the incoming segment is the
@ -1645,7 +1640,7 @@ tcp_receive(struct tcp_pcb *pcb)
/* The incoming segment is larger than the old /* The incoming segment is larger than the old
segment. We replace some segments with the new segment. We replace some segments with the new
one. */ one. */
cseg = tcp_seg_copy(&inseg); struct tcp_seg *cseg = tcp_seg_copy(&inseg);
if (cseg != NULL) { if (cseg != NULL) {
if (prev != NULL) { if (prev != NULL) {
prev->next = cseg; prev->next = cseg;
@ -1668,7 +1663,7 @@ tcp_receive(struct tcp_pcb *pcb)
than the sequence number of the first segment on the than the sequence number of the first segment on the
queue. We put the incoming segment first on the queue. We put the incoming segment first on the
queue. */ queue. */
cseg = tcp_seg_copy(&inseg); struct tcp_seg *cseg = tcp_seg_copy(&inseg);
if (cseg != NULL) { if (cseg != NULL) {
pcb->ooseq = cseg; pcb->ooseq = cseg;
tcp_oos_insert_segment(cseg, next); tcp_oos_insert_segment(cseg, next);
@ -1684,7 +1679,7 @@ tcp_receive(struct tcp_pcb *pcb)
the next segment on ->ooseq. We trim trim the previous the next segment on ->ooseq. We trim trim the previous
segment, delete next segments that included in received segment segment, delete next segments that included in received segment
and trim received, if needed. */ and trim received, if needed. */
cseg = tcp_seg_copy(&inseg); struct tcp_seg *cseg = tcp_seg_copy(&inseg);
if (cseg != NULL) { if (cseg != NULL) {
if (TCP_SEQ_GT(prev->tcphdr->seqno + prev->len, seqno)) { if (TCP_SEQ_GT(prev->tcphdr->seqno + prev->len, seqno)) {
/* We need to trim the prev segment. */ /* We need to trim the prev segment. */
@ -1783,7 +1778,7 @@ tcp_receive(struct tcp_pcb *pcb)
and throw away everything above that limit. */ and throw away everything above that limit. */
u32_t ooseq_blen = 0; u32_t ooseq_blen = 0;
u16_t ooseq_qlen = 0; u16_t ooseq_qlen = 0;
prev = NULL; struct tcp_seg *next, *prev = NULL;
for (next = pcb->ooseq; next != NULL; prev = next, next = next->next) { for (next = pcb->ooseq; next != NULL; prev = next, next = next->next) {
struct pbuf *p = next->p; struct pbuf *p = next->p;
#if TCP_OOSEQ_MAX_BYTES #if TCP_OOSEQ_MAX_BYTES