added ssl tools

16 files changed, 113 insertions, 58 deletions

diff --git a/doc/latex/annotated.tex b/doc/latex/annotated.tex
index ae936ab..433d507 100644
--- a/doc/latex/annotated.tex
+++ b/doc/latex/annotated.tex
@@ -5,6 +5,8 @@ Here are the classes, structs, unions and interfaces with brief descriptions:\be
 \item\contentsline{section}{{\bf Buffer} }{\pageref{classBuffer}}{}
 \item\contentsline{section}{{\bf Communicating\-Socket} }{\pageref{classCommunicatingSocket}}{}
 \item\contentsline{section}{{\bf Condition} }{\pageref{classCondition}}{}
+\item\contentsline{section}{{\bf Connection\-List} }{\pageref{classConnectionList}}{}
+\item\contentsline{section}{{\bf Connection\-Param} }{\pageref{classConnectionParam}}{}
 \item\contentsline{section}{{\bf Cypher} }{\pageref{classCypher}}{}
 \item\contentsline{section}{{\bf Hmac\-Auth\-Algo} }{\pageref{classHmacAuthAlgo}}{}
 \item\contentsline{section}{{\bf Key\-Derivation} }{\pageref{classKeyDerivation}}{}
@@ -13,6 +15,7 @@ Here are the classes, structs, unions and interfaces with brief descriptions:\be
 \item\contentsline{section}{{\bf Log::instance\-Cleaner} }{\pageref{classLog_1_1instanceCleaner}}{}
 \item\contentsline{section}{{\bf Log\-String\-Builder} }{\pageref{classLogStringBuilder}}{}
 \item\contentsline{section}{{\bf Mutex} }{\pageref{classMutex}}{}
+\item\contentsline{section}{{\bf Network\-Address} }{\pageref{classNetworkAddress}}{}
 \item\contentsline{section}{{\bf Null\-Auth\-Algo} }{\pageref{classNullAuthAlgo}}{}
 \item\contentsline{section}{{\bf Null\-Cypher} }{\pageref{classNullCypher}}{}
 \item\contentsline{section}{{\bf Options} }{\pageref{classOptions}}{}
@@ -20,6 +23,7 @@ Here are the classes, structs, unions and interfaces with brief descriptions:\be
 \item\contentsline{section}{{\bf Packet::Header\-Struct} }{\pageref{structPacket_1_1HeaderStruct}}{}
 \item\contentsline{section}{{\bf Packet\-Source} }{\pageref{classPacketSource}}{}
 \item\contentsline{section}{{\bf Param} }{\pageref{structParam}}{}
+\item\contentsline{section}{{\bf Router} }{\pageref{classRouter}}{}
 \item\contentsline{section}{{\bf satp::SATP} }{\pageref{classsatp_1_1SATP}}{}
 \item\contentsline{section}{{\bf Semaphore} }{\pageref{classSemaphore}}{}
 \item\contentsline{section}{{\bf Seq\-Window} }{\pageref{classSeqWindow}}{}
