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

test_tcp: de-duplicate test IP addresses, netmask, and ports

Browse Source 
This creates a single version of test IP addresses, netmasks, and ports.
All tests were using the same values, but duplicated in each test

This also adds const to some functions so we can use a const version
of addresses
This commit is contained in:
Joel Cunningham 2017-03-23 16:57:40 -05:00
parent 648b2b6f2b
commit 6fe66771cb
4 changed files with 43 additions and 98 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -10,6 +10,10 @@
#error "This tests needs TCP- and MEMP-statistics enabled" #error "This tests needs TCP- and MEMP-statistics enabled"
#endif #endif
const ip_addr_t test_local_ip = IPADDR4_INIT_BYTES(192, 168, 1, 1);
const ip_addr_t test_remote_ip = IPADDR4_INIT_BYTES(192, 168, 1, 2);
const ip_addr_t test_netmask = IPADDR4_INIT_BYTES(255, 255, 255, 0);
/** Remove all pcbs on the given list. */ /** Remove all pcbs on the given list. */
static void static void
tcp_remove(struct tcp_pcb* pcb_list) tcp_remove(struct tcp_pcb* pcb_list)
@ -138,8 +142,8 @@ struct pbuf* tcp_create_rx_segment_wnd(struct tcp_pcb* pcb, void* data, size_t d
/** Safely bring a tcp_pcb into the requested state */ /** Safely bring a tcp_pcb into the requested state */
void 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, const ip_addr_t* local_ip,
ip_addr_t* remote_ip, u16_t local_port, u16_t remote_port) const ip_addr_t* remote_ip, u16_t local_port, u16_t remote_port)
{ {
u32_t iss; u32_t iss;
@ -292,7 +296,7 @@ static err_t test_tcp_netif_output(struct netif *netif, struct pbuf *p,
} }
void test_tcp_init_netif(struct netif *netif, struct test_tcp_txcounters *txcounters, void test_tcp_init_netif(struct netif *netif, struct test_tcp_txcounters *txcounters,
ip_addr_t *ip_addr, ip_addr_t *netmask) const ip_addr_t *ip_addr, const ip_addr_t *netmask)
{ {
struct netif *n; struct netif *n;
memset(netif, 0, sizeof(struct netif)); memset(netif, 0, sizeof(struct netif));

12
test/unit/tcp/tcp_helper.h
View File

@ -26,6 +26,12 @@ struct test_tcp_txcounters {
struct pbuf *tx_packets; struct pbuf *tx_packets;
}; };
extern const ip_addr_t test_local_ip;
extern const ip_addr_t test_remote_ip;
extern const ip_addr_t test_netmask;
#define TEST_REMOTE_PORT 0x100
#define TEST_LOCAL_PORT 0x101
/* Helper functions */ /* Helper functions */
void tcp_remove_all(void); void tcp_remove_all(void);
@ -36,8 +42,8 @@ struct pbuf* tcp_create_rx_segment(struct tcp_pcb* pcb, void* data, size_t data_
u32_t seqno_offset, u32_t ackno_offset, u8_t headerflags); u32_t seqno_offset, u32_t ackno_offset, u8_t headerflags);
struct pbuf* tcp_create_rx_segment_wnd(struct tcp_pcb* pcb, void* data, size_t data_len, struct pbuf* tcp_create_rx_segment_wnd(struct tcp_pcb* pcb, void* data, size_t data_len,
u32_t seqno_offset, u32_t ackno_offset, u8_t headerflags, u16_t wnd); u32_t seqno_offset, u32_t ackno_offset, u8_t headerflags, u16_t wnd);
void tcp_set_state(struct tcp_pcb* pcb, enum tcp_state state, ip_addr_t* local_ip, void tcp_set_state(struct tcp_pcb* pcb, enum tcp_state state, const ip_addr_t* local_ip,
ip_addr_t* remote_ip, u16_t local_port, u16_t remote_port); const ip_addr_t* remote_ip, u16_t local_port, u16_t remote_port);
void test_tcp_counters_err(void* arg, err_t err); void test_tcp_counters_err(void* arg, err_t err);
err_t test_tcp_counters_recv(void* arg, struct tcp_pcb* pcb, struct pbuf* p, err_t err); err_t test_tcp_counters_recv(void* arg, struct tcp_pcb* pcb, struct pbuf* p, err_t err);
@ -46,7 +52,7 @@ struct tcp_pcb* test_tcp_new_counters_pcb(struct test_tcp_counters* counters);
void test_tcp_input(struct pbuf *p, struct netif *inp); void test_tcp_input(struct pbuf *p, struct netif *inp);
void test_tcp_init_netif(struct netif *netif, struct test_tcp_txcounters *txcounters, void test_tcp_init_netif(struct netif *netif, struct test_tcp_txcounters *txcounters,
ip_addr_t *ip_addr, ip_addr_t *netmask); const ip_addr_t *ip_addr, const ip_addr_t *netmask);
#endif #endif

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

@ -99,18 +99,13 @@ START_TEST(test_tcp_recv_inseq)
struct tcp_pcb* pcb; struct tcp_pcb* pcb;
struct pbuf* p; struct pbuf* p;
char data[] = {1, 2, 3, 4}; char data[] = {1, 2, 3, 4};
ip_addr_t remote_ip, local_ip, netmask;
u16_t data_len; u16_t data_len;
u16_t remote_port = 0x100, local_port = 0x101;
struct netif netif; struct netif netif;
struct test_tcp_txcounters txcounters; struct test_tcp_txcounters txcounters;
LWIP_UNUSED_ARG(_i); LWIP_UNUSED_ARG(_i);
/* initialize local vars */ /* initialize local vars */
IP_ADDR4(&local_ip, 192, 168, 1, 1); test_tcp_init_netif(&netif, &txcounters, &test_local_ip, &test_netmask);
IP_ADDR4(&remote_ip, 192, 168, 1, 2);
IP_ADDR4(&netmask, 255, 255, 255, 0);
test_tcp_init_netif(&netif, &txcounters, &local_ip, &netmask);
data_len = sizeof(data); data_len = sizeof(data);
/* initialize counter struct */ /* initialize counter struct */
memset(&counters, 0, sizeof(counters)); memset(&counters, 0, sizeof(counters));
@ -120,7 +115,7 @@ START_TEST(test_tcp_recv_inseq)
/* create and initialize the pcb */ /* create and initialize the pcb */
pcb = test_tcp_new_counters_pcb(&counters); pcb = test_tcp_new_counters_pcb(&counters);
EXPECT_RET(pcb != NULL); EXPECT_RET(pcb != NULL);
tcp_set_state(pcb, ESTABLISHED, &local_ip, &remote_ip, local_port, remote_port); tcp_set_state(pcb, ESTABLISHED, &test_local_ip, &test_remote_ip, TEST_LOCAL_PORT, TEST_REMOTE_PORT);
/* create a segment */ /* create a segment */
p = tcp_create_rx_segment(pcb, counters.expected_data, data_len, 0, 0, 0); p = tcp_create_rx_segment(pcb, counters.expected_data, data_len, 0, 0, 0);
@ -149,19 +144,14 @@ START_TEST(test_tcp_malformed_header)
struct tcp_pcb* pcb; struct tcp_pcb* pcb;
struct pbuf* p; struct pbuf* p;
char data[] = {1, 2, 3, 4}; char data[] = {1, 2, 3, 4};
ip_addr_t remote_ip, local_ip, netmask;
u16_t data_len, chksum; u16_t data_len, chksum;
u16_t remote_port = 0x100, local_port = 0x101;
struct netif netif; struct netif netif;
struct test_tcp_txcounters txcounters; struct test_tcp_txcounters txcounters;
struct tcp_hdr *hdr; struct tcp_hdr *hdr;
LWIP_UNUSED_ARG(_i); LWIP_UNUSED_ARG(_i);
/* initialize local vars */ /* initialize local vars */
IP_ADDR4(&local_ip, 192, 168, 1, 1); test_tcp_init_netif(&netif, &txcounters, &test_local_ip, &test_netmask);
IP_ADDR4(&remote_ip, 192, 168, 1, 2);
IP_ADDR4(&netmask, 255, 255, 255, 0);
test_tcp_init_netif(&netif, &txcounters, &local_ip, &netmask);
data_len = sizeof(data); data_len = sizeof(data);
/* initialize counter struct */ /* initialize counter struct */
memset(&counters, 0, sizeof(counters)); memset(&counters, 0, sizeof(counters));
@ -171,7 +161,7 @@ START_TEST(test_tcp_malformed_header)
/* create and initialize the pcb */ /* create and initialize the pcb */
pcb = test_tcp_new_counters_pcb(&counters); pcb = test_tcp_new_counters_pcb(&counters);
EXPECT_RET(pcb != NULL); EXPECT_RET(pcb != NULL);
tcp_set_state(pcb, ESTABLISHED, &local_ip, &remote_ip, local_port, remote_port); tcp_set_state(pcb, ESTABLISHED, &test_local_ip, &test_remote_ip, TEST_LOCAL_PORT, TEST_REMOTE_PORT);
/* create a segment */ /* create a segment */
p = tcp_create_rx_segment(pcb, counters.expected_data, data_len, 0, 0, 0); p = tcp_create_rx_segment(pcb, counters.expected_data, data_len, 0, 0, 0);
@ -184,7 +174,7 @@ START_TEST(test_tcp_malformed_header)
hdr->chksum = 0; hdr->chksum = 0;
chksum = ip_chksum_pseudo(p, IP_PROTO_TCP, p->tot_len, chksum = ip_chksum_pseudo(p, IP_PROTO_TCP, p->tot_len,
&remote_ip, &local_ip); &test_remote_ip, &test_local_ip);
hdr->chksum = chksum; hdr->chksum = chksum;
@ -225,22 +215,17 @@ START_TEST(test_tcp_fast_retx_recover)
char data4[] = {13, 14, 15, 16}; char data4[] = {13, 14, 15, 16};
char data5[] = {17, 18, 19, 20}; char data5[] = {17, 18, 19, 20};
char data6[TCP_MSS] = {21, 22, 23, 24}; char data6[TCP_MSS] = {21, 22, 23, 24};
ip_addr_t remote_ip, local_ip, netmask;
u16_t remote_port = 0x100, local_port = 0x101;
err_t err; err_t err;
LWIP_UNUSED_ARG(_i); LWIP_UNUSED_ARG(_i);
/* initialize local vars */ /* initialize local vars */
IP_ADDR4(&local_ip, 192, 168, 1, 1); test_tcp_init_netif(&netif, &txcounters, &test_local_ip, &test_netmask);
IP_ADDR4(&remote_ip, 192, 168, 1, 2);
IP_ADDR4(&netmask, 255, 255, 255, 0);
test_tcp_init_netif(&netif, &txcounters, &local_ip, &netmask);
memset(&counters, 0, sizeof(counters)); memset(&counters, 0, sizeof(counters));
/* create and initialize the pcb */ /* create and initialize the pcb */
pcb = test_tcp_new_counters_pcb(&counters); pcb = test_tcp_new_counters_pcb(&counters);
EXPECT_RET(pcb != NULL); EXPECT_RET(pcb != NULL);
tcp_set_state(pcb, ESTABLISHED, &local_ip, &remote_ip, local_port, remote_port); tcp_set_state(pcb, ESTABLISHED, &test_local_ip, &test_remote_ip, TEST_LOCAL_PORT, TEST_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...) */
pcb->cwnd = pcb->snd_wnd; pcb->cwnd = pcb->snd_wnd;
@ -406,8 +391,6 @@ START_TEST(test_tcp_fast_rexmit_wraparound)
struct test_tcp_counters counters; struct test_tcp_counters counters;
struct tcp_pcb* pcb; struct tcp_pcb* pcb;
struct pbuf* p; struct pbuf* p;
ip_addr_t remote_ip, local_ip, netmask;
u16_t remote_port = 0x100, local_port = 0x101;
err_t err; err_t err;
u16_t i, sent_total = 0; u16_t i, sent_total = 0;
LWIP_UNUSED_ARG(_i); LWIP_UNUSED_ARG(_i);
@ -417,17 +400,14 @@ START_TEST(test_tcp_fast_rexmit_wraparound)
} }
/* initialize local vars */ /* initialize local vars */
IP_ADDR4(&local_ip, 192, 168, 1, 1); test_tcp_init_netif(&netif, &txcounters, &test_local_ip, &test_netmask);
IP_ADDR4(&remote_ip, 192, 168, 1, 2);
IP_ADDR4(&netmask, 255, 255, 255, 0);
test_tcp_init_netif(&netif, &txcounters, &local_ip, &netmask);
memset(&counters, 0, sizeof(counters)); memset(&counters, 0, sizeof(counters));
/* create and initialize the pcb */ /* create and initialize the pcb */
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);
tcp_set_state(pcb, ESTABLISHED, &local_ip, &remote_ip, local_port, remote_port); tcp_set_state(pcb, ESTABLISHED, &test_local_ip, &test_remote_ip, TEST_LOCAL_PORT, TEST_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...) */
pcb->cwnd = 2*TCP_MSS; pcb->cwnd = 2*TCP_MSS;
@ -497,8 +477,6 @@ START_TEST(test_tcp_rto_rexmit_wraparound)
struct test_tcp_txcounters txcounters; struct test_tcp_txcounters txcounters;
struct test_tcp_counters counters; struct test_tcp_counters counters;
struct tcp_pcb* pcb; struct tcp_pcb* pcb;
ip_addr_t remote_ip, local_ip, netmask;
u16_t remote_port = 0x100, local_port = 0x101;
err_t err; err_t err;
u16_t i, sent_total = 0; u16_t i, sent_total = 0;
LWIP_UNUSED_ARG(_i); LWIP_UNUSED_ARG(_i);
@ -508,10 +486,7 @@ START_TEST(test_tcp_rto_rexmit_wraparound)
} }
/* initialize local vars */ /* initialize local vars */
IP_ADDR4(&local_ip, 192, 168, 1, 1); test_tcp_init_netif(&netif, &txcounters, &test_local_ip, &test_netmask);
IP_ADDR4(&remote_ip, 192, 168, 1, 2);
IP_ADDR4(&netmask, 255, 255, 255, 0);
test_tcp_init_netif(&netif, &txcounters, &local_ip, &netmask);
memset(&counters, 0, sizeof(counters)); memset(&counters, 0, sizeof(counters));
/* create and initialize the pcb */ /* create and initialize the pcb */
@ -520,7 +495,7 @@ 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);
tcp_set_state(pcb, ESTABLISHED, &local_ip, &remote_ip, local_port, remote_port); tcp_set_state(pcb, ESTABLISHED, &test_local_ip, &test_remote_ip, TEST_LOCAL_PORT, TEST_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...) */
pcb->cwnd = 2*TCP_MSS; pcb->cwnd = 2*TCP_MSS;
@ -577,8 +552,6 @@ static void test_tcp_tx_full_window_lost(u8_t zero_window_probe_from_unsent)
struct test_tcp_counters counters; struct test_tcp_counters counters;
struct tcp_pcb* pcb; struct tcp_pcb* pcb;
struct pbuf *p; struct pbuf *p;
ip_addr_t remote_ip, local_ip, netmask;
u16_t remote_port = 0x100, local_port = 0x101;
err_t err; err_t err;
u16_t sent_total, i; u16_t sent_total, i;
u8_t expected = 0xFE; u8_t expected = 0xFE;
@ -597,16 +570,13 @@ static void test_tcp_tx_full_window_lost(u8_t zero_window_probe_from_unsent)
} }
/* initialize local vars */ /* initialize local vars */
IP_ADDR4(&local_ip, 192, 168, 1, 1); test_tcp_init_netif(&netif, &txcounters, &test_local_ip, &test_netmask);
IP_ADDR4(&remote_ip, 192, 168, 1, 2);
IP_ADDR4(&netmask, 255, 255, 255, 0);
test_tcp_init_netif(&netif, &txcounters, &local_ip, &netmask);
memset(&counters, 0, sizeof(counters)); memset(&counters, 0, sizeof(counters));
/* create and initialize the pcb */ /* create and initialize the pcb */
pcb = test_tcp_new_counters_pcb(&counters); pcb = test_tcp_new_counters_pcb(&counters);
EXPECT_RET(pcb != NULL); EXPECT_RET(pcb != NULL);
tcp_set_state(pcb, ESTABLISHED, &local_ip, &remote_ip, local_port, remote_port); tcp_set_state(pcb, ESTABLISHED, &test_local_ip, &test_remote_ip, TEST_LOCAL_PORT, TEST_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...) */
pcb->cwnd = pcb->snd_wnd; pcb->cwnd = pcb->snd_wnd;

