After pull conflict resolution.

latex/annotated.tex

@@ -12,6 +12,7 @@ Here are the classes, structs, unions and interfaces with brief descriptions\+:\
 \item\contentsline{section}{\mbox{\hyperlink{classcore_1_1SessionFilter}{core\+::\+Session\+Filter}} }{\pageref{classcore_1_1SessionFilter}}{}
 \item\contentsline{section}{\mbox{\hyperlink{classcore_1_1Socket}{core\+::\+Socket}} }{\pageref{classcore_1_1Socket}}{}
 \item\contentsline{section}{\mbox{\hyperlink{classcore_1_1Subscription}{core\+::\+Subscription}} }{\pageref{classcore_1_1Subscription}}{}
+\item\contentsline{section}{\mbox{\hyperlink{classcore_1_1SubscriptionHandler}{core\+::\+Subscription\+Handler}} }{\pageref{classcore_1_1SubscriptionHandler}}{}
 \item\contentsline{section}{\mbox{\hyperlink{classcore_1_1SubscriptionManager}{core\+::\+Subscription\+Manager}} }{\pageref{classcore_1_1SubscriptionManager}}{}
 \item\contentsline{section}{\mbox{\hyperlink{classcore_1_1TCPServer}{core\+::\+TCPServer}} }{\pageref{classcore_1_1TCPServer}}{}
 \item\contentsline{section}{\mbox{\hyperlink{classcore_1_1TCPSession}{core\+::\+TCPSession}} }{\pageref{classcore_1_1TCPSession}}{}

latex/classcore_1_1Subscription.tex

@@ -2,7 +2,8 @@
 \label{classcore_1_1Subscription}\index{core::Subscription@{core::Subscription}}
 
 
-Collaboration diagram for core\+::Subscription\+:\nopagebreak
+Collaboration diagram for core\+::Subscription\+:
+\nopagebreak
 \begin{figure}[H]
 \begin{center}
 \leavevmode
