From: Dion Date: Wed, 11 Nov 2015 16:27:00 +0000 (+0100) Subject: Merge branch 'master' of https://github.com/dopefishh/tt2015 X-Git-Url: https://git.martlubbers.net/?a=commitdiff_plain;h=2e920ad2a1fe23bed0a6112c8641584ece920d21;hp=29f7409053932da5c991fa7adfc1467e26b6d7bd;p=tt2015.git Merge branch 'master' of https://github.com/dopefishh/tt2015 --- diff --git a/a2/1cases.tex b/a2/1cases.tex index 78ae168..bcea37f 100644 --- a/a2/1cases.tex +++ b/a2/1cases.tex @@ -35,7 +35,7 @@ user permissions. \hline\hline Check 3 & \multicolumn{2}{l|}{Initialize the testing environment..}\\ \hline - \multirow{5}{*}{Course of action} + \multirow{6}{*}{Course of action} & 1. & Boot the SUT as in \emph{Check 1}.\\ & 2. & Setup iptables by executing \texttt{\# code/iptables.sh}~\footnote{The IPTables script ensures @@ -43,9 +43,11 @@ user permissions. & 3. & Navigate to the working directory by running \texttt{\$ cd /home/student/tt2015}\\ & 4. & Compile the echo server by running - \texttt{\# cd code/server \&\& make \&\& cd -}\\ + \texttt{\# cd code/server \&\& make}\\ & 5. & Start the echo server by running \texttt{\# cd code/server \&\& java Main}\\ + & 6. & Generate all test cases by running + \texttt{\$ python code/client/gen.py}\\ \hline Passed & \multicolumn{2}{l|}{\textit{Yes/No}}\\ \hline\hline @@ -119,11 +121,11 @@ these partitions are given. \item Correct \item Incorrect \end{enumerate} - \item \emph{Packet order} + \item \emph{Segment order} \begin{enumerate} \item Correct \item Out of order - \item Missing packets + \item Missing Segments \end{enumerate} \end{enumerate} @@ -161,29 +163,35 @@ Partitions 2 to 6 are tested using pairwise testing to keep the number of test cases feasible. The pairs are then all *except some where it does not make sense to do so) tested with the different request sizes of partition 1. -This is expressed in Table~\ref{table:testpairs}. +This is expressed in Table~\ref{table:testpairs}. In this table the first five +columns represent the different options for the partitions 2 to 6 of the above +enumeration. The last four columns are the different number segments as +described in the partition 1 of the above enumeration. These cells identify +individual test cases by a number. An \xmark in the cell indicates that this +test case can not be created as it is not possible with that number of segments +(eg. sending segments out of order when the number of segments is 1). \newcounter{TCC} \setcounter{TCC}{1} \newcommand{\doTCC}{\theTCC \stepcounter{TCC}} \begin{table}[H] \centering - \begin{tabular}{|l|l|l|l|l|l|l|l|l|l|l|} + \begin{tabular}{|l|l|l|l|l|l||l|l|l|l|} \hline - & \multicolumn{10}{c|}{\textbf{Partition}}\\ + & \multicolumn{9}{c|}{\textbf{Partition}}\\ \hline - & \# & 4 & 5 & 3 & 6 & 2 & 1a & 1b & 1c & 1d\\ + & 4 & 5 & 3 & 6 & 2 & 1a & 1b & 1c & 1d\\ \hline\hline \multirow{9}{*}{Instance} - & 1 & a & a & a & a & a & \doTCC & \doTCC & \doTCC & \doTCC\\ - & 2 & a & b & b & c & b & \xmark & \xmark & \doTCC & \doTCC\\ - & 3 & c & a & b & a & b & \xmark & \xmark & \doTCC & \doTCC\\ - & 4 & c & b & a & c & a & \xmark & \xmark & \doTCC & \doTCC\\ - & 5 & b & a & b & c & a & \xmark & \xmark & \doTCC & \doTCC\\ - & 6 & b & b & a & b & b & \xmark & \xmark & \doTCC & \doTCC\\ - & 7 & c & b & b & a & b & \doTCC & \doTCC & \doTCC & \doTCC\\ - & 8 & b & b & b & a & b & \doTCC & \doTCC & \doTCC & \doTCC\\ - & 9 & a & b & b & b & a & \xmark & \xmark & \doTCC & \doTCC\\ + & a & a & a & a & a & \doTCC & \doTCC & \doTCC & \doTCC\\ + & a & b & b & c & b & \xmark & \xmark & \doTCC & \doTCC\\ + & c & a & b & a & b & \xmark & \xmark & \doTCC & \doTCC\\ + & c & b & a & c & a & \xmark & \xmark & \doTCC & \doTCC\\ + & b & a & b & c & a & \xmark & \xmark & \doTCC & \doTCC\\ + & b & b & a & b & b & \xmark & \xmark & \doTCC & \doTCC\\ + & c & b & b & a & b & \xmark & \doTCC & \doTCC & \doTCC\\ + & b & b & b & a & b & \xmark & \doTCC & \doTCC & \doTCC\\ + & a & b & b & b & a & \xmark & \xmark & \doTCC & \doTCC\\ \hline \end{tabular} \caption{Combinations of test cases} @@ -214,7 +222,14 @@ test suite can be clearly assessed. As always, $100\%$ completeness is not feasible, therefore test cases are carefully selected to cover the most interesting parts of the TCP specification -to ensure a test suite. +to ensure a complete but feasible test suite. + +To further increase the coverage of the test suites tests are randomized. The +tests which test the handling of \emph{bit errors}, changes in the \emph{packet +order} and \emph{dropped packets} randomize where they introduce an error. The +test suite runs these tests multiple times to increase the likelihood that they +discover a fault which is only present when an error occurs in a certain +position. To further decrease the number of tests needed test cases are divided into equivalence partitions and the combination of cases as described in diff --git a/a2/code/client/gen.py b/a2/code/client/gen.py new file mode 100755 index 0000000..4dc28d1 --- /dev/null +++ b/a2/code/client/gen.py @@ -0,0 +1,63 @@ +#!/usr/bin/python +from sender import Sender +import sys +import random +import string + +def test(corruptDestinationPort, corruptSourcePort, numpackets, payloadsize, outOfOrder, serverPort): + msgs = [] + ownSeqnr = 101 + + # Make the messages + for _ in range(numpackets): + #msgs.append((ownSeqnr, ''.join(random.choice(string.ascii_letters) for _ in range(payloadsize)))) + msgs.append((ownSeqnr, ''.join(random.choice(string.ascii_letters) for _ in range(payloadsize)))) + ownSeqnr += payloadsize + + # Out of order + if outOfOrder and len(msgs) > 1: + indexes = range(0, len(msgs)) + random.shuffle(indexes) + msgs[indexes[0]], msgs[indexes[1]] = msgs[indexes[1]], msgs[indexes[0]] + print msgs + + sender = Sender(serverIP="127.0.0.1", networkInterface="lo", isLocal=True, serverPort=serverPort, waitTime=1, isVerbose=0) + # isLocal is True if the interface is a local one + response = sender.sendInput("S", 100, 100) + + # triggers the response SA _ 101 if the server is listening on the specified port + # if the server isn't listening, there are no responses + print sender.lastAckReceived + print sender.isTimeout + + # an example for the echo handling server + if sender.isTimeout == False: # in case something was received + #print 'swapped {} {}'.format(indexes[0], indexes[1]) + corruptDestinationPort = -1 if not corruptDestinationPort else random.randint(0, len(msgs)) + oldDestinationPort = sender.serverPort + corruptSourcePort = -1 if not corruptSourcePort else random.randint(0, len(msgs)) + oldSourcePort = sender.senderPort + for i, (seq, m) in enumerate(msgs): + if i == corruptDestinationPort: + sender.serverPort = sender.serverPort+1 + else: + sender.serverPort = oldDestinationPort + + if i == corruptSourcePort: + sender.senderPort = sender.senderPort+1 + else: + sender.senderPort = oldSourcePort + sender.sendInput("A", seq, sender.lastSeqReceived + 1, None) # send some data + + print 'response: ', sender.sendInput("FA", ownSeqnr, sender.lastSeqReceived + 1) # close connection (the echo also closes) + print 'response: ', sender.sendInput("RP", ownSeqnr+1, 0) # reset connection + + sender.sendReset() # switch sender port + print 'Succes!' + + +if __name__ == '__main__': + serverPort = 10000 + if len(sys.argv) > 1: + serverPort = int(sys.argv[1]) + test(corruptDestinationPort=False, corruptSourcePort=False, numpackets=2, payloadsize=1, outOfOrder=False, serverPort=serverPort) diff --git a/a2/code/client/sender.py b/a2/code/client/sender.py index e1091a3..0af62d1 100644 --- a/a2/code/client/sender.py +++ b/a2/code/client/sender.py @@ -74,7 +74,7 @@ class Sender: # consider adding the parameter: iface="ethx" if you don't receive a response. Also consider increasing the wait time scapyResponse = sr1(packet, timeout=self.waitTime, verbose=self.isVerbose) if scapyResponse is not None: - scapyResponse.show() + # scapyResponse.show() # ^^ in case you want to show the packet content # here is what you store from every packet response if Raw not in scapyResponse: diff --git a/a2/code/client/testgeneration.py b/a2/code/client/testgeneration.py deleted file mode 100755 index 17e7c9e..0000000 --- a/a2/code/client/testgeneration.py +++ /dev/null @@ -1,30 +0,0 @@ -#!/usr/bin/python -from sender import Sender -import sys - -def test(serverPort): - sender = Sender(serverIP="127.0.0.1", networkInterface="lo", isLocal=True, serverPort=serverPort, waitTime=1, isVerbose=1) - # isLocal is True if the interface is a local one - response = sender.sendInput("S", 100, 100) - - # triggers the response SA _ 101 if the server is listening on the specified port - # if the server isn't listening, there are no responses - print sender.lastAckReceived - print sender.isTimeout - - # an example for the echo handling server - if sender.isTimeout == False: # in case something was received - sender.sendInput("A", 101, sender.lastSeqReceived + 1) # connection is established - sender.sendInput("A", 101, sender.lastSeqReceived + 1, data = "Hello world!") # send some data - sender.sendInput("FA", 103, sender.lastSeqReceived + 1) # close connection (the echo also closes) - sender.sendInput("RP", 104, 0) # reset connection - - sender.sendReset() # switch sender port - print 'Succes!' - - -if __name__ == "__main__": - serverPort = 10000 - if len(sys.argv) > 1: - serverPort = int(sys.argv[1]) - test(serverPort) diff --git a/a2/code/server/EchoHandler.java b/a2/code/server/EchoHandler.java index e8e95c7..c60a9f0 100644 --- a/a2/code/server/EchoHandler.java +++ b/a2/code/server/EchoHandler.java @@ -43,4 +43,4 @@ public class EchoHandler implements Runnable { } } -} \ No newline at end of file +}