From 071d364a5e7622f0cdbfae0cb1dd3621e44683eb Mon Sep 17 00:00:00 2001 From: "John Hodge (sonata)" Date: Wed, 5 Nov 2014 15:09:27 +0800 Subject: [PATCH] Tools/Network Test - Tweaking --- Tools/NetTest_Runner/include/test.h | 1 + Tools/NetTest_Runner/stack.c | 2 ++ Tools/NetTest_Runner/test_tcp.c | 7 ++++++- 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/Tools/NetTest_Runner/include/test.h b/Tools/NetTest_Runner/include/test.h index bf2da151..6c65b42e 100644 --- a/Tools/NetTest_Runner/include/test.h +++ b/Tools/NetTest_Runner/include/test.h @@ -6,6 +6,7 @@ #include #define TEST_SETNAME(name) test_setname(name) +#define TEST_STEP(name) do{}while(0) //test_setstep(name) #define TEST_ASSERT(cnd) do{if(!(cnd)) {test_assertion_fail(__FILE__,__LINE__,"%s",#cnd);return false;}}while(0) #define TEST_ASSERT_REL(a,r,b) do{long long a_val=(a),b_val=(b);if(!(a_val r b_val)) {test_assertion_fail(__FILE__,__LINE__,"%s(0x%llx)%s%s(0x%llx)",#a,a_val,#r,#b,b_val);return false;}}while(0) #define TEST_WARN(msg...) test_message(__FILE__,__LINE__,msg) diff --git a/Tools/NetTest_Runner/stack.c b/Tools/NetTest_Runner/stack.c index e828c563..07f8be7a 100644 --- a/Tools/NetTest_Runner/stack.c +++ b/Tools/NetTest_Runner/stack.c @@ -12,6 +12,8 @@ #include #include +#include +#include #define MAX_ARGS 16 diff --git a/Tools/NetTest_Runner/test_tcp.c b/Tools/NetTest_Runner/test_tcp.c index 4e4aeb47..10e9163a 100644 --- a/Tools/NetTest_Runner/test_tcp.c +++ b/Tools/NetTest_Runner/test_tcp.c @@ -13,6 +13,8 @@ #include "tcp.h" #include +#define TEST_TIMERS 0 + #define RX_HEADER \ size_t rxlen, ofs, len; \ char rxbuf[MTU] @@ -53,6 +55,7 @@ bool Test_TCP_Basic(void) // > RFC793 Pg.65 // 1.1. Send SYN packet + TEST_STEP("1.1. Send SYN packet to CLOSED"); TCP_SendC(&testconn, TCP_SYN, testblob_len, testblob); testconn.RSeq = 0; testconn.LSeq += testblob_len; @@ -62,6 +65,7 @@ bool Test_TCP_Basic(void) TEST_ASSERT_REL(ofs, ==, rxlen); // 1.2. Send a SYN,ACK packet + TEST_STEP("1.2. Send SYN,ACK packet to CLOSED"); testconn.RSeq = 12345; TCP_SendC(&testconn, TCP_SYN|TCP_ACK, 0, NULL); // Expect a TCP_RST with SEQ=ACK @@ -71,6 +75,7 @@ bool Test_TCP_Basic(void) testconn.LSeq ++; // 1.3. Send a RST packet + TEST_STEP("1.2. Send RST packet to CLOSED"); TCP_SendC(&testconn, TCP_RST, 0, NULL); // Expect nothing TEST_ASSERT_no_rx(); @@ -188,7 +193,7 @@ bool Test_TCP_Basic(void) // 2.6. Close connection (TCP FIN) TCP_SendC(&testconn, TCP_ACK|TCP_FIN, 0, NULL); testconn.LSeq ++; // Empty = 1 byte - // Expect ACK? (Does acess do delayed ACKs here?) + // Expect ACK? (Does Acess do delayed ACKs here?) TEST_ASSERT_rx(); TEST_ASSERT( TCP_Pkt_CheckC(rxlen, rxbuf, &ofs, &len, &testconn, TCP_ACK) ); TEST_ASSERT_REL( len, ==, 0 ); -- 2.20.1