1.1 --- a/Makefile	Thu Feb 26 15:35:57 2009 +0100
     1.2 +++ b/Makefile	Thu Feb 26 16:41:57 2009 +0100
     1.3 @@ -9,7 +9,7 @@
     1.4  
     1.5  all: wns3.pdf
     1.6  
     1.7 -wns3.pdf: wns3.tex 
     1.8 +wns3.pdf: wns3.tex scenario.pdf
     1.9  	pdflatex wns3.tex
    1.10  
    1.11  force:

     2.1 --- a/wns3.tex	Thu Feb 26 15:35:57 2009 +0100
     2.2 +++ b/wns3.tex	Thu Feb 26 16:41:57 2009 +0100
     2.3 @@ -31,20 +31,65 @@
     2.4  \tableofcontents[subsectionstyle=hide]
     2.5  \end{frame}
     2.6  
     2.7 -\section{The example scenario}
     2.8 +\section{The Example Scenario}
     2.9  
    2.10 -\begin{frame}{}
    2.11 +\begin{frame}{Wifi and Csma}
    2.12 +\begin{columns}
    2.13 +\begin{column}{0.5\textwidth}
    2.14 +\includegraphics[width=6cm]{scenario}
    2.15 +\end{column}
    2.16 +\begin{column}{0.5\textwidth}
    2.17 +\begin{itemize}
    2.18 +\item One csma link
    2.19 +\item One wifi infrastructure network
    2.20 +\item Two ip subnetworks
    2.21 +\item One udp traffic generator
    2.22 +\item One udp traffic receiver
    2.23 +\item Global god ip routing
    2.24 +\end{itemize}
    2.25 +\end{column}
    2.26 +\end{columns}
    2.27  \end{frame}
    2.28  
    2.29 -\section{The Helper version}
    2.30 +\section{The Helper Version}
    2.31  
    2.32 -\begin{frame}{}
    2.33 +\begin{frame}{Basic concepts}
    2.34 +\begin{itemize}
    2.35 +\item Work on sets of similar objects:
    2.36 +\begin{itemize}
    2.37 +\item NodeContainer
    2.38 +\item NetDeviceContainer
    2.39 +\item ...
    2.40 +\end{itemize}
    2.41 +\end{itemize}
    2.42  \end{frame}
    2.43  
    2.44 +\subsection{Read Command-Line Arguments}
    2.45 +\begin{frame}[fragile]{Read Command-Line Arguments}
    2.46 +\begin{verbatim}
    2.47 +using namespace ns3;
    2.48 +
    2.49 +int main (int argc, char *argv[])
    2.50 +{
    2.51 +  CommandLine cmd;
    2.52 +  cmd.Parse (argc, argv);
    2.53 +...
    2.54 +\end{verbatim}
    2.55 +\end{frame}
    2.56 +
    2.57 +\subsection{The Csma MAC link}
    2.58 +
    2.59 +\begin{frame}[fragile]{The Csma MAC link}
    2.60 +\begin{verbatim}
    2.61 +
    2.62 +\end{verbatim}
    2.63 +\end{frame}
    2.64 +
    2.65 +
    2.66  \subsection{The point to point link}
    2.67  
    2.68  \begin{frame}{}
    2.69 -\end{frame}
    2.70 +\end{frame}w
    2.71  
    2.72  \subsection{The wifi infrastructure network}
    2.73