Merge branch 'master' of https://github.com/dopefishh/tt2015

diff --git a/a2/1cases.tex b/a2/1cases.tex
index d77edb7..1bfdc39 100644 (file)
--- a/a2/1cases.tex
+++ b/a2/1cases.tex
@@ -7,80 +7,69 @@ are to be run in a terminal. Commands prefixed with a \texttt{\#} should be run
 with root permissions. Commands prefixed with a \texttt{\$} should be run with
 user permissions.
 
-\begin{longtabu}{|l|X|}
+\begin{longtable}{|l|rp{.8\linewidth}|}
        \hline
-       Check 1 & Get the SUT in a workable state. \\
+       Check 1 & \multicolumn{2}{l|}{Get the SUT in a workable state.}\\
        \hline
-       Course of action &
-               \begin{enumerate}
-                       \item Import the VirtualBox image into VirtualBox.
-                       \item Boot the vm.
-                       \item Verify the SUT booted successfully and the network modules
-                               are loaded.
-               \end{enumerate}\\
-       \hline Passed & \textit{Yes/No} \\
+       \multirow{3}{*}{Course of action} 
+               & 1. & Import the VirtualBox image into VirtualBox.\\
+               & 2. & Boot the vm.\\
+               & 3. & Verify the SUT booted successfully and the network modules are
+               loaded.\\
+       \hline
+       Passed & \multicolumn{2}{l|}{\textit{Yes/No}}\\
        \hline\hline
-       Check 2 & Verify the SUT is complete. \\\hline
-       Course of action &
-               \begin{enumerate}
-                       \item Boot the SUT as in \emph{Check 1}.
-                       \item Verify the loopback device exists by running
-                               \texttt{\$ ifconfig}.
-                       \item Verify the \emph{echo-server} is present on the system.
-                       \item Verify \emph{Scapy} is present on the system by running
-                               \texttt{\$ scapy}.
-                       \item Verify all scripts used for testing are present on the
-                               system.
-               \end{enumerate}\\
+       Check 2 & \multicolumn{2}{l|}{Verify the SUT is complete.}\\
+       \hline
+       \multirow{5}{*}{Course of action}
+               & 1. & Boot the SUT as in \emph{Check 1}.\\
+               & 2. & Verify the loopback device exists by running 
+                        \texttt{\$ ifconfig}.\\
+               & 3. & Verify the \emph{echo-server} is present on the system by running
+                       \texttt{\$ file code/server/Main.java}\\
+               & 4. & Verify \emph{Scapy} is present on the system by running
+                       \texttt{\$ scapy}.\\
+               & 5. & Verify all scripts used for testing are present on the system.\\
        \hline
-       Passed & \textit{Yes/No}\\
-       Check 3 & Initialize the testing environment.\\
+       Passed & \multicolumn{2}{l|}{\textit{Yes/No}}\\
+       \hline\hline
+       Check 3 & \multicolumn{2}{l|}{Initialize the testing environment..}\\
        \hline
-       Course of action &
-                       \begin{enumerate}
-                               \item Boot the SUT as in \emph{Check 1}.
-                               \item Setup iptables by executing 
-                                       \texttt{\# code/iptables.sh}~\footnote{ The IPTables script
-                                       ensures that the OS does not drop packets due to an the
-                                       unknown source.}
-                               \item Navigate to the working directory by running
-                                       \texttt{\$ cd /home/student/tt2015}
-                               \item Compile the echo server by running 
-                                       \texttt{\# cd code/server \&\& make \&\& cd -}
-                               \item Start the echo server by running
-                                       \texttt{\# cd code/server \&\& java Main}
-               \end{enumerate}\\
+       \multirow{5}{*}{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
+                       that the OS does not drop packets due to an the unknown source.}\\
+               & 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 -}\\
+               & 5. & Start the echo server by running
+                       \texttt{\# cd code/server \&\& java Main}\\
        \hline
-       Passed & \textit{Yes/No}\\
+       Passed & \multicolumn{2}{l|}{\textit{Yes/No}}\\
        \hline\hline
-       Check 4 & Test the tool environment.\\
+       Check 4 & \multicolumn{2}{l|}{Test the tool environment.}\\
        \hline
-       Course of action &
-               \begin{enumerate}
-                       \item Initialize the SUT as in \emph{Check 3}
-                       \item Execute the test script by running
-                               \texttt{\# code/client/helloworld.py}.
-                       \item Verify the console displays a success message.
-               \end{enumerate}\\
+       \multirow{3}{*}{Course of action}
+               & 1. & Initialize the SUT as in \emph{Check 3}\\
+               & 2. & Execute the test script by running
+                       \texttt{\# code/client/helloworld.py}\\
+               & 3. & Verify the console displays a success message.\\
        \hline
-       Passed & \textit{Yes/No}\\
+       Passed & \multicolumn{2}{l|}{\textit{Yes/No}}\\
        \hline\hline
-       Check 5 & All test inputs and scripts are present. \\\hline
-       % DIT MOET NOG EVEN ANDERS
-       Course of action & 
-               \begin{enumerate}
-                       \item Boot the SUT as in \emph{Check 1}.
-                       \item Execute the command \texttt{ls scripts/tests}
-                       \item Verify that there is a file named case$X$ for each test case $X$
-                       \item Use \emph{ls packets}
-                       \item Verify that there is a file named \texttt{single.pcap} and
-                       \texttt{multi.pcap}.
-               \end{enumerate}\\
+       Check 5 & \multicolumn{2}{l|}{All test inputs and scripts are present.}\\
+       \hline
+       \multirow{2}{*}{Course of action}
+               & 1. & Boot the SUT as in \emph{Check 1}.\\
+               & 2. & Verify that the test generation script is present by running
+                       \texttt{\$ file code/client/test.py}\\
        \hline
-       Passed & \textit{Yes/No}\\
+       Passed & \multicolumn{2}{l|}{\textit{Yes/No}}\\
        \hline
        \caption{Preflight checklist\label{tbl:preflight}}
-\end{longtabu}
+\end{longtable}
 
 \subsection{Testing of SUT}
 The SUT is a series of services for other computer programs with no end-user
@@ -108,16 +97,33 @@ these partitions are given.
                        \item n=small payload packets
                        \item n=big payload packets
                \end{enumerate}
-       \item Correct or incorrect \emph{source port}
-       \item Correct or incorrect \emph{destination port}
+       \item \emph{source port}
+               \begin{enumerate}
+                       \item Correct
+                       \item Incorrect
+               \end{enumerate}
+       \item \emph{destination port}
+               \begin{enumerate}
+                       \item Correct
+                       \item Incorrect
+               \end{enumerate}
        \item Bits flipped in \emph{payload}
                \begin{enumerate}
                        \item Correct payload
                        \item Payload with bit flips 
                        \item Payload with odd number of bits flipped
                \end{enumerate}
-       \item Correct or Incorrect \emph{checksum}
-       \item Packets received in or out of order, or missing packets
+       \item \emph{checksum}
+               \begin{enumerate}
+                       \item Correct
+                       \item Incorrect
+               \end{enumerate}
+       \item Packet order
+               \begin{enumerate}
+                       \item Correct
+                       \item Out of order
+                       \item Missing packets
+               \end{enumerate}
 \end{enumerate}
 
 These partitions were chosen since they correspond to key parts of the TCP
@@ -149,20 +155,26 @@ to do so) tested with the different request sizes of partition 1.
 
 This is expressed in Table~\ref{table:testpairs}.
 
-\begin{table}
-% DIT MAAK IK NOG EVEN MOOI
-       \begin{tabularx}{\linewidth}{p{2cm} | l | p{2cm} | l | p{1cm} || c | c | p{1.3cm} | p{1.3cm}}
-       \textbf{Payload}      & \textbf{checksum}  & \textbf{destination port} & \textbf{order}         & \textbf{source port} & \textbf{payload 0} & \textbf{payload 1} & \textbf{payload small} & \textbf{payload big} \\  \hline \hline
-       Correct               & Correct   & Correct          & In order       & Correct     & \checkmark & \checkmark & \checkmark & \checkmark \\  \hline
-       Correct               & Incorrect & Incorrect        & Missing packet & Incorrect   & \xmark & \xmark & \checkmark & \checkmark \\  \hline
-       odd\# of bits flipped  & Correct   & Incorrect        & Out of order   & Incorrect   & \xmark & \xmark & \checkmark & \checkmark \\  \hline
-       odd\# of bits flipped  & Incorrect & Correct          & Missing packet & Correct     & \xmark & \xmark & \checkmark & \checkmark \\  \hline
-       even\# of bits flipped & Correct   & Incorrect        & Missing packet & Correct     & \xmark & \xmark & \checkmark & \checkmark \\  \hline
-       even\# of bits flipped & Incorrect & Correct          & Out of order   & Incorrect   & \xmark & \xmark & \checkmark & \checkmark \\  \hline
-       odd\# of bits flipped  & Incorrect & Incorrect        & In order       & Incorrect   & \checkmark & \checkmark & \checkmark & \checkmark \\  \hline
-       even\# of bits flipped & Incorrect & Incorrect        & In order       & Incorrect   & \checkmark & \checkmark & \checkmark & \checkmark \\  \hline
-       Correct               & Incorrect & Incorrect        & Out of order   & Correct     & \xmark & \xmark & \checkmark & \checkmark \\  
-\end{tabularx}
+\begin{table}[H]
+       \centering
+       \begin{tabular}{|l|l|l|l|l|l|l|l|l|l|l|}
+               \hline
+               & \multicolumn{10}{c|}{\textbf{Partition}}\\
+               \hline
+               & \# & 4 & 5 & 3 & 6 & 2 & 1a & 1b & 1c & 1d\\
+               \hline\hline
+               \multirow{9}{*}{Instance} 
+               & 1 & a & a & a & a & a & \checkmark & \checkmark & \checkmark & \checkmark\\
+               & 2 & a & b & b & c & b & \xmark & \xmark & \checkmark & \checkmark\\
+               & 3 & c & a & b & a & b & \xmark & \xmark & \checkmark & \checkmark\\
+               & 4 & c & b & a & c & a & \xmark & \xmark & \checkmark & \checkmark\\
+               & 5 & b & a & b & c & a & \xmark & \xmark & \checkmark & \checkmark\\
+               & 6 & b & b & a & b & b & \xmark & \xmark & \checkmark & \checkmark\\
+               & 7 & c & b & b & a & b & \checkmark & \checkmark & \checkmark & \checkmark\\
+               & 8 & b & b & b & a & b & \checkmark & \checkmark & \checkmark & \checkmark\\
+               & 9 & a & b & b & b & a & \xmark & \xmark & \checkmark & \checkmark\\
+               \hline
+\end{tabular}
 \caption{Combinations of test cases}
 \label{table:testpairs}
 \end{table}

diff --git a/a2/Makefile b/a2/Makefile
index b1820ed..fd0984a 100644 (file)
--- a/a2/Makefile
+++ b/a2/Makefile
@@ -12,10 +12,10 @@ all: $(DOCUMENT).pdf
        dvipdfm $<
 
 %.dvi: %.tex %.fmt $(SOURCES)
-       $(LATEX) --shell-escape $(basename $@)
+       $(LATEX) $(basename $@)
        bibtex $(basename $@)
-       $(LATEX) -shell-escape $(basename $@)
-       $(LATEX) -shell-escape $(basename $@)
+       $(LATEX) $(basename $@)
+       $(LATEX) $(basename $@)
 
 %.fmt: preamble.tex
        $(LATEX) -ini -jobname="$(basename $@)" "&$(LATEX) $<\dump"

diff --git a/a2/code/client/testgeneration.py b/a2/code/client/testgeneration.py
new file mode 100755 (executable)
index 0000000..17e7c9e
--- /dev/null
+++ b/a2/code/client/testgeneration.py
@@ -0,0 +1,30 @@
+#!/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/preamble.tex b/a2/preamble.tex
index a71cf23..4afe3a3 100644 (file)
--- a/a2/preamble.tex
+++ b/a2/preamble.tex
@@ -4,6 +4,7 @@
 \usepackage[dvipdfm]{hyperref}
 \usepackage{listings}
 \usepackage{graphicx}
+\usepackage{multirow}
 \usepackage{float}
 \usepackage{tabu}
 \usepackage{tabularx}