X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Tools%2FNetTest_Runner%2Ftest_tcp.c;h=42aa2d5032c77c6bf480d14e55812452d74c6959;hb=6274aaa8894e14462a36c69090e2f9235f130e31;hp=4e4aeb4724f18a529c3cf83ed660994c8de893df;hpb=4e407e69bd660e9a32644281733192193ee6e8c8;p=tpg%2Facess2.git

diff --git a/Tools/NetTest_Runner/test_tcp.c b/Tools/NetTest_Runner/test_tcp.c
index 4e4aeb47..42aa2d50 100644
--- a/Tools/NetTest_Runner/test_tcp.c
+++ b/Tools/NetTest_Runner/test_tcp.c
@@ -4,6 +4,7 @@
  *
  * test_tcp.c
  * - Tests for the behavior of the "Transmission Control Protocol"
+ * - These tests are written off RFC793
  */
 #include "test.h"
 #include "tests.h"
@@ -13,21 +14,14 @@
 #include "tcp.h"
 #include <string.h>
 
-#define RX_HEADER \
-	size_t	rxlen, ofs, len; \
-	char rxbuf[MTU]
-#define TEST_HEADER \
-	TEST_SETNAME(__func__);\
-	RX_HEADER
+#define TEST_TIMERS	0
 
-#define TEST_ASSERT_rx()	TEST_ASSERT( rxlen = Net_Receive(0, sizeof(rxbuf), rxbuf, ERX_TIMEOUT) )
-#define TEST_ASSERT_no_rx()	TEST_ASSERT( Net_Receive(0, sizeof(rxbuf), rxbuf, NRX_TIMEOUT) == 0 )
-const int	ERX_TIMEOUT = 1000;	// Expect RX timeout (timeout=failure)
-const int	NRX_TIMEOUT = 250;	// Not expect RX timeout (timeout=success)
-const int	RETX_TIMEOUT = 1000;	// OS PARAM - Retransmit timeout
-const int	LOST_TIMEOUT = 1000;	// OS PARAM - Time before sending an ACK 
-const int	DACK_TIMEOUT = 500;	// OS PARAM - Timeout for delayed ACKs
-const size_t	DACK_BYTES = 4096;	// OS PARAM - Threshold for delayed ACKs
+static const int	ERX_TIMEOUT = 1000;	// Expect RX timeout (timeout=failure)
+static const int	NRX_TIMEOUT = 250;	// Not expect RX timeout (timeout=success)
+static const int	RETX_TIMEOUT = 1000;	// OS PARAM - Retransmit timeout
+static const int	LOST_TIMEOUT = 1000;	// OS PARAM - Time before sending an ACK 
+static const int	DACK_TIMEOUT = 500;	// OS PARAM - Timeout for delayed ACKs
+static const size_t	DACK_BYTES = 4096;	// OS PARAM - Threshold for delayed ACKs
 
 bool Test_TCP_Basic(void)
 {
@@ -53,6 +47,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 +57,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 +67,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 +185,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 );
@@ -342,7 +339,47 @@ bool Test_TCP_WindowSizes(void)
 	TEST_ASSERT_REL(len, ==, 1);
 	testconn.RSeq += len;
 	// 2. Test remote handling our window being 0 (should only send ACKs)
+	// TODO: 
 	// 3. Test that remote drops data outside of its RX window
 	// 3.1. Ensure that data that wraps the end of the RX window is handled correctly
+	// TODO: 
+	return false;
+}
+
+// RFC793 pg41
+bool Test_TCP_Retransmit(void)
+{
+	TEST_HEADER;
+	tTCPConn	testconn = {
+		.IFNum = 0,
+		.AF = 4,
+		.LAddr = BLOB(HOST_IP),
+		.RAddr = BLOB(TEST_IP),
+		.LPort = 44359,
+		.RPort = 9,
+		.LSeq = 0x600,
+		.RSeq = 0x600,
+		.Window = 128
+	};
+	char	testdata[128];
+	memset(testdata, 0xAB, sizeof(testdata));
+
+	TEST_STEP("1. Open and connect to TCP server");
+	Stack_SendCommand("tcp_echo_server %i", testconn.RPort);
+	TEST_ASSERT( Test_TCP_int_OpenConnection(&testconn) );
+	
+	
+	TEST_STEP("2. Send data and expect it to be echoed");
+	TCP_SendC(&testconn, TCP_PSH, sizeof(testdata), testdata);
+	testconn.LSeq += sizeof(testdata);
+	TEST_ASSERT_rx();
+	TEST_ASSERT( TCP_Pkt_CheckC(rxlen, rxbuf, &ofs, &len, &testconn, TCP_ACK|TCP_PSH) );
+	
+	TEST_STEP("3. Expect nothing for TCP_RTX_TIMEOUT_1");
+	TEST_ASSERT( Net_Receive(0, sizeof(rxbuf), rxbuf, RETX_TIMEOUT-100) == 0 );
+	
+	TEST_STEP("4. Expect a retransmit");
+	TEST_ASSERT_rx();
+	
 	return false;
 }