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

Fix TCP unit tests after changes from "Add hook for TCP Initial Sequence Number generation" commit

Browse Source 
(pcb->lastack and friends are not initialized during allocation any more, but by connect() / bind() call)
This commit is contained in:
Dirk Ziegelmeier 2016-12-31 11:46:27 +01:00
parent 1466b7ac61
commit 1884c7e83f
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
test/unit/tcp/tcp_helper.c
View File

@ -141,9 +141,18 @@ void
tcp_set_state(struct tcp_pcb* pcb, enum tcp_state state, ip_addr_t* local_ip, tcp_set_state(struct tcp_pcb* pcb, enum tcp_state state, ip_addr_t* local_ip,
ip_addr_t* remote_ip, u16_t local_port, u16_t remote_port) ip_addr_t* remote_ip, u16_t local_port, u16_t remote_port)
{ {
u32_t iss;
/* @todo: are these all states? */ /* @todo: are these all states? */
/* @todo: remove from previous list */ /* @todo: remove from previous list */
pcb->state = state; pcb->state = state;
iss = tcp_next_iss(pcb);
pcb->snd_wl2 = iss;
pcb->snd_nxt = iss;
pcb->lastack = iss;
pcb->snd_lbb = iss;
if (state == ESTABLISHED) { if (state == ESTABLISHED) {
TCP_REG(&tcp_active_pcbs, pcb); TCP_REG(&tcp_active_pcbs, pcb);
pcb->local_ip.addr = local_ip->addr; pcb->local_ip.addr = local_ip->addr;

2
test/unit/tcp/test_tcp.c
View File

@ -418,7 +418,6 @@ START_TEST(test_tcp_fast_rexmit_wraparound)
tcp_ticks = SEQNO1 - ISS; tcp_ticks = SEQNO1 - ISS;
pcb = test_tcp_new_counters_pcb(&counters); pcb = test_tcp_new_counters_pcb(&counters);
EXPECT_RET(pcb != NULL); EXPECT_RET(pcb != NULL);
EXPECT(pcb->lastack == SEQNO1);
tcp_set_state(pcb, ESTABLISHED, &local_ip, &remote_ip, local_port, remote_port); tcp_set_state(pcb, ESTABLISHED, &local_ip, &remote_ip, local_port, remote_port);
pcb->mss = TCP_MSS; pcb->mss = TCP_MSS;
/* disable initial congestion window (we don't send a SYN here...) */ /* disable initial congestion window (we don't send a SYN here...) */
@ -517,7 +516,6 @@ START_TEST(test_tcp_rto_rexmit_wraparound)
tcp_ticks = SEQNO1 - tcp_next_iss(NULL); tcp_ticks = SEQNO1 - tcp_next_iss(NULL);
pcb = test_tcp_new_counters_pcb(&counters); pcb = test_tcp_new_counters_pcb(&counters);
EXPECT_RET(pcb != NULL); EXPECT_RET(pcb != NULL);
EXPECT(pcb->lastack == SEQNO1);
tcp_set_state(pcb, ESTABLISHED, &local_ip, &remote_ip, local_port, remote_port); tcp_set_state(pcb, ESTABLISHED, &local_ip, &remote_ip, local_port, remote_port);
pcb->mss = TCP_MSS; pcb->mss = TCP_MSS;
/* disable initial congestion window (we don't send a SYN here...) */ /* disable initial congestion window (we don't send a SYN here...) */