diff --git a/doc/latex/authAlgo_8cpp.tex b/doc/latex/authAlgo_8cpp.tex
index 8d2e535..d68ac70 100644
--- a/doc/latex/authAlgo_8cpp.tex
+++ b/doc/latex/authAlgo_8cpp.tex
@@ -1,4 +1,4 @@
 \section{auth\-Algo.cpp File Reference}
 \label{authAlgo_8cpp}\index{authAlgo.cpp@{authAlgo.cpp}}
 {\tt \#include \char`\"{}auth\-Algo.h\char`\"{}}\par
-{\tt \#include $<$srtp/crypto\_\-kernel.h$>$}\par
+{\tt \#include $<$gcrypt.h$>$}\par
diff --git a/doc/latex/classAesIcmCypher.tex b/doc/latex/classAesIcmCypher.tex
index 8735572..5f27232 100644
--- a/doc/latex/classAesIcmCypher.tex
+++ b/doc/latex/classAesIcmCypher.tex
@@ -22,9 +22,9 @@ void {\bf set\-Salt} ({\bf Buffer} salt)
 \subsection*{Static Public Attributes}
 \begin{CompactItemize}
 \item 
-static const std::string {\bf MIN\_\-GCRYPT\_\-VERSION}
+static const char $\ast$ {\bf MIN\_\-GCRYPT\_\-VERSION}
 \item 
-static const {\bf u\_\-int32\_\-t} {\bf GCRYPT\_\-SEC\_\-MEM}
+static const {\bf u\_\-int32\_\-t} {\bf GCRYPT\_\-SEC\_\-MEM} = 16384
 \end{CompactItemize}
 \subsection*{Protected Member Functions}
 \begin{CompactItemize}
@@ -85,12 +85,12 @@ Implements {\bf Cypher} \doxyref{}{p.}{classCypher_7ddf1bcd476978daa97148ec406d6
 \subsection{Member Data Documentation}
 \index{AesIcmCypher@{Aes\-Icm\-Cypher}!MIN_GCRYPT_VERSION@{MIN\_\-GCRYPT\_\-VERSION}}
 \index{MIN_GCRYPT_VERSION@{MIN\_\-GCRYPT\_\-VERSION}!AesIcmCypher@{Aes\-Icm\-Cypher}}
-\subsubsection{\setlength{\rightskip}{0pt plus 5cm}const std::string {\bf Aes\-Icm\-Cypher::MIN\_\-GCRYPT\_\-VERSION}\hspace{0.3cm}{\tt  [static]}}\label{classAesIcmCypher_605842d12379711d74401d0923b5d76e}
+\subsubsection{\setlength{\rightskip}{0pt plus 5cm}const char $\ast$ {\bf Aes\-Icm\-Cypher::MIN\_\-GCRYPT\_\-VERSION}\hspace{0.3cm}{\tt  [static]}}\label{classAesIcmCypher_a51dfb2f03f214c03b5b45f84279023f}
 
 
 \index{AesIcmCypher@{Aes\-Icm\-Cypher}!GCRYPT_SEC_MEM@{GCRYPT\_\-SEC\_\-MEM}}
 \index{GCRYPT_SEC_MEM@{GCRYPT\_\-SEC\_\-MEM}!AesIcmCypher@{Aes\-Icm\-Cypher}}
-\subsubsection{\setlength{\rightskip}{0pt plus 5cm}const {\bf u\_\-int32\_\-t} {\bf Aes\-Icm\-Cypher::GCRYPT\_\-SEC\_\-MEM}\hspace{0.3cm}{\tt  [static]}}\label{classAesIcmCypher_4d1dea41b9745bca5a2d84fcefe3558c}
+\subsubsection{\setlength{\rightskip}{0pt plus 5cm}const {\bf u\_\-int32\_\-t} {\bf Aes\-Icm\-Cypher::GCRYPT\_\-SEC\_\-MEM} = 16384\hspace{0.3cm}{\tt  [static]}}\label{classAesIcmCypher_4d1dea41b9745bca5a2d84fcefe3558c}
 
 
 \index{AesIcmCypher@{Aes\-Icm\-Cypher}!cipher_@{cipher\_\-}}
diff --git a/doc/latex/classBuffer.tex b/doc/latex/classBuffer.tex
index 6c9c791..94db2f0 100644
--- a/doc/latex/classBuffer.tex
+++ b/doc/latex/classBuffer.tex
@@ -23,6 +23,10 @@ virtual {\bf $\sim$Buffer} ()
 \item 
 void {\bf operator=} (const {\bf Buffer} \&src)
 \item 
+void {\bf operator=} (const {\bf seq\_\-nr\_\-t} \&src)
+\item 
+void {\bf operator=} (const {\bf sender\_\-id\_\-t} \&src)
+\item 
 virtual {\bf Buffer} {\bf operator$^\wedge$} (const {\bf Buffer} \&xor\_\-by) const 
 \item 
 virtual {\bf Buffer} {\bf left\-Byte\-Shift} ({\bf u\_\-int32\_\-t} width) const
@@ -58,10 +62,6 @@ void {\bf print\-Hex\-Dump} () const
 class {\bf Tun\-Device}
 \item 
 class {\bf UDPPacket\-Source}
-\item 
-class {\bf Aes\-Icm\-Cypher}
-\item 
-class {\bf Key\-Derivation}
 \end{CompactItemize}
 
 
@@ -99,6 +99,16 @@ class {\bf Key\-Derivation}
 \subsubsection{\setlength{\rightskip}{0pt plus 5cm}void Buffer::operator= (const {\bf Buffer} \& {\em src})}\label{classBuffer_14cec0d3bf4f3f1a4a9930a8c53eb43a}
 
 
+\index{Buffer@{Buffer}!operator=@{operator=}}
+\index{operator=@{operator=}!Buffer@{Buffer}}
+\subsubsection{\setlength{\rightskip}{0pt plus 5cm}void Buffer::operator= (const {\bf seq\_\-nr\_\-t} \& {\em src})}\label{classBuffer_b62dfbb5605a860aa63771f3b1c29b1e}
+
+
+\index{Buffer@{Buffer}!operator=@{operator=}}
+\index{operator=@{operator=}!Buffer@{Buffer}}
+\subsubsection{\setlength{\rightskip}{0pt plus 5cm}void Buffer::operator= (const {\bf sender\_\-id\_\-t} \& {\em src})}\label{classBuffer_b3bda89f495b3895a533155f593ab503}
+
+
 \index{Buffer@{Buffer}!operator^@{operator$^\wedge$}}
 \index{operator^@{operator$^\wedge$}!Buffer@{Buffer}}
 \subsubsection{\setlength{\rightskip}{0pt plus 5cm}{\bf Buffer} Buffer::operator$^\wedge$ (const {\bf Buffer} \& {\em xor\_\-by}) const\hspace{0.3cm}{\tt  [virtual]}}\label{classBuffer_d56159a415541fcff34ef8aed1eb7183}
@@ -167,16 +177,6 @@ class {\bf Key\-Derivation}
 \subsubsection{\setlength{\rightskip}{0pt plus 5cm}friend class {\bf UDPPacket\-Source}\hspace{0.3cm}{\tt  [friend]}}\label{classBuffer_940a382a5e3a8622e6689e13dc453481}
 
 
-\index{Buffer@{Buffer}!AesIcmCypher@{AesIcmCypher}}
-\index{AesIcmCypher@{AesIcmCypher}!Buffer@{Buffer}}
-\subsubsection{\setlength{\rightskip}{0pt plus 5cm}friend class {\bf Aes\-Icm\-Cypher}\hspace{0.3cm}{\tt  [friend]}}\label{classBuffer_41d791e5b640813dea34c24c11056581}
-
-
-\index{Buffer@{Buffer}!KeyDerivation@{KeyDerivation}}
-\index{KeyDerivation@{KeyDerivation}!Buffer@{Buffer}}
-\subsubsection{\setlength{\rightskip}{0pt plus 5cm}friend class {\bf Key\-Derivation}\hspace{0.3cm}{\tt  [friend]}}\label{classBuffer_1d039eb05e29b8eeadca9b474bb6d49f}
-
-
 
 
 \subsection{Member Data Documentation}
diff --git a/doc/latex/classKeyDerivation.tex b/doc/latex/classKeyDerivation.tex
index 9d38b9d..4dea6cc 100644
--- a/doc/latex/classKeyDerivation.tex
+++ b/doc/latex/classKeyDerivation.tex
@@ -11,17 +11,12 @@ virtual {\bf $\sim$Key\-Derivation} ()
 \item 
 void {\bf init} ({\bf Buffer} key, {\bf Buffer} salt)
 \item 
-err\_\-status\_\-t {\bf set\-Log\-KDRate} (const uint8\_\-t ld\_\-rate)
+void {\bf set\-Log\-KDRate} (const {\bf u\_\-int8\_\-t} ld\_\-rate)
 \item 
-err\_\-status\_\-t {\bf generate} ({\bf satp\_\-prf\_\-label} label, {\bf seq\_\-nr\_\-t} seq\_\-nr, {\bf Buffer} \&key, uint32\_\-t length)
+void {\bf generate} ({\bf satp\_\-prf\_\-label} label, {\bf seq\_\-nr\_\-t} seq\_\-nr, {\bf Buffer} \&key, {\bf u\_\-int32\_\-t} length)
 \item 
 void {\bf clear} ()
 \end{CompactItemize}
-\subsection*{Static Public Attributes}
-\begin{CompactItemize}
-\item 
-static const std::string {\bf MIN\_\-GCRYPT\_\-VERSION}
-\end{CompactItemize}
 \subsection*{Protected Attributes}
 \begin{CompactItemize}
 \item 
@@ -31,6 +26,11 @@ static const std::string {\bf MIN\_\-GCRYPT\_\-VERSION}
 \item 
 gcry\_\-cipher\_\-hd\_\-t {\bf cipher\_\-}
 \end{CompactItemize}
+\subsection*{Static Protected Attributes}
+\begin{CompactItemize}
+\item 
+static const char $\ast$ {\bf MIN\_\-GCRYPT\_\-VERSION}
+\end{CompactItemize}
 
 
 \subsection{Constructor \& Destructor Documentation}
@@ -54,12 +54,12 @@ gcry\_\-cipher\_\-hd\_\-t {\bf cipher\_\-}
 
 \index{KeyDerivation@{Key\-Derivation}!setLogKDRate@{setLogKDRate}}
 \index{setLogKDRate@{setLogKDRate}!KeyDerivation@{Key\-Derivation}}
-\subsubsection{\setlength{\rightskip}{0pt plus 5cm}err\_\-status\_\-t Key\-Derivation::set\-Log\-KDRate (const uint8\_\-t {\em ld\_\-rate})}\label{classKeyDerivation_1c6d7a055b6b5b88076e15218f936663}
+\subsubsection{\setlength{\rightskip}{0pt plus 5cm}void Key\-Derivation::set\-Log\-KDRate (const {\bf u\_\-int8\_\-t} {\em ld\_\-rate})}\label{classKeyDerivation_b055afc0de04a6e32631e42f09b32e63}
 
 
 \index{KeyDerivation@{Key\-Derivation}!generate@{generate}}
 \index{generate@{generate}!KeyDerivation@{Key\-Derivation}}
-\subsubsection{\setlength{\rightskip}{0pt plus 5cm}err\_\-status\_\-t Key\-Derivation::generate ({\bf satp\_\-prf\_\-label} {\em label}, {\bf seq\_\-nr\_\-t} {\em seq\_\-nr}, {\bf Buffer} \& {\em key}, uint32\_\-t {\em length})}\label{classKeyDerivation_025e21ecdd0389b768eaa61fed660c86}
+\subsubsection{\setlength{\rightskip}{0pt plus 5cm}void Key\-Derivation::generate ({\bf satp\_\-prf\_\-label} {\em label}, {\bf seq\_\-nr\_\-t} {\em seq\_\-nr}, {\bf Buffer} \& {\em key}, {\bf u\_\-int32\_\-t} {\em length})}\label{classKeyDerivation_6d319febcad73d199fe8773ae614f70a}
 
 
 \index{KeyDerivation@{Key\-Derivation}!clear@{clear}}
@@ -70,11 +70,6 @@ gcry\_\-cipher\_\-hd\_\-t {\bf cipher\_\-}
 
 
 \subsection{Member Data Documentation}
-\index{KeyDerivation@{Key\-Derivation}!MIN_GCRYPT_VERSION@{MIN\_\-GCRYPT\_\-VERSION}}
-\index{MIN_GCRYPT_VERSION@{MIN\_\-GCRYPT\_\-VERSION}!KeyDerivation@{Key\-Derivation}}
-\subsubsection{\setlength{\rightskip}{0pt plus 5cm}const std::string {\bf Key\-Derivation::MIN\_\-GCRYPT\_\-VERSION}\hspace{0.3cm}{\tt  [static]}}\label{classKeyDerivation_9aaf24245f7dec6e68fc24541abce94b}
-
-
 \index{KeyDerivation@{Key\-Derivation}!ld_kdr_@{ld\_\-kdr\_\-}}
 \index{ld_kdr_@{ld\_\-kdr\_\-}!KeyDerivation@{Key\-Derivation}}
 \subsubsection{\setlength{\rightskip}{0pt plus 5cm}{\bf int8\_\-t} {\bf Key\-Derivation::ld\_\-kdr\_\-}\hspace{0.3cm}{\tt  [protected]}}\label{classKeyDerivation_426dcd34d3b60191a3db55dd970eeb17}
@@ -85,6 +80,11 @@ gcry\_\-cipher\_\-hd\_\-t {\bf cipher\_\-}
 \subsubsection{\setlength{\rightskip}{0pt plus 5cm}{\bf Buffer} {\bf Key\-Derivation::salt\_\-}\hspace{0.3cm}{\tt  [protected]}}\label{classKeyDerivation_52e057f1085920a61ea44c5c9936865c}
 
 
+\index{KeyDerivation@{Key\-Derivation}!MIN_GCRYPT_VERSION@{MIN\_\-GCRYPT\_\-VERSION}}
+\index{MIN_GCRYPT_VERSION@{MIN\_\-GCRYPT\_\-VERSION}!KeyDerivation@{Key\-Derivation}}
+\subsubsection{\setlength{\rightskip}{0pt plus 5cm}const char $\ast$ {\bf Key\-Derivation::MIN\_\-GCRYPT\_\-VERSION}\hspace{0.3cm}{\tt  [static, protected]}}\label{classKeyDerivation_2091534e962a9d0f7b3b034150d33333}
+
+
 \index{KeyDerivation@{Key\-Derivation}!cipher_@{cipher\_\-}}
 \index{cipher_@{cipher\_\-}!KeyDerivation@{Key\-Derivation}}
 \subsubsection{\setlength{\rightskip}{0pt plus 5cm}gcry\_\-cipher\_\-hd\_\-t {\bf Key\-Derivation::cipher\_\-}\hspace{0.3cm}{\tt  [protected]}}\label{classKeyDerivation_6b7dd9a922de96a8f76cf6c453adab28}
diff --git a/doc/latex/classOptions.tex b/doc/latex/classOptions.tex
index 5a01c3f..e9ec825 100644
--- a/doc/latex/classOptions.tex
+++ b/doc/latex/classOptions.tex
@@ -25,6 +25,10 @@ std::string {\bf get\-Local\-Addr} ()
 \item 
 {\bf Options} \& {\bf set\-Local\-Addr} (std::string l)
 \item 
+std::string {\bf get\-Local\-Sync\-Addr} ()
+\item 
+{\bf Options} \& {\bf set\-Local\-Sync\-Addr} (std::string l)
+\item 
 {\bf u\_\-int16\_\-t} {\bf get\-Local\-Port} ()
 \item 
 {\bf Options} \& {\bf set\-Local\-Port} ({\bf u\_\-int16\_\-t} l)
@@ -33,6 +37,10 @@ std::string {\bf get\-Remote\-Addr} ()
 \item 
 {\bf Options} \& {\bf set\-Remote\-Addr} (std::string r)
 \item 
+{\bf u\_\-int16\_\-t} {\bf get\-Local\-Sync\-Port} ()
+\item 
+{\bf Options} \& {\bf set\-Local\-Sync\-Port} ({\bf u\_\-int16\_\-t} l)
+\item 
 {\bf u\_\-int16\_\-t} {\bf get\-Remote\-Port} ()
 \item 
 {\bf Options} \& {\bf set\-Remote\-Port} ({\bf u\_\-int16\_\-t} r)
@@ -78,8 +86,12 @@ std::string {\bf progname\_\-}
 \item 
 std::string {\bf local\_\-addr\_\-}
 \item 
+std::string {\bf local\_\-sync\_\-addr\_\-}
+\item 
 {\bf u\_\-int16\_\-t} {\bf local\_\-port\_\-}
 \item 
+{\bf u\_\-int16\_\-t} {\bf local\_\-sync\_\-port\_\-}
+\item 
 std::string {\bf remote\_\-addr\_\-}
 \item 
 {\bf u\_\-int16\_\-t} {\bf remote\_\-port\_\-}
@@ -154,6 +166,16 @@ std::string {\bf auth\_\-algo\_\-}
 \subsubsection{\setlength{\rightskip}{0pt plus 5cm}{\bf Options} \& Options::set\-Local\-Addr (std::string {\em l})}\label{classOptions_bf7ebb3ee98c6d31dd5c5b0732188de5}
 
 
+\index{Options@{Options}!getLocalSyncAddr@{getLocalSyncAddr}}
+\index{getLocalSyncAddr@{getLocalSyncAddr}!Options@{Options}}
+\subsubsection{\setlength{\rightskip}{0pt plus 5cm}std::string Options::get\-Local\-Sync\-Addr ()}\label{classOptions_e614846f55efc3c84fcde4718156e544}
+
+
+\index{Options@{Options}!setLocalSyncAddr@{setLocalSyncAddr}}
+\index{setLocalSyncAddr@{setLocalSyncAddr}!Options@{Options}}
+\subsubsection{\setlength{\rightskip}{0pt plus 5cm}{\bf Options} \& Options::set\-Local\-Sync\-Addr (std::string {\em l})}\label{classOptions_a6d319a0adbfce9a9e1c6131bce5c2f2}
+
+
 \index{Options@{Options}!getLocalPort@{getLocalPort}}
 \index{getLocalPort@{getLocalPort}!Options@{Options}}
 \subsubsection{\setlength{\rightskip}{0pt plus 5cm}{\bf u\_\-int16\_\-t} Options::get\-Local\-Port ()}\label{classOptions_44a66c61b99fc0d1a953493a3cd4dcab}
@@ -174,6 +196,16 @@ std::string {\bf auth\_\-algo\_\-}
 \subsubsection{\setlength{\rightskip}{0pt plus 5cm}{\bf Options} \& Options::set\-Remote\-Addr (std::string {\em r})}\label{classOptions_d0848af5b5e029a4ea14fe6fb82d3f46}
 
 
+\index{Options@{Options}!getLocalSyncPort@{getLocalSyncPort}}
+\index{getLocalSyncPort@{getLocalSyncPort}!Options@{Options}}
+\subsubsection{\setlength{\rightskip}{0pt plus 5cm}{\bf u\_\-int16\_\-t} Options::get\-Local\-Sync\-Port ()}\label{classOptions_5ada1a8516ba353b5cf389d041ea75c9}
+
+
+\index{Options@{Options}!setLocalSyncPort@{setLocalSyncPort}}
+\index{setLocalSyncPort@{setLocalSyncPort}!Options@{Options}}
+\subsubsection{\setlength{\rightskip}{0pt plus 5cm}{\bf Options} \& Options::set\-Local\-Sync\-Port ({\bf u\_\-int16\_\-t} {\em l})}\label{classOptions_7b2c8a681fd14ded0681eea7882fd3ec}
+
+
 \index{Options@{Options}!getRemotePort@{getRemotePort}}
 \index{getRemotePort@{getRemotePort}!Options@{Options}}
 \subsubsection{\setlength{\rightskip}{0pt plus 5cm}{\bf u\_\-int16\_\-t} Options::get\-Remote\-Port ()}\label{classOptions_4d2089d4216557810410f31ffa2dfc8b}
@@ -282,11 +314,21 @@ std::string {\bf auth\_\-algo\_\-}
 \subsubsection{\setlength{\rightskip}{0pt plus 5cm}std::string {\bf Options::local\_\-addr\_\-}\hspace{0.3cm}{\tt  [private]}}\label{classOptions_d331507d07c87908a5b199a209a3e97e}
 
 
+\index{Options@{Options}!local_sync_addr_@{local\_\-sync\_\-addr\_\-}}
+\index{local_sync_addr_@{local\_\-sync\_\-addr\_\-}!Options@{Options}}
+\subsubsection{\setlength{\rightskip}{0pt plus 5cm}std::string {\bf Options::local\_\-sync\_\-addr\_\-}\hspace{0.3cm}{\tt  [private]}}\label{classOptions_83aa9bb2387d4f988a2aab7653fc8786}
+
+
 \index{Options@{Options}!local_port_@{local\_\-port\_\-}}
 \index{local_port_@{local\_\-port\_\-}!Options@{Options}}
 \subsubsection{\setlength{\rightskip}{0pt plus 5cm}{\bf u\_\-int16\_\-t} {\bf Options::local\_\-port\_\-}\hspace{0.3cm}{\tt  [private]}}\label{classOptions_744fc32e1b4f5c930251a8b0013f7f0a}
 
 
+\index{Options@{Options}!local_sync_port_@{local\_\-sync\_\-port\_\-}}
+\index{local_sync_port_@{local\_\-sync\_\-port\_\-}!Options@{Options}}
+\subsubsection{\setlength{\rightskip}{0pt plus 5cm}{\bf u\_\-int16\_\-t} {\bf Options::local\_\-sync\_\-port\_\-}\hspace{0.3cm}{\tt  [private]}}\label{classOptions_2fd9e6b23a64d3844c9318136b1e61da}
+
+
 \index{Options@{Options}!remote_addr_@{remote\_\-addr\_\-}}
 \index{remote_addr_@{remote\_\-addr\_\-}!Options@{Options}}
 \subsubsection{\setlength{\rightskip}{0pt plus 5cm}std::string {\bf Options::remote\_\-addr\_\-}\hspace{0.3cm}{\tt  [private]}}\label{classOptions_af81d4d836e3ca1850b8b474d61944de}
diff --git a/doc/latex/classTunDevice.tex b/doc/latex/classTunDevice.tex
index cb5782b..05a3f0f 100644
--- a/doc/latex/classTunDevice.tex
+++ b/doc/latex/classTunDevice.tex
@@ -23,7 +23,7 @@ char $\ast$ {\bf get\-Actual\-Name} ()
 \item 
 {\bf u\_\-int32\_\-t} {\bf get\-Type} ()
 \item 
-char $\ast$ {\bf get\-Type\-String} ()
+const char $\ast$ {\bf get\-Type\-String} ()
 \end{CompactItemize}
 \subsection*{Static Public Attributes}
 \begin{CompactItemize}
@@ -106,7 +106,7 @@ tuntap $\ast$ {\bf dev\_\-}
 
 \index{TunDevice@{Tun\-Device}!getTypeString@{getTypeString}}
 \index{getTypeString@{getTypeString}!TunDevice@{Tun\-Device}}
-\subsubsection{\setlength{\rightskip}{0pt plus 5cm}char $\ast$ Tun\-Device::get\-Type\-String ()}\label{classTunDevice_0cecbc6a7e58d294dd005e7d523173bd}
+\subsubsection{\setlength{\rightskip}{0pt plus 5cm}const char $\ast$ Tun\-Device::get\-Type\-String ()}\label{classTunDevice_eb99a885d90822b00e623ca02c2b06cc}
 
 
 \index{TunDevice@{Tun\-Device}!operator=@{operator=}}
diff --git a/doc/latex/cypher_8cpp.tex b/doc/latex/cypher_8cpp.tex
index ef972bb..fa3c98c 100644
--- a/doc/latex/cypher_8cpp.tex
+++ b/doc/latex/cypher_8cpp.tex
@@ -1,8 +1,8 @@
 \section{cypher.cpp File Reference}
 \label{cypher_8cpp}\index{cypher.cpp@{cypher.cpp}}
 {\tt \#include $<$stdexcept$>$}\par
-{\tt \#include $<$vector$>$}\par
 {\tt \#include $<$iostream$>$}\par
+{\tt \#include $<$string$>$}\par
 {\tt \#include \char`\"{}cypher.h\char`\"{}}\par
 {\tt \#include \char`\"{}key\-Derivation.h\char`\"{}}\par
 {\tt \#include $<$gcrypt.h$>$}\par
diff --git a/doc/latex/cypher_8h.tex b/doc/latex/cypher_8h.tex
index 9bd359a..909230b 100644
--- a/doc/latex/cypher_8h.tex
+++ b/doc/latex/cypher_8h.tex
@@ -3,7 +3,6 @@
 {\tt \#include \char`\"{}datatypes.h\char`\"{}}\par
 {\tt \#include \char`\"{}buffer.h\char`\"{}}\par
 {\tt \#include $<$gcrypt.h$>$}\par
-{\tt \#include $<$string$>$}\par
 \subsection*{Classes}
 \begin{CompactItemize}
 \item 
diff --git a/doc/latex/doxygen.sty b/doc/latex/doxygen.sty
index 3b75371..d28fcf1 100644
--- a/doc/latex/doxygen.sty
+++ b/doc/latex/doxygen.sty
@@ -10,8 +10,8 @@
         {\fancyplain{}{\bfseries\rightmark}}
 \rhead[\fancyplain{}{\bfseries\leftmark}]
         {\fancyplain{}{\bfseries\thepage}}
-\rfoot[\fancyplain{}{\bfseries\scriptsize Generated on Sun Oct 7 23:43:49 2007 for anytun by Doxygen }]{}
-\lfoot[]{\fancyplain{}{\bfseries\scriptsize Generated on Sun Oct 7 23:43:49 2007 for anytun by Doxygen }}
+\rfoot[\fancyplain{}{\bfseries\scriptsize Generated on Tue Nov 27 14:11:51 2007 for anytun by Doxygen }]{}
+\lfoot[]{\fancyplain{}{\bfseries\scriptsize Generated on Tue Nov 27 14:11:51 2007 for anytun by Doxygen }}
 \cfoot{}
 \newenvironment{Code}
 {\footnotesize}
diff --git a/doc/latex/files.tex b/doc/latex/files.tex
index 0a7f754..248ae98 100644
--- a/doc/latex/files.tex
+++ b/doc/latex/files.tex
@@ -5,6 +5,10 @@ Here is a list of all files with brief descriptions:\begin{CompactList}
 \item\contentsline{section}{{\bf auth\-Algo.h} }{\pageref{authAlgo_8h}}{}
 \item\contentsline{section}{{\bf buffer.cpp} }{\pageref{buffer_8cpp}}{}
 \item\contentsline{section}{{\bf buffer.h} }{\pageref{buffer_8h}}{}
+\item\contentsline{section}{{\bf connection\-List.cpp} }{\pageref{connectionList_8cpp}}{}
+\item\contentsline{section}{{\bf connection\-List.h} }{\pageref{connectionList_8h}}{}
+\item\contentsline{section}{{\bf connection\-Param.cpp} }{\pageref{connectionParam_8cpp}}{}
+\item\contentsline{section}{{\bf connection\-Param.h} }{\pageref{connectionParam_8h}}{}
 \item\contentsline{section}{{\bf cypher.cpp} }{\pageref{cypher_8cpp}}{}
 \item\contentsline{section}{{\bf cypher.h} }{\pageref{cypher_8h}}{}
 \item\contentsline{section}{{\bf datatypes.h} }{\pageref{datatypes_8h}}{}
@@ -12,6 +16,8 @@ Here is a list of all files with brief descriptions:\begin{CompactList}
 \item\contentsline{section}{{\bf key\-Derivation.h} }{\pageref{keyDerivation_8h}}{}
 \item\contentsline{section}{{\bf log.cpp} }{\pageref{log_8cpp}}{}
 \item\contentsline{section}{{\bf log.h} }{\pageref{log_8h}}{}
+\item\contentsline{section}{{\bf network\-Address.cpp} }{\pageref{networkAddress_8cpp}}{}
+\item\contentsline{section}{{\bf network\-Address.h} }{\pageref{networkAddress_8h}}{}
 \item\contentsline{section}{{\bf options.cpp} }{\pageref{options_8cpp}}{}
 \item\contentsline{section}{{\bf options.h} }{\pageref{options_8h}}{}
 \item\contentsline{section}{{\bf packet.cpp} }{\pageref{packet_8cpp}}{}
@@ -20,6 +26,8 @@ Here is a list of all files with brief descriptions:\begin{CompactList}
 \item\contentsline{section}{{\bf packet\-Source.h} }{\pageref{packetSource_8h}}{}
 \item\contentsline{section}{{\bf Practical\-Socket.cpp} }{\pageref{PracticalSocket_8cpp}}{}
 \item\contentsline{section}{{\bf Practical\-Socket.h} }{\pageref{PracticalSocket_8h}}{}
+\item\contentsline{section}{{\bf router.cpp} }{\pageref{router_8cpp}}{}
+\item\contentsline{section}{{\bf router.h} }{\pageref{router_8h}}{}
 \item\contentsline{section}{{\bf satp.py} }{\pageref{satp_8py}}{}
 \item\contentsline{section}{{\bf seq\-Window.cpp} }{\pageref{seqWindow_8cpp}}{}
 \item\contentsline{section}{{\bf seq\-Window.h} }{\pageref{seqWindow_8h}}{}
diff --git a/doc/latex/hierarchy.tex b/doc/latex/hierarchy.tex
index 478b060..92bfdcc 100644
--- a/doc/latex/hierarchy.tex
+++ b/doc/latex/hierarchy.tex
@@ -13,6 +13,8 @@ This inheritance list is sorted roughly, but not completely, alphabetically:\beg
 \end{CompactList}
 \end{CompactList}
 \item \contentsline{section}{Condition}{\pageref{classCondition}}{}
+\item \contentsline{section}{Connection\-List}{\pageref{classConnectionList}}{}
+\item \contentsline{section}{Connection\-Param}{\pageref{classConnectionParam}}{}
 \item \contentsline{section}{Cypher}{\pageref{classCypher}}{}
 \begin{CompactList}
 \item \contentsline{section}{Aes\-Icm\-Cypher}{\pageref{classAesIcmCypher}}{}
@@ -24,6 +26,7 @@ This inheritance list is sorted roughly, but not completely, alphabetically:\beg
 \item \contentsline{section}{Log::instance\-Cleaner}{\pageref{classLog_1_1instanceCleaner}}{}
 \item \contentsline{section}{Log\-String\-Builder}{\pageref{classLogStringBuilder}}{}
 \item \contentsline{section}{Mutex}{\pageref{classMutex}}{}
+\item \contentsline{section}{Network\-Address}{\pageref{classNetworkAddress}}{}
 \item \contentsline{section}{Options}{\pageref{classOptions}}{}
 \item \contentsline{section}{Packet::Header\-Struct}{\pageref{structPacket_1_1HeaderStruct}}{}
 \item \contentsline{section}{Packet\-Source}{\pageref{classPacketSource}}{}
@@ -31,6 +34,7 @@ This inheritance list is sorted roughly, but not completely, alphabetically:\beg
 \item \contentsline{section}{UDPPacket\-Source}{\pageref{classUDPPacketSource}}{}
 \end{CompactList}
 \item \contentsline{section}{Param}{\pageref{structParam}}{}
+\item \contentsline{section}{Router}{\pageref{classRouter}}{}
 \item \contentsline{section}{Semaphore}{\pageref{classSemaphore}}{}
 \item \contentsline{section}{Seq\-Window}{\pageref{classSeqWindow}}{}
 \item \contentsline{section}{Signal\-Controller}{\pageref{classSignalController}}{}
diff --git a/doc/latex/keyDerivation_8cpp.tex b/doc/latex/keyDerivation_8cpp.tex
index 64b16b3..8e886aa 100644
--- a/doc/latex/keyDerivation_8cpp.tex
+++ b/doc/latex/keyDerivation_8cpp.tex
@@ -1,5 +1,7 @@
 \section{key\-Derivation.cpp File Reference}
 \label{keyDerivation_8cpp}\index{keyDerivation.cpp@{keyDerivation.cpp}}
 {\tt \#include \char`\"{}key\-Derivation.h\char`\"{}}\par
+{\tt \#include $<$stdexcept$>$}\par
 {\tt \#include $<$iostream$>$}\par
-{\tt \#include $<$srtp/crypto\_\-kernel.h$>$}\par
+{\tt \#include $<$string$>$}\par
+{\tt \#include $<$gcrypt.h$>$}\par
diff --git a/doc/latex/keyDerivation_8h.tex b/doc/latex/keyDerivation_8h.tex
index 1dc84ca..2dc0705 100644
--- a/doc/latex/keyDerivation_8h.tex
+++ b/doc/latex/keyDerivation_8h.tex
@@ -2,8 +2,6 @@
 \label{keyDerivation_8h}\index{keyDerivation.h@{keyDerivation.h}}
 {\tt \#include \char`\"{}datatypes.h\char`\"{}}\par
 {\tt \#include \char`\"{}buffer.h\char`\"{}}\par
-{\tt \#include $<$string$>$}\par
-{\tt \#include $<$srtp/crypto\_\-kernel.h$>$}\par
 {\tt \#include $<$gcrypt.h$>$}\par
 \subsection*{Classes}
 \begin{CompactItemize}
@@ -18,11 +16,6 @@ enum {\bf satp\_\-prf\_\-label} \{ {\bf label\_\-satp\_\-encryption} =  0x00,
 {\bf label\_\-satp\_\-salt} =  0x02
  \}
 \end{CompactItemize}
-\subsection*{Variables}
-\begin{CompactItemize}
-\item 
-const std::string {\bf MIN\_\-GCRYPT\_\-VERSION} = \char`\"{}1.2.3\char`\"{}
-\end{CompactItemize}
 
 
 \subsection{Enumeration Type Documentation}
@@ -43,11 +36,3 @@ label\_\-satp\_\-salt\label{keyDerivation_8h_4829fcd87054af9b3ced79bbac1ce1eb78e
 }]\end{description}
 \end{Desc}
 
-
-
-\subsection{Variable Documentation}
-\index{keyDerivation.h@{key\-Derivation.h}!MIN_GCRYPT_VERSION@{MIN\_\-GCRYPT\_\-VERSION}}
-\index{MIN_GCRYPT_VERSION@{MIN\_\-GCRYPT\_\-VERSION}!keyDerivation.h@{key\-Derivation.h}}
-\subsubsection{\setlength{\rightskip}{0pt plus 5cm}const std::string {\bf MIN\_\-GCRYPT\_\-VERSION} = \char`\"{}1.2.3\char`\"{}}\label{keyDerivation_8h_6dcd6ca1447ccea53a7975c2a18f6a83}
-
-
diff --git a/doc/latex/options_8h.tex b/doc/latex/options_8h.tex
index df585d1..2e1adff 100644
--- a/doc/latex/options_8h.tex
+++ b/doc/latex/options_8h.tex
@@ -1,5 +1,6 @@
 \section{options.h File Reference}
 \label{options_8h}\index{options.h@{options.h}}
+{\tt \#include \char`\"{}datatypes.h\char`\"{}}\par
 {\tt \#include \char`\"{}thread\-Utils.hpp\char`\"{}}\par
 \subsection*{Classes}
 \begin{CompactItemize}
diff --git a/doc/latex/refman.tex b/doc/latex/refman.tex
index 4c186f1..1571b49 100644
--- a/doc/latex/refman.tex
+++ b/doc/latex/refman.tex
@@ -19,7 +19,7 @@
 \vspace*{1cm}
 {\large Generated by Doxygen 1.5.1}\\
 \vspace*{0.5cm}
-{\small Sun Oct 7 23:43:49 2007}\\
+{\small Tue Nov 27 14:11:51 2007}\\
 \end{center}
 \end{titlepage}
 \clearemptydoublepage
@@ -27,8 +27,6 @@
 \tableofcontents
 \clearemptydoublepage
 \pagenumbering{arabic}
-\chapter{anytun Main Page}
-\label{index}\input{main}
 \chapter{anytun Namespace Index}
 \input{namespaces}
 \chapter{anytun Hierarchical Index}
@@ -47,6 +45,8 @@
 \include{classBuffer}
 \include{classCommunicatingSocket}
 \include{classCondition}
+\include{classConnectionList}
+\include{classConnectionParam}
 \include{classCypher}
 \include{classHmacAuthAlgo}
 \include{classKeyDerivation}
@@ -55,6 +55,7 @@
 \include{classLog_1_1instanceCleaner}
 \include{classLogStringBuilder}
 \include{classMutex}
+\include{classNetworkAddress}
 \include{classNullAuthAlgo}
 \include{classNullCypher}
 \include{classOptions}
@@ -62,6 +63,7 @@
 \include{structPacket_1_1HeaderStruct}
 \include{classPacketSource}
 \include{structParam}
+\include{classRouter}
 \include{classsatp_1_1SATP}
 \include{classSemaphore}
 \include{classSeqWindow}
@@ -86,6 +88,10 @@
 \include{authAlgo_8h}
 \include{buffer_8cpp}
 \include{buffer_8h}
+\include{connectionList_8cpp}
+\include{connectionList_8h}
+\include{connectionParam_8cpp}
+\include{connectionParam_8h}
 \include{cypher_8cpp}
 \include{cypher_8h}
 \include{datatypes_8h}
@@ -93,6 +99,8 @@
 \include{keyDerivation_8h}
 \include{log_8cpp}
 \include{log_8h}
+\include{networkAddress_8cpp}
+\include{networkAddress_8h}
 \include{options_8cpp}
 \include{options_8h}
 \include{packet_8cpp}
@@ -101,6 +109,8 @@
 \include{packetSource_8h}
 \include{PracticalSocket_8cpp}
 \include{PracticalSocket_8h}
+\include{router_8cpp}
+\include{router_8h}
 \include{satp_8py}
 \include{seqWindow_8cpp}
 \include{seqWindow_8h}