diff --git a/en/chap02.tex b/en/chap02.tex index 347177d..8d9744d 100644 --- a/en/chap02.tex +++ b/en/chap02.tex @@ -226,11 +226,14 @@ interface number in OSPFv3 ones: \verb|network [203.0.113.1-23]|. The third level describes details of the respective router/network and all the incident objects. There is always the distance from us (i.e. the router we asked for the dump), or the word \texttt{unreachable} if it is not reachable. -There is also a line for each incident host and network. For routers and + +There is also a level-3 line for each incident host and network. For routers and networks, this line is the same as on level-2, but routers may also be incident to extra-area networks (\texttt{xnetwork}), external networks (\texttt{external}), stub networks (\texttt{stubnet}) and extra-area routers -(\texttt{xrouter}). These networks are referenced by their IP address in both +(\texttt{xrouter}). In the backbone area, routers may also have virtual links +to other routers (\texttt{vlink}). These networks are referenced by their IP +address in both versions of OSPF, routers again by router IDs. These incidencies of routers have also a metric, after the word @@ -299,7 +302,21 @@ figure~\ref{fig:gennet}. We expect the user to provide some network connectivity to network 7 and configure the machine X manually. We use this exact topology as a base for our experimentation. -\X{fig:gennet} +\begin{figure}[h] + \centering + \includegraphics[width=\textwidth]{../img/gennet.pdf} + \caption{The topology of the default Gennet} + \label{fig:gennet} +\end{figure} + +The default Gennet assigns addresses as follows: The networks are given +addresses 172.23.$n$.0/24 and fdce:73a4:b00:$n$::/64, where $n$ is the number +of the network. Routers are assigned router IDs of 172.23.100.$r$, where $r$ is +the lexicographic order of that router (A gets a 1, B is 2, \dots, I becomes +9, X is 10). The IP addresses of the routers have the same number in the last +octet (e.g., the IPv6 of router X in network 6 is fdce:73a4:b00:6::a), and all +routers have an IP address in each incident network. + \section{Unusual network states}\label{s:net-unusual} diff --git a/img/gennet.pdf b/img/gennet.pdf new file mode 100644 index 0000000..6438f5f Binary files /dev/null and b/img/gennet.pdf differ diff --git a/img/gennet.svg b/img/gennet.svg new file mode 100644 index 0000000..0ca9cb6 --- /dev/null +++ b/img/gennet.svg @@ -0,0 +1,618 @@ + + + +CEDABXFIHG4657321