Merge branch 'bugfix/TW16564_tcp_connect/disconnect_crash' into 'master'

fix tcp connect/disconnect carsh

See merge request !1598
This commit is contained in:
Jiang Jiang Jian
2017-11-27 21:30:11 +08:00

View File

@@ -753,7 +753,6 @@ tcp_process(struct tcp_pcb *pcb)
rseg = pcb->unacked; rseg = pcb->unacked;
pcb->unacked = rseg->next; pcb->unacked = rseg->next;
tcp_seg_free(rseg); tcp_seg_free(rseg);
}
/* If there's nothing left to acknowledge, stop the retransmit /* If there's nothing left to acknowledge, stop the retransmit
timer, otherwise reset it to start again */ timer, otherwise reset it to start again */
@@ -772,6 +771,7 @@ tcp_process(struct tcp_pcb *pcb)
} }
tcp_ack_now(pcb); tcp_ack_now(pcb);
} }
}
/* received ACK? possibly a half-open connection */ /* received ACK? possibly a half-open connection */
else if (flags & TCP_ACK) { else if (flags & TCP_ACK) {
/* send a RST to bring the other side in a non-synchronized state. */ /* send a RST to bring the other side in a non-synchronized state. */