63
test/unit/tcp/test_tcp_oos.c
View File

@ -159,17 +159,12 @@ START_TEST(test_tcp_recv_ooseq_FIN_OOSEQ)
5, 6, 7, 8, 5, 6, 7, 8,
9, 10, 11, 12, 9, 10, 11, 12,
13, 14, 15, 16}; 13, 14, 15, 16};
ip_addr_t remote_ip, local_ip, netmask;
u16_t data_len; u16_t data_len;
u16_t remote_port = 0x100, local_port = 0x101;
struct netif netif; struct netif netif;
LWIP_UNUSED_ARG(_i); LWIP_UNUSED_ARG(_i);
/* initialize local vars */ /* initialize local vars */
IP_ADDR4(&local_ip, 192, 168, 1, 1); test_tcp_init_netif(&netif, NULL, &test_local_ip, &test_netmask);
IP_ADDR4(&remote_ip, 192, 168, 1, 2);
IP_ADDR4(&netmask, 255, 255, 255, 0);
test_tcp_init_netif(&netif, NULL, &local_ip, &netmask);
data_len = sizeof(data); data_len = sizeof(data);
/* initialize counter struct */ /* initialize counter struct */
memset(&counters, 0, sizeof(counters)); memset(&counters, 0, sizeof(counters));
@ -179,7 +174,7 @@ START_TEST(test_tcp_recv_ooseq_FIN_OOSEQ)
/* create and initialize the pcb */ /* create and initialize the pcb */
pcb = test_tcp_new_counters_pcb(&counters); pcb = test_tcp_new_counters_pcb(&counters);
EXPECT_RET(pcb != NULL); EXPECT_RET(pcb != NULL);
tcp_set_state(pcb, ESTABLISHED, &local_ip, &remote_ip, local_port, remote_port); tcp_set_state(pcb, ESTABLISHED, &test_local_ip, &test_remote_ip, TEST_LOCAL_PORT, TEST_REMOTE_PORT);
/* create segments */ /* create segments */
/* pinseq is sent as last segment! */ /* pinseq is sent as last segment! */
@ -300,17 +295,12 @@ START_TEST(test_tcp_recv_ooseq_FIN_INSEQ)
5, 6, 7, 8, 5, 6, 7, 8,
9, 10, 11, 12, 9, 10, 11, 12,
13, 14, 15, 16}; 13, 14, 15, 16};
ip_addr_t remote_ip, local_ip, netmask;
u16_t data_len; u16_t data_len;
u16_t remote_port = 0x100, local_port = 0x101;
struct netif netif; struct netif netif;
LWIP_UNUSED_ARG(_i); LWIP_UNUSED_ARG(_i);
/* initialize local vars */ /* initialize local vars */
IP_ADDR4(&local_ip, 192, 168, 1, 1); test_tcp_init_netif(&netif, NULL, &test_local_ip, &test_netmask);
IP_ADDR4(&remote_ip, 192, 168, 1, 2);
IP_ADDR4(&netmask, 255, 255, 255, 0);
test_tcp_init_netif(&netif, NULL, &local_ip, &netmask);
data_len = sizeof(data); data_len = sizeof(data);
/* initialize counter struct */ /* initialize counter struct */
memset(&counters, 0, sizeof(counters)); memset(&counters, 0, sizeof(counters));
@ -320,7 +310,7 @@ START_TEST(test_tcp_recv_ooseq_FIN_INSEQ)
/* create and initialize the pcb */ /* create and initialize the pcb */
pcb = test_tcp_new_counters_pcb(&counters); pcb = test_tcp_new_counters_pcb(&counters);
EXPECT_RET(pcb != NULL); EXPECT_RET(pcb != NULL);
tcp_set_state(pcb, ESTABLISHED, &local_ip, &remote_ip, local_port, remote_port); tcp_set_state(pcb, ESTABLISHED, &test_local_ip, &test_remote_ip, TEST_LOCAL_PORT, TEST_REMOTE_PORT);
/* create segments */ /* create segments */
/* p1: 7 bytes - 2 before FIN */ /* p1: 7 bytes - 2 before FIN */
@ -472,8 +462,6 @@ START_TEST(test_tcp_recv_ooseq_overrun_rxwin)
struct test_tcp_counters counters; struct test_tcp_counters counters;
struct tcp_pcb* pcb; struct tcp_pcb* pcb;
struct pbuf *pinseq, *p_ovr; struct pbuf *pinseq, *p_ovr;
ip_addr_t remote_ip, local_ip, netmask;
u16_t remote_port = 0x100, local_port = 0x101;
struct netif netif; struct netif netif;
int datalen = 0; int datalen = 0;
int datalen2; int datalen2;
@ -483,10 +471,7 @@ START_TEST(test_tcp_recv_ooseq_overrun_rxwin)
} }
/* initialize local vars */ /* initialize local vars */
IP_ADDR4(&local_ip, 192, 168, 1, 1); test_tcp_init_netif(&netif, NULL, &test_local_ip, &test_netmask);
IP_ADDR4(&remote_ip, 192, 168, 1, 2);
IP_ADDR4(&netmask, 255, 255, 255, 0);
test_tcp_init_netif(&netif, NULL, &local_ip, &netmask);
/* initialize counter struct */ /* initialize counter struct */
memset(&counters, 0, sizeof(counters)); memset(&counters, 0, sizeof(counters));
counters.expected_data_len = TCP_WND; counters.expected_data_len = TCP_WND;
@ -495,7 +480,7 @@ START_TEST(test_tcp_recv_ooseq_overrun_rxwin)
/* create and initialize the pcb */ /* create and initialize the pcb */
pcb = test_tcp_new_counters_pcb(&counters); pcb = test_tcp_new_counters_pcb(&counters);
EXPECT_RET(pcb != NULL); EXPECT_RET(pcb != NULL);
tcp_set_state(pcb, ESTABLISHED, &local_ip, &remote_ip, local_port, remote_port); tcp_set_state(pcb, ESTABLISHED, &test_local_ip, &test_remote_ip, TEST_LOCAL_PORT, TEST_REMOTE_PORT);
pcb->rcv_nxt = 0x8000; pcb->rcv_nxt = 0x8000;
/* create segments */ /* create segments */
@ -564,8 +549,6 @@ START_TEST(test_tcp_recv_ooseq_overrun_rxwin_edge)
struct test_tcp_counters counters; struct test_tcp_counters counters;
struct tcp_pcb* pcb; struct tcp_pcb* pcb;
struct pbuf *pinseq, *p_ovr; struct pbuf *pinseq, *p_ovr;
ip_addr_t remote_ip, local_ip, netmask;
u16_t remote_port = 0x100, local_port = 0x101;
struct netif netif; struct netif netif;
int datalen = 0; int datalen = 0;
int datalen2; int datalen2;
@ -575,10 +558,7 @@ START_TEST(test_tcp_recv_ooseq_overrun_rxwin_edge)
} }
/* initialize local vars */ /* initialize local vars */
IP_ADDR4(&local_ip, 192, 168, 1, 1); test_tcp_init_netif(&netif, NULL, &test_local_ip, &test_netmask);
IP_ADDR4(&remote_ip, 192, 168, 1, 2);
IP_ADDR4(&netmask, 255, 255, 255, 0);
test_tcp_init_netif(&netif, NULL, &local_ip, &netmask);
/* initialize counter struct */ /* initialize counter struct */
memset(&counters, 0, sizeof(counters)); memset(&counters, 0, sizeof(counters));
counters.expected_data_len = TCP_WND; counters.expected_data_len = TCP_WND;
@ -587,7 +567,7 @@ START_TEST(test_tcp_recv_ooseq_overrun_rxwin_edge)
/* create and initialize the pcb */ /* create and initialize the pcb */
pcb = test_tcp_new_counters_pcb(&counters); pcb = test_tcp_new_counters_pcb(&counters);
EXPECT_RET(pcb != NULL); EXPECT_RET(pcb != NULL);
tcp_set_state(pcb, ESTABLISHED, &local_ip, &remote_ip, local_port, remote_port); tcp_set_state(pcb, ESTABLISHED, &test_local_ip, &test_remote_ip, TEST_LOCAL_PORT, TEST_REMOTE_PORT);
pcb->rcv_nxt = 0xffffffff - (TCP_WND / 2); pcb->rcv_nxt = 0xffffffff - (TCP_WND / 2);
/* create segments */ /* create segments */
@ -655,8 +635,6 @@ START_TEST(test_tcp_recv_ooseq_max_bytes)
struct test_tcp_counters counters; struct test_tcp_counters counters;
struct tcp_pcb* pcb; struct tcp_pcb* pcb;
struct pbuf *p_ovr; struct pbuf *p_ovr;
ip_addr_t remote_ip, local_ip, netmask;
u16_t remote_port = 0x100, local_port = 0x101;
struct netif netif; struct netif netif;
int datalen = 0; int datalen = 0;
int datalen2; int datalen2;
@ -666,10 +644,7 @@ START_TEST(test_tcp_recv_ooseq_max_bytes)
} }
/* initialize local vars */ /* initialize local vars */
IP_ADDR4(&local_ip, 192, 168, 1, 1); test_tcp_init_netif(&netif, NULL, &test_local_ip, &test_netmask);
IP_ADDR4(&remote_ip, 192, 168, 1, 2);
IP_ADDR4(&netmask, 255, 255, 255, 0);
test_tcp_init_netif(&netif, NULL, &local_ip, &netmask);
/* initialize counter struct */ /* initialize counter struct */
memset(&counters, 0, sizeof(counters)); memset(&counters, 0, sizeof(counters));
counters.expected_data_len = TCP_WND; counters.expected_data_len = TCP_WND;
@ -678,7 +653,7 @@ START_TEST(test_tcp_recv_ooseq_max_bytes)
/* create and initialize the pcb */ /* create and initialize the pcb */
pcb = test_tcp_new_counters_pcb(&counters); pcb = test_tcp_new_counters_pcb(&counters);
EXPECT_RET(pcb != NULL); EXPECT_RET(pcb != NULL);
tcp_set_state(pcb, ESTABLISHED, &local_ip, &remote_ip, local_port, remote_port); tcp_set_state(pcb, ESTABLISHED, &test_local_ip, &test_remote_ip, TEST_LOCAL_PORT, TEST_REMOTE_PORT);
pcb->rcv_nxt = 0x8000; pcb->rcv_nxt = 0x8000;
/* don't 'recv' the first segment (1 byte) so that all other segments will be ooseq */ /* don't 'recv' the first segment (1 byte) so that all other segments will be ooseq */
@ -735,8 +710,6 @@ START_TEST(test_tcp_recv_ooseq_max_pbufs)
struct test_tcp_counters counters; struct test_tcp_counters counters;
struct tcp_pcb* pcb; struct tcp_pcb* pcb;
struct pbuf *p_ovr; struct pbuf *p_ovr;
ip_addr_t remote_ip, local_ip, netmask;
u16_t remote_port = 0x100, local_port = 0x101;
struct netif netif; struct netif netif;
int datalen = 0; int datalen = 0;
int datalen2; int datalen2;
@ -746,10 +719,7 @@ START_TEST(test_tcp_recv_ooseq_max_pbufs)
} }
/* initialize local vars */ /* initialize local vars */
IP_ADDR4(&local_ip, 192, 168, 1, 1); test_tcp_init_netif(&netif, NULL, &test_local_ip, &test_netmask);
IP_ADDR4(&remote_ip, 192, 168, 1, 2);
IP_ADDR4(&netmask, 255, 255, 255, 0);
test_tcp_init_netif(&netif, NULL, &local_ip, &netmask);
/* initialize counter struct */ /* initialize counter struct */
memset(&counters, 0, sizeof(counters)); memset(&counters, 0, sizeof(counters));
counters.expected_data_len = TCP_WND; counters.expected_data_len = TCP_WND;
@ -758,7 +728,7 @@ START_TEST(test_tcp_recv_ooseq_max_pbufs)
/* create and initialize the pcb */ /* create and initialize the pcb */
pcb = test_tcp_new_counters_pcb(&counters); pcb = test_tcp_new_counters_pcb(&counters);
EXPECT_RET(pcb != NULL); EXPECT_RET(pcb != NULL);
tcp_set_state(pcb, ESTABLISHED, &local_ip, &remote_ip, local_port, remote_port); tcp_set_state(pcb, ESTABLISHED, &local_ip, &remote_ip, TEST_LOCAL_PORT, TEST_REMOTE_PORT);
pcb->rcv_nxt = 0x8000; pcb->rcv_nxt = 0x8000;
/* don't 'recv' the first segment (1 byte) so that all other segments will be ooseq */ /* don't 'recv' the first segment (1 byte) so that all other segments will be ooseq */
@ -837,8 +807,6 @@ static void test_tcp_recv_ooseq_double_FINs(int delay_packet)
struct test_tcp_counters counters; struct test_tcp_counters counters;
struct tcp_pcb* pcb; struct tcp_pcb* pcb;
struct pbuf *p_normal_fin, *p_data_after_fin, *p, *p_2nd_fin_ooseq; struct pbuf *p_normal_fin, *p_data_after_fin, *p, *p_2nd_fin_ooseq;
ip_addr_t remote_ip, local_ip, netmask;
u16_t remote_port = 0x100, local_port = 0x101;
struct netif netif; struct netif netif;
u32_t exp_rx_calls = 0, exp_rx_bytes = 0, exp_close_calls = 0, exp_oos_pbufs = 0, exp_oos_tcplen = 0; u32_t exp_rx_calls = 0, exp_rx_bytes = 0, exp_close_calls = 0, exp_oos_pbufs = 0, exp_oos_tcplen = 0;
int first_dropped = 0xff; int first_dropped = 0xff;
@ -848,10 +816,7 @@ static void test_tcp_recv_ooseq_double_FINs(int delay_packet)
} }
/* initialize local vars */ /* initialize local vars */
IP_ADDR4(&local_ip, 192, 168, 1, 1); test_tcp_init_netif(&netif, NULL, &test_local_ip, &test_netmask);
IP_ADDR4(&remote_ip, 192, 168, 1, 2);
IP_ADDR4(&netmask, 255, 255, 255, 0);
test_tcp_init_netif(&netif, NULL, &local_ip, &netmask);
/* initialize counter struct */ /* initialize counter struct */
memset(&counters, 0, sizeof(counters)); memset(&counters, 0, sizeof(counters));
counters.expected_data_len = TCP_WND; counters.expected_data_len = TCP_WND;
@ -860,7 +825,7 @@ static void test_tcp_recv_ooseq_double_FINs(int delay_packet)
/* create and initialize the pcb */ /* create and initialize the pcb */
pcb = test_tcp_new_counters_pcb(&counters); pcb = test_tcp_new_counters_pcb(&counters);
EXPECT_RET(pcb != NULL); EXPECT_RET(pcb != NULL);
tcp_set_state(pcb, ESTABLISHED, &local_ip, &remote_ip, local_port, remote_port); tcp_set_state(pcb, ESTABLISHED, &test_local_ip, &test_remote_ip, TEST_LOCAL_PORT, TEST_REMOTE_PORT);
pcb->rcv_nxt = 0x8000; pcb->rcv_nxt = 0x8000;
/* create segments */ /* create segments */