@@ -15,8 +16,11 @@ Collaboration diagram for core\+::Subscription\+:\nopagebreak
 \mbox{\Hypertarget{classcore_1_1Subscription_a348a4ec8232ada37f5be2b6f756f01f3}\label{classcore_1_1Subscription_a348a4ec8232ada37f5be2b6f756f01f3}} 
 {\bfseries Subscription} (std\+::string id, std\+::string mode=\char`\"{}$\ast$AUTHOR\char`\"{})
 \item 
-\mbox{\Hypertarget{classcore_1_1Subscription_a75e36b110e87138d4f5d8f0cbbaca4c1}\label{classcore_1_1Subscription_a75e36b110e87138d4f5d8f0cbbaca4c1}} 
-{\bfseries Subscription} (std\+::string id, \mbox{\hyperlink{classcore_1_1TCPSession}{TCPSession}} \&session, std\+::string mode=\char`\"{}$\ast$AUTHOR\char`\"{})
+\mbox{\Hypertarget{classcore_1_1Subscription_a1b993509cd113d8ed564d710955c94a0}\label{classcore_1_1Subscription_a1b993509cd113d8ed564d710955c94a0}} 
+{\bfseries Subscription} (std\+::string id, \mbox{\hyperlink{classcore_1_1TCPSession}{TCPSession}} \&session, std\+::string mode)
+\item 
+\mbox{\Hypertarget{classcore_1_1Subscription_ae21b7a4a1084da8959cd8022fa138c0e}\label{classcore_1_1Subscription_ae21b7a4a1084da8959cd8022fa138c0e}} 
+{\bfseries Subscription} (std\+::string id, \mbox{\hyperlink{classcore_1_1TCPSession}{TCPSession}} \&session, std\+::string mode, \mbox{\hyperlink{classcore_1_1SubscriptionHandler}{Subscription\+Handler}} $\ast$handler)
 \item 
 \mbox{\Hypertarget{classcore_1_1Subscription_a57c23d7c49328eecf8358f84b485f7cb}\label{classcore_1_1Subscription_a57c23d7c49328eecf8358f84b485f7cb}} 
 int {\bfseries subscribe} (\mbox{\hyperlink{classcore_1_1TCPSession}{TCPSession}} \&session)
@@ -48,6 +52,9 @@ std\+::string {\bfseries mode}
 \mbox{\Hypertarget{classcore_1_1Subscription_a5526427600aa4a5b180f76f201e85f58}\label{classcore_1_1Subscription_a5526427600aa4a5b180f76f201e85f58}} 
 \mbox{\hyperlink{classcore_1_1TCPSession}{TCPSession}} $\ast$ {\bfseries owner}
 \item 
+\mbox{\Hypertarget{classcore_1_1Subscription_ab4f020e6bdee846121f508fcdb6f7aeb}\label{classcore_1_1Subscription_ab4f020e6bdee846121f508fcdb6f7aeb}} 
+\mbox{\hyperlink{classcore_1_1SubscriptionHandler}{Subscription\+Handler}} $\ast$ {\bfseries handler}
+\item 
 \mbox{\Hypertarget{classcore_1_1Subscription_ad1a5c1a3e5a6e253eb34795f43d4f9be}\label{classcore_1_1Subscription_ad1a5c1a3e5a6e253eb34795f43d4f9be}} 
 std\+::vector$<$ \mbox{\hyperlink{classcore_1_1TCPSession}{TCPSession}} $\ast$ $>$ {\bfseries subscribers}
 \end{DoxyCompactItemize}

latex/classcore_1_1SubscriptionHandler.tex

@@ -0,0 +1,16 @@
+\hypertarget{classcore_1_1SubscriptionHandler}{}\doxysection{core\+::Subscription\+Handler Class Reference}
+\label{classcore_1_1SubscriptionHandler}\index{core::SubscriptionHandler@{core::SubscriptionHandler}}
+\doxysubsection*{Public Member Functions}
+\begin{DoxyCompactItemize}
+\item 
+\mbox{\Hypertarget{classcore_1_1SubscriptionHandler_a652ee5183fda91877b274617d585a28b}\label{classcore_1_1SubscriptionHandler_a652ee5183fda91877b274617d585a28b}} 
+virtual int {\bfseries process} (coreutils\+::\+ZString \&request, std\+::stringstream \&out, \mbox{\hyperlink{classcore_1_1TCPSession}{TCPSession}} \&session)
+\item 
+\mbox{\Hypertarget{classcore_1_1SubscriptionHandler_ac969757e0ea9552e505eb483ea30a8a0}\label{classcore_1_1SubscriptionHandler_ac969757e0ea9552e505eb483ea30a8a0}} 
+virtual int {\bfseries on\+Subscribe} (\mbox{\hyperlink{classcore_1_1TCPSession}{TCPSession}} \&session)
+\end{DoxyCompactItemize}
+
+
+The documentation for this class was generated from the following file\+:\begin{DoxyCompactItemize}
+\item 
+Subscription\+Handler.\+h\end{DoxyCompactItemize}

latex/classcore_1_1SubscriptionManager.tex

@@ -24,6 +24,9 @@ Collaboration diagram for core\+::Subscription\+Manager\+:\nopagebreak
 \mbox{\Hypertarget{classcore_1_1SubscriptionManager_ad1a021be5d55d1e9f0944c97f79ae9e2}\label{classcore_1_1SubscriptionManager_ad1a021be5d55d1e9f0944c97f79ae9e2}} 
 int {\bfseries add} (\mbox{\hyperlink{classcore_1_1Subscription}{Subscription}} \&subscription)
 \item 
+\mbox{\Hypertarget{classcore_1_1SubscriptionManager_af5a8acc8762c035e90e18c61574fb798}\label{classcore_1_1SubscriptionManager_af5a8acc8762c035e90e18c61574fb798}} 
+int {\bfseries add\+Handler} (std\+::string name, \mbox{\hyperlink{classcore_1_1SubscriptionHandler}{Subscription\+Handler}} $\ast$handler)
+\item 
 \mbox{\Hypertarget{classcore_1_1SubscriptionManager_aed407c183c390f4459bb6527b30c8198}\label{classcore_1_1SubscriptionManager_aed407c183c390f4459bb6527b30c8198}} 
 int {\bfseries remove\+Session\+Subscriptions} (\mbox{\hyperlink{classcore_1_1TCPSession}{TCPSession}} \&session)
 \item 

latex/classcore_1_1Subscription__coll__graph.md5

@@ -1 +1 @@
-2729f4733c58f8e25137c8d4e188b60b
+5d837105a904709e1aad4a643144222e

latex/hierarchy.tex

@@ -45,5 +45,6 @@ This inheritance list is sorted roughly, but not completely, alphabetically\+:\b
 \end{DoxyCompactList}
 \end{DoxyCompactList}
 \item \contentsline{section}{core\+::Subscription}{\pageref{classcore_1_1Subscription}}{}
+\item \contentsline{section}{core\+::Subscription\+Handler}{\pageref{classcore_1_1SubscriptionHandler}}{}
 \item \contentsline{section}{core\+::Thread\+Scope}{\pageref{classcore_1_1ThreadScope}}{}
 \end{DoxyCompactList}

latex/refman.tex

@@ -188,6 +188,7 @@
 \input{classcore_1_1SessionFilter}
 \input{classcore_1_1Socket}
 \input{classcore_1_1Subscription}
+\input{classcore_1_1SubscriptionHandler}
 \input{classcore_1_1SubscriptionManager}
 \input{classcore_1_1TCPServer}
 \input{classcore_1_1TCPSession}