diff options
| author | neodarz <neodarz@neodarz.net> | 2018-08-11 20:21:34 +0200 |
|---|---|---|
| committer | neodarz <neodarz@neodarz.net> | 2018-08-11 20:21:34 +0200 |
| commit | 0ea5fc66924303d1bf73ba283a383e2aadee02f2 (patch) | |
| tree | 2568e71a7ccc44ec23b8bb3f0ff97fb6bf2ed709 /cvs/cvsweb.cgi/code/nelns/admin_service/admin_service.cpp.diff?r1=1.5&r2=1.6 | |
| download | nevrax-website-self-hostable-0ea5fc66924303d1bf73ba283a383e2aadee02f2.tar.xz nevrax-website-self-hostable-0ea5fc66924303d1bf73ba283a383e2aadee02f2.zip | |
Initial commit
Diffstat (limited to 'cvs/cvsweb.cgi/code/nelns/admin_service/admin_service.cpp.diff?r1=1.5&r2=1.6')
| -rw-r--r-- | cvs/cvsweb.cgi/code/nelns/admin_service/admin_service.cpp.diff?r1=1.5&r2=1.6 | 379 |
1 files changed, 379 insertions, 0 deletions
diff --git a/cvs/cvsweb.cgi/code/nelns/admin_service/admin_service.cpp.diff?r1=1.5&r2=1.6 b/cvs/cvsweb.cgi/code/nelns/admin_service/admin_service.cpp.diff?r1=1.5&r2=1.6 new file mode 100644 index 00000000..733a57bc --- /dev/null +++ b/cvs/cvsweb.cgi/code/nelns/admin_service/admin_service.cpp.diff?r1=1.5&r2=1.6 @@ -0,0 +1,379 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"><HTML> +<HEAD><style> A { color:black }</style> +<!-- hennerik CVSweb $Revision: 1.93 $ --> +<TITLE>code/nelns/admin_service/admin_service.cpp - diff - 1.6</TITLE></HEAD> +<BODY BGCOLOR="#eeeeee"> +<table width="100%" border=0 cellspacing=0 cellpadding=1 bgcolor="#aaaaaa"><tr valign=bottom><td><a href="/cvs/cvsweb.cgi/code/nelns/admin_service/admin_service.cpp"><IMG SRC="http://www.nevrax.org/inc/img/picto-up.gif" ALT="[BACK]" BORDER="0" WIDTH="14" HEIGHT="13"></a> <b>Return to <A HREF="/cvs/cvsweb.cgi/code/nelns/admin_service/admin_service.cpp">admin_service.cpp</A> + CVS log</b> <IMG SRC="http://www.nevrax.org/inc/img/picto-news.gif" ALT="[TXT]" BORDER="0" WIDTH="13" HEIGHT="15"></td><td align=right><IMG SRC="http://www.nevrax.org/inc/img/picto-dir.gif" ALT="[DIR]" BORDER="0" WIDTH="15" HEIGHT="13"> <b>Up to <a href="/cvs/cvsweb.cgi/">Nevrax</a> / <a href="/cvs/cvsweb.cgi/code/">code</a> / <a href="/cvs/cvsweb.cgi/code/nelns/">nelns</a> / <a href="/cvs/cvsweb.cgi/code/nelns/admin_service/">admin_service</a></b></td></tr></table><h3 align=center>Diff for /code/nelns/admin_service/admin_service.cpp between version 1.5 and 1.6</h3> +<table border=0 cellspacing=0 cellpadding=0 width="100%"> +<tr bgcolor="#ffffff"> +<th width="50%" valign=TOP>version 1.5, 2001/05/31 16:44:54</th> +<th width="50%" valign=TOP>version 1.6, 2001/06/07 16:19:05</th> +<tr bgcolor="#dddddd"><td width="50%"><table width="100%" border=1 cellpadding=5><tr><td><b>Line 51</b> <font size=-1></font></td></tr></table></td><td width="50%"><table width="100%" border=1 cellpadding=5><tr><td><b>Line 51</b> <font size=-1></font></td></tr></table></td> +<tr><td><font face="Helvetica,Arial" size="-1"> bool Ready; /// true if the service is ready</font></td><td><font face="Helvetica,Arial" size="-1"> bool Ready; /// true if the service is ready</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> bool Connected; /// true if the service is connected to the AES</font></td><td><font face="Helvetica,Arial" size="-1"> bool Connected; /// true if the service is connected to the AES</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> bool InConfig; /// true if the service is in the configuration</font></td><td><font face="Helvetica,Arial" size="-1"> bool InConfig; /// true if the service is in the configuration</font></td></tr> +<tr><td bgcolor="#cccccc"> </td><td bgcolor="#ccccff"><font face="Helvetica,Arial" size="-1"> vector<string> Commands;</font></td></tr> +<tr><td bgcolor="#cccccc"> </td><td bgcolor="#ccccff"><font face="Helvetica,Arial" size="-1"> </font></td></tr> +<tr><td bgcolor="#cccccc"> </td><td bgcolor="#ccccff"><font face="Helvetica,Arial" size="-1"> void setValues (const CService &t)</font></td></tr> +<tr><td bgcolor="#cccccc"> </td><td bgcolor="#ccccff"><font face="Helvetica,Arial" size="-1"> {</font></td></tr> +<tr><td bgcolor="#cccccc"> </td><td bgcolor="#ccccff"><font face="Helvetica,Arial" size="-1"> // copy all except gtk stuffs</font></td></tr> +<tr><td bgcolor="#cccccc"> </td><td bgcolor="#ccccff"><font face="Helvetica,Arial" size="-1"> Id = t.Id;</font></td></tr> +<tr><td bgcolor="#cccccc"> </td><td bgcolor="#ccccff"><font face="Helvetica,Arial" size="-1"> AliasName = t.AliasName;</font></td></tr> +<tr><td bgcolor="#cccccc"> </td><td bgcolor="#ccccff"><font face="Helvetica,Arial" size="-1"> ShortName = t.ShortName;</font></td></tr> +<tr><td bgcolor="#cccccc"> </td><td bgcolor="#ccccff"><font face="Helvetica,Arial" size="-1"> LongName = t.LongName;</font></td></tr> +<tr><td bgcolor="#cccccc"> </td><td bgcolor="#ccccff"><font face="Helvetica,Arial" size="-1"> Ready = t.Ready;</font></td></tr> +<tr><td bgcolor="#cccccc"> </td><td bgcolor="#ccccff"><font face="Helvetica,Arial" size="-1"> Connected = t.Connected;</font></td></tr> +<tr><td bgcolor="#cccccc"> </td><td bgcolor="#ccccff"><font face="Helvetica,Arial" size="-1"> //InConfig = t.InConfig; never change the inconfig value</font></td></tr> +<tr><td bgcolor="#cccccc"> </td><td bgcolor="#ccccff"><font face="Helvetica,Arial" size="-1"> }</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> };</font></td><td><font face="Helvetica,Arial" size="-1"> };</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> </font></td><td><font face="Helvetica,Arial" size="-1"> </font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> typedef list<CService> TServices;</font></td><td><font face="Helvetica,Arial" size="-1"> typedef list<CService> TServices;</font></td></tr> +<tr bgcolor="#dddddd"><td width="50%"><table width="100%" border=1 cellpadding=5><tr><td><b>Line 136</b> <font size=-1></font></td></tr></table></td><td width="50%"><table width="100%" border=1 cellpadding=5><tr><td><b>Line 149</b> <font size=-1></font></td></tr></table></td> +<tr><td><font face="Helvetica,Arial" size="-1"> {</font></td><td><font face="Helvetica,Arial" size="-1"> {</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> for (AESIT aesit = AdminExecutorServices.begin(); aesit != AdminExecutorServices.end(); aesit++)</font></td><td><font face="Helvetica,Arial" size="-1"> for (AESIT aesit = AdminExecutorServices.begin(); aesit != AdminExecutorServices.end(); aesit++)</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> {</font></td><td><font face="Helvetica,Arial" size="-1"> {</font></td></tr> +<tr><td bgcolor="#cccccc"> </td><td bgcolor="#ccccff"><font face="Helvetica,Arial" size="-1"> nlinfo ("> Admin");</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> for (SIT sit = (*aesit).Services.begin(); sit != (*aesit).Services.end(); sit++)</font></td><td><font face="Helvetica,Arial" size="-1"> for (SIT sit = (*aesit).Services.begin(); sit != (*aesit).Services.end(); sit++)</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> {</font></td><td><font face="Helvetica,Arial" size="-1"> {</font></td></tr> +<tr><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> nlinfo ("> %s %s %s %d %d", (*aesit).SockId->asString().c_str(), (*sit).ShortName.c_str(), (*sit).LongName.c_str(), (*aesit).Id, (*sit).Id);</font></td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> nlinfo (" > '%s' '%s' '%s' '%s' %d %d", (*aesit).SockId->asString().c_str(), (*sit).AliasName.c_str(), (*sit).ShortName.c_str(), (*sit).LongName.c_str(), (*aesit).Id, (*sit).Id);</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> }</font></td><td><font face="Helvetica,Arial" size="-1"> }</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> }</font></td><td><font face="Helvetica,Arial" size="-1"> }</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> }</font></td><td><font face="Helvetica,Arial" size="-1"> }</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> </font></td><td><font face="Helvetica,Arial" size="-1"> </font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> </font></td><td><font face="Helvetica,Arial" size="-1"> </font></td></tr> +<tr><td bgcolor="#cccccc"> </td><td bgcolor="#ccccff"><font face="Helvetica,Arial" size="-1"> // send a message to a client. if ok is 0 it s an error or it s a normal </font></td></tr> +<tr><td bgcolor="#cccccc"> </td><td bgcolor="#ccccff"><font face="Helvetica,Arial" size="-1"> void messageToClient (uint8 ok, string msg, TSockId from = NULL)</font></td></tr> +<tr><td bgcolor="#cccccc"> </td><td bgcolor="#ccccff"><font face="Helvetica,Arial" size="-1"> {</font></td></tr> +<tr><td bgcolor="#cccccc"> </td><td bgcolor="#ccccff"><font face="Helvetica,Arial" size="-1"> CMessage msgout (CNetManager::getSIDA ("AS"), "MESSAGE");</font></td></tr> +<tr><td bgcolor="#cccccc"> </td><td bgcolor="#ccccff"><font face="Helvetica,Arial" size="-1"> msgout.serial (ok, msg);</font></td></tr> +<tr><td bgcolor="#cccccc"> </td><td bgcolor="#ccccff"><font face="Helvetica,Arial" size="-1"> CNetManager::send ("AS", msgout, from);</font></td></tr> +<tr><td bgcolor="#cccccc"> </td><td bgcolor="#ccccff"><font face="Helvetica,Arial" size="-1"> }</font></td></tr> +<tr><td bgcolor="#cccccc"> </td><td bgcolor="#ccccff"><font face="Helvetica,Arial" size="-1"> </font></td></tr> +<tr><td bgcolor="#cccccc"> </td><td bgcolor="#ccccff"><font face="Helvetica,Arial" size="-1"> </font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> ////////////////////////////////////////////////////////////////////////////////////////////////////////</font></td><td><font face="Helvetica,Arial" size="-1"> ////////////////////////////////////////////////////////////////////////////////////////////////////////</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> ////////////////////////////////////////////////////////////////////////////////////////////////////////</font></td><td><font face="Helvetica,Arial" size="-1"> ////////////////////////////////////////////////////////////////////////////////////////////////////////</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> /////////////////// SCRIPT MANAGER /////////////////////////////////////////////////////////////////////</font></td><td><font face="Helvetica,Arial" size="-1"> /////////////////// SCRIPT MANAGER /////////////////////////////////////////////////////////////////////</font></td></tr> +<tr bgcolor="#dddddd"><td width="50%"><table width="100%" border=1 cellpadding=5><tr><td><b>Line 167</b> <font size=-1></font></td></tr></table></td><td width="50%"><table width="100%" border=1 cellpadding=5><tr><td><b>Line 190</b> <font size=-1></font></td></tr></table></td> +<tr><td><font face="Helvetica,Arial" size="-1"> if (StartAllServicesPos*2 >= (uint32)script.size())</font></td><td><font face="Helvetica,Arial" size="-1"> if (StartAllServicesPos*2 >= (uint32)script.size())</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> {</font></td><td><font face="Helvetica,Arial" size="-1"> {</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> StartAllServices = false;</font></td><td><font face="Helvetica,Arial" size="-1"> StartAllServices = false;</font></td></tr> +<tr><td bgcolor="#cccccc"> </td><td bgcolor="#ccccff"><font face="Helvetica,Arial" size="-1"> </font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> nlinfo("end of the script");</font></td><td><font face="Helvetica,Arial" size="-1"> nlinfo("end of the script");</font></td></tr> +<tr><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> // todo send that the script is finish to the admin</font></td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> messageToClient (1, "Start All Service finnished correctly");</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> return;</font></td><td><font face="Helvetica,Arial" size="-1"> return;</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> }</font></td><td><font face="Helvetica,Arial" size="-1"> }</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> </font></td><td><font face="Helvetica,Arial" size="-1"> </font></td></tr> +<tr bgcolor="#dddddd"><td width="50%"><table width="100%" border=1 cellpadding=5><tr><td><b>Line 184</b> <font size=-1></font></td></tr></table></td><td width="50%"><table width="100%" border=1 cellpadding=5><tr><td><b>Line 208</b> <font size=-1></font></td></tr></table></td> +<tr><td><font face="Helvetica,Arial" size="-1"> }</font></td><td><font face="Helvetica,Arial" size="-1"> }</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> catch(EBadSize &)</font></td><td><font face="Helvetica,Arial" size="-1"> catch(EBadSize &)</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> {</font></td><td><font face="Helvetica,Arial" size="-1"> {</font></td></tr> +<tr><td bgcolor="#cccccc"> </td><td bgcolor="#ccccff"><font face="Helvetica,Arial" size="-1"> messageToClient (1, "'Services' variable does not contains a good number of entries (must be a multiple of 2)");</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> nlwarning ("'Services' variable does not contains a good number of entries (must be a multiple of 2)");</font></td><td><font face="Helvetica,Arial" size="-1"> nlwarning ("'Services' variable does not contains a good number of entries (must be a multiple of 2)");</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> StartAllServices = false;</font></td><td><font face="Helvetica,Arial" size="-1"> StartAllServices = false;</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> return;</font></td><td><font face="Helvetica,Arial" size="-1"> return;</font></td></tr> +<tr bgcolor="#dddddd"><td width="50%"><table width="100%" border=1 cellpadding=5><tr><td><b>Line 192</b> <font size=-1></font></td></tr></table></td><td width="50%"><table width="100%" border=1 cellpadding=5><tr><td><b>Line 217</b> <font size=-1></font></td></tr></table></td> +<tr><td><font face="Helvetica,Arial" size="-1"> AESIT aesit = findAdminExecutorService (serverAlias, false);</font></td><td><font face="Helvetica,Arial" size="-1"> AESIT aesit = findAdminExecutorService (serverAlias, false);</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> if (aesit == AdminExecutorServices.end())</font></td><td><font face="Helvetica,Arial" size="-1"> if (aesit == AdminExecutorServices.end())</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> {</font></td><td><font face="Helvetica,Arial" size="-1"> {</font></td></tr> +<tr><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> StartAllServices = false;</font></td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> messageToClient (1, "don't find the server");</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> nlwarning("don't find the server");</font></td><td><font face="Helvetica,Arial" size="-1"> nlwarning("don't find the server");</font></td></tr> +<tr><td bgcolor="#cccccc"> </td><td bgcolor="#ccccff"><font face="Helvetica,Arial" size="-1"> StartAllServices = false;</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> return;</font></td><td><font face="Helvetica,Arial" size="-1"> return;</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> }</font></td><td><font face="Helvetica,Arial" size="-1"> }</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> </font></td><td><font face="Helvetica,Arial" size="-1"> </font></td></tr> +<tr bgcolor="#dddddd"><td width="50%"><table width="100%" border=1 cellpadding=5><tr><td><b>Line 218</b> <font size=-1></font></td></tr></table></td><td width="50%"><table width="100%" border=1 cellpadding=5><tr><td><b>Line 244</b> <font size=-1></font></td></tr></table></td> +<tr><td><font face="Helvetica,Arial" size="-1"> }</font></td><td><font face="Helvetica,Arial" size="-1"> }</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> catch(EUnknownVar&)</font></td><td><font face="Helvetica,Arial" size="-1"> catch(EUnknownVar&)</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> {</font></td><td><font face="Helvetica,Arial" size="-1"> {</font></td></tr> +<tr><td bgcolor="#cccccc"> </td><td bgcolor="#ccccff"><font face="Helvetica,Arial" size="-1"> messageToClient (1, "'Services' variable is not found");</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> nlwarning ("'Services' variable is not found");</font></td><td><font face="Helvetica,Arial" size="-1"> nlwarning ("'Services' variable is not found");</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> StartAllServices = false;</font></td><td><font face="Helvetica,Arial" size="-1"> StartAllServices = false;</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> return;</font></td><td><font face="Helvetica,Arial" size="-1"> return;</font></td></tr> +<tr bgcolor="#dddddd"><td width="50%"><table width="100%" border=1 cellpadding=5><tr><td><b>Line 228</b> <font size=-1></font></td></tr></table></td><td width="50%"><table width="100%" border=1 cellpadding=5><tr><td><b>Line 255</b> <font size=-1></font></td></tr></table></td> +<tr><td><font face="Helvetica,Arial" size="-1"> {</font></td><td><font face="Helvetica,Arial" size="-1"> {</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> if (StartAllServices)</font></td><td><font face="Helvetica,Arial" size="-1"> if (StartAllServices)</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> {</font></td><td><font face="Helvetica,Arial" size="-1"> {</font></td></tr> +<tr><td bgcolor="#cccccc"> </td><td bgcolor="#ccccff"><font face="Helvetica,Arial" size="-1"> messageToClient (1, "already running a script, reset it");</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> nlwarning("already running a script, reset it");</font></td><td><font face="Helvetica,Arial" size="-1"> nlwarning("already running a script, reset it");</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> StartAllServices = false;</font></td><td><font face="Helvetica,Arial" size="-1"> StartAllServices = false;</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> }</font></td><td><font face="Helvetica,Arial" size="-1"> }</font></td></tr> +<tr bgcolor="#dddddd"><td width="50%"><table width="100%" border=1 cellpadding=5><tr><td><b>Line 242</b> <font size=-1></font></td></tr></table></td><td width="50%"><table width="100%" border=1 cellpadding=5><tr><td><b>Line 270</b> <font size=-1></font></td></tr></table></td> +<tr><td><font face="Helvetica,Arial" size="-1"> AESIT aesit = findAdminExecutorService (serverAlias, false);</font></td><td><font face="Helvetica,Arial" size="-1"> AESIT aesit = findAdminExecutorService (serverAlias, false);</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> if (aesit == AdminExecutorServices.end())</font></td><td><font face="Helvetica,Arial" size="-1"> if (aesit == AdminExecutorServices.end())</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> {</font></td><td><font face="Helvetica,Arial" size="-1"> {</font></td></tr> +<tr><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> nlwarning("aes '%s' not running, can't run the script", serverAlias.c_str());</font></td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> messageToClient (1, "an aes is not running, can't run the script");</font></td></tr> +<tr><td bgcolor="#99cc99"> </td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> nlwarning("aes '%s' isn't running, can't run the script", serverAlias.c_str());</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> return;</font></td><td><font face="Helvetica,Arial" size="-1"> return;</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> }</font></td><td><font face="Helvetica,Arial" size="-1"> }</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> }</font></td><td><font face="Helvetica,Arial" size="-1"> }</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> }</font></td><td><font face="Helvetica,Arial" size="-1"> }</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> catch(EConfigFile &)</font></td><td><font face="Helvetica,Arial" size="-1"> catch(EConfigFile &)</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> {</font></td><td><font face="Helvetica,Arial" size="-1"> {</font></td></tr> +<tr><td bgcolor="#cccccc"> </td><td bgcolor="#ccccff"><font face="Helvetica,Arial" size="-1"> messageToClient (1, "bad config file");</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> nlwarning ("bad config file");</font></td><td><font face="Helvetica,Arial" size="-1"> nlwarning ("bad config file");</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> return;</font></td><td><font face="Helvetica,Arial" size="-1"> return;</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> }</font></td><td><font face="Helvetica,Arial" size="-1"> }</font></td></tr> +<tr bgcolor="#dddddd"><td width="50%"><table width="100%" border=1 cellpadding=5><tr><td><b>Line 280</b> <font size=-1></font></td></tr></table></td><td width="50%"><table width="100%" border=1 cellpadding=5><tr><td><b>Line 310</b> <font size=-1></font></td></tr></table></td> +<tr><td><font face="Helvetica,Arial" size="-1"> nlinfo("end of command result");</font></td><td><font face="Helvetica,Arial" size="-1"> nlinfo("end of command result");</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> }</font></td><td><font face="Helvetica,Arial" size="-1"> }</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> </font></td><td><font face="Helvetica,Arial" size="-1"> </font></td></tr> +<tr><td bgcolor="#cccccc"> </td><td bgcolor="#ccccff"><font face="Helvetica,Arial" size="-1"> // get the service list from the admin exec and send the list to all admin client</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> static void cbServiceList (CMessage& msgin, TSockId from, CCallbackNetBase &netbase)</font></td><td><font face="Helvetica,Arial" size="-1"> static void cbServiceList (CMessage& msgin, TSockId from, CCallbackNetBase &netbase)</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> {</font></td><td><font face="Helvetica,Arial" size="-1"> {</font></td></tr> +<tr><td bgcolor="#ff9999"><font face="Helvetica,Arial" size="-1"> /* // get the service list from the admin exec and send the list to all admin client</font></td><td bgcolor="#cccccc"> </td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> CAdminExecutorService *aes = (CAdminExecutorService*) from->appId();</font></td><td><font face="Helvetica,Arial" size="-1"> CAdminExecutorService *aes = (CAdminExecutorService*) from->appId();</font></td></tr> +<tr><td bgcolor="#ff9999"><font face="Helvetica,Arial" size="-1"> aes->Services.clear();</font></td><td bgcolor="#cccccc"> </td></tr> +<tr><td bgcolor="#ff9999"><font face="Helvetica,Arial" size="-1"> </font></td><td bgcolor="#cccccc"> </td></tr> +<tr><td bgcolor="#ff9999"><font face="Helvetica,Arial" size="-1"> CMessage msgout (CNetManager::getSIDA ("AS"), "SL");</font></td><td bgcolor="#cccccc"> </td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> </font></td><td><font face="Helvetica,Arial" size="-1"> </font></td></tr> +<tr><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> uint32 nbaes = 1;</font></td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> //</font></td></tr> +<tr><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> msgout.serial (nbaes);</font></td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> // Get the list of service from aes</font></td></tr> +<tr><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> msgout.serial (aes->Id);</font></td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> //</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> </font></td><td><font face="Helvetica,Arial" size="-1"> </font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> uint32 nbs;</font></td><td><font face="Helvetica,Arial" size="-1"> uint32 nbs;</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> msgin.serial (nbs);</font></td><td><font face="Helvetica,Arial" size="-1"> msgin.serial (nbs);</font></td></tr> +<tr><td bgcolor="#ff9999"><font face="Helvetica,Arial" size="-1"> msgout.serial (nbs);</font></td><td bgcolor="#cccccc"> </td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> </font></td><td><font face="Helvetica,Arial" size="-1"> </font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> for (uint32 i = 0; i < nbs; i++)</font></td><td><font face="Helvetica,Arial" size="-1"> for (uint32 i = 0; i < nbs; i++)</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> {</font></td><td><font face="Helvetica,Arial" size="-1"> {</font></td></tr> +<tr><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> uint32 sid;</font></td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> // find the service</font></td></tr> +<tr><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> msgin.serial(sid);</font></td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> CService s;</font></td></tr> +<tr><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> </font></td><td bgcolor="#99cc99"> </td></tr> +<tr><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> aes->Services.push_back (CService(sid));</font></td><td bgcolor="#99cc99"> </td></tr> +<tr><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> CService *s = &(aes->Services.back());</font></td><td bgcolor="#99cc99"> </td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> </font></td><td><font face="Helvetica,Arial" size="-1"> </font></td></tr> +<tr><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> msgin.serial(s->ShortName, s->LongName, s->Ready);</font></td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> msgin.serial (s.Id, s.AliasName, s.ShortName, s.LongName, s.Ready);</font></td></tr> +<tr><td bgcolor="#99cc99"> </td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> msgin.serialCont (s.Commands);</font></td></tr> +<tr><td bgcolor="#99cc99"> </td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> s.Connected = true;</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> </font></td><td><font face="Helvetica,Arial" size="-1"> </font></td></tr> +<tr><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> msgout.serial (s->Id, s->ShortName, s->LongName, s->Ready);</font></td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> if (!s.AliasName.empty())</font></td></tr> +<tr><td bgcolor="#99cc99"> </td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> {</font></td></tr> +<tr><td bgcolor="#99cc99"> </td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> SIT sit = aes->findService (s.AliasName, false);</font></td></tr> +<tr><td bgcolor="#99cc99"> </td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> if (sit == aes->Services.end ())</font></td></tr> +<tr><td bgcolor="#99cc99"> </td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> {</font></td></tr> +<tr><td bgcolor="#99cc99"> </td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> aes->Services.push_back (s);</font></td></tr> +<tr><td bgcolor="#99cc99"> </td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> }</font></td></tr> +<tr><td bgcolor="#99cc99"> </td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> else</font></td></tr> +<tr><td bgcolor="#99cc99"> </td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> {</font></td></tr> +<tr><td bgcolor="#99cc99"> </td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> nlassert ("the service already exists with alias, update it");</font></td></tr> +<tr><td bgcolor="#99cc99"> </td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> (*sit).setValues (s);</font></td></tr> +<tr><td bgcolor="#99cc99"> </td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> }</font></td></tr> +<tr><td bgcolor="#99cc99"> </td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> }</font></td></tr> +<tr><td bgcolor="#99cc99"> </td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> else</font></td></tr> +<tr><td bgcolor="#99cc99"> </td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> {</font></td></tr> +<tr><td bgcolor="#99cc99"> </td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> SIT sit = aes->findService (s.Id, false);</font></td></tr> +<tr><td bgcolor="#99cc99"> </td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> if (sit == aes->Services.end ())</font></td></tr> +<tr><td bgcolor="#99cc99"> </td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> {</font></td></tr> +<tr><td bgcolor="#99cc99"> </td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> aes->Services.push_back (s);</font></td></tr> +<tr><td bgcolor="#99cc99"> </td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> }</font></td></tr> +<tr><td bgcolor="#99cc99"> </td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> else</font></td></tr> +<tr><td bgcolor="#99cc99"> </td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> {</font></td></tr> +<tr><td bgcolor="#99cc99"> </td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> nlassert ("the service already exists with id, update it");</font></td></tr> +<tr><td bgcolor="#99cc99"> </td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> (*sit).setValues (s);</font></td></tr> +<tr><td bgcolor="#99cc99"> </td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> }</font></td></tr> +<tr><td bgcolor="#99cc99"> </td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> }</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> }</font></td><td><font face="Helvetica,Arial" size="-1"> }</font></td></tr> +<tr><td bgcolor="#ff9999"><font face="Helvetica,Arial" size="-1"> CNetManager::send ("AS", msgout, 0);</font></td><td bgcolor="#cccccc"> </td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> </font></td><td><font face="Helvetica,Arial" size="-1"> </font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> displayServices ();</font></td><td><font face="Helvetica,Arial" size="-1"> displayServices ();</font></td></tr> +<tr><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> */}</font></td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> </font></td></tr> +<tr><td bgcolor="#99cc99"> </td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> //</font></td></tr> +<tr><td bgcolor="#99cc99"> </td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> // Send the new list to all admin</font></td></tr> +<tr><td bgcolor="#99cc99"> </td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> //</font></td></tr> +<tr><td bgcolor="#99cc99"> </td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> </font></td></tr> +<tr><td bgcolor="#99cc99"> </td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> CMessage msgout (CNetManager::getSIDA ("AS"), "SERVICE_LIST");</font></td></tr> +<tr><td bgcolor="#99cc99"> </td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> uint32 nbaes = 1;</font></td></tr> +<tr><td bgcolor="#99cc99"> </td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> msgout.serial (nbaes);</font></td></tr> +<tr><td bgcolor="#99cc99"> </td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> msgout.serial (aes->Id);</font></td></tr> +<tr><td bgcolor="#99cc99"> </td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> uint32 ss = aes->Services.size();</font></td></tr> +<tr><td bgcolor="#99cc99"> </td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> msgout.serial (ss);</font></td></tr> +<tr><td bgcolor="#99cc99"> </td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> </font></td></tr> +<tr><td bgcolor="#99cc99"> </td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> for (SIT sit = aes->Services.begin(); sit != aes->Services.end(); sit++)</font></td></tr> +<tr><td bgcolor="#99cc99"> </td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> {</font></td></tr> +<tr><td bgcolor="#99cc99"> </td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> msgout.serial ((*sit).Id, (*sit).AliasName, (*sit).ShortName, (*sit).LongName);</font></td></tr> +<tr><td bgcolor="#99cc99"> </td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> msgout.serial ((*sit).Ready, (*sit).Connected, (*sit).InConfig);</font></td></tr> +<tr><td bgcolor="#99cc99"> </td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> msgout.serialCont ((*sit).Commands);</font></td></tr> +<tr><td bgcolor="#99cc99"> </td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> }</font></td></tr> +<tr><td bgcolor="#99cc99"> </td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> CNetManager::send ("AS", msgout, 0);</font></td></tr> +<tr><td bgcolor="#99cc99"> </td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> }</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> </font></td><td><font face="Helvetica,Arial" size="-1"> </font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> static void cbServiceAliasList (CMessage& msgin, TSockId from, CCallbackNetBase &netbase)</font></td><td><font face="Helvetica,Arial" size="-1"> static void cbServiceAliasList (CMessage& msgin, TSockId from, CCallbackNetBase &netbase)</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> {</font></td><td><font face="Helvetica,Arial" size="-1"> {</font></td></tr> +<tr bgcolor="#dddddd"><td width="50%"><table width="100%" border=1 cellpadding=5><tr><td><b>Line 321</b> <font size=-1></font></td></tr></table></td><td width="50%"><table width="100%" border=1 cellpadding=5><tr><td><b>Line 389</b> <font size=-1></font></td></tr></table></td> +<tr><td><font face="Helvetica,Arial" size="-1"> aes->ServiceAliasList.clear ();</font></td><td><font face="Helvetica,Arial" size="-1"> aes->ServiceAliasList.clear ();</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> msgin.serialCont (aes->ServiceAliasList);</font></td><td><font face="Helvetica,Arial" size="-1"> msgin.serialCont (aes->ServiceAliasList);</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> </font></td><td><font face="Helvetica,Arial" size="-1"> </font></td></tr> +<tr><td bgcolor="#cccccc"> </td><td bgcolor="#ccccff"><font face="Helvetica,Arial" size="-1"> nlinfo("send SAL to admin callback from aes");</font></td></tr> +<tr><td bgcolor="#cccccc"> </td><td bgcolor="#ccccff"><font face="Helvetica,Arial" size="-1"> </font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> CMessage msgout (CNetManager::getSIDA ("AS"), "SAL");</font></td><td><font face="Helvetica,Arial" size="-1"> CMessage msgout (CNetManager::getSIDA ("AS"), "SAL");</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> msgout.serial (aes->Id);</font></td><td><font face="Helvetica,Arial" size="-1"> msgout.serial (aes->Id);</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> msgout.serialCont (aes->ServiceAliasList);</font></td><td><font face="Helvetica,Arial" size="-1"> msgout.serialCont (aes->ServiceAliasList);</font></td></tr> +<tr bgcolor="#dddddd"><td width="50%"><table width="100%" border=1 cellpadding=5><tr><td><b>Line 365</b> <font size=-1></font></td></tr></table></td><td width="50%"><table width="100%" border=1 cellpadding=5><tr><td><b>Line 435</b> <font size=-1></font></td></tr></table></td> +<tr><td><font face="Helvetica,Arial" size="-1"> if (sit == aes->Services.end ())</font></td><td><font face="Helvetica,Arial" size="-1"> if (sit == aes->Services.end ())</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> {</font></td><td><font face="Helvetica,Arial" size="-1"> {</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> // normal case for unknown services</font></td><td><font face="Helvetica,Arial" size="-1"> // normal case for unknown services</font></td></tr> +<tr><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> nlwarning ("new service with alias (%s) but not in my list", alias.c_str());</font></td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> nlwarning ("new service without alias and not in my list, add it");</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> }</font></td><td><font face="Helvetica,Arial" size="-1"> }</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> else</font></td><td><font face="Helvetica,Arial" size="-1"> else</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> {</font></td><td><font face="Helvetica,Arial" size="-1"> {</font></td></tr> +<tr><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> nlwarning ("new service without alias is already in my list with id %d", sid);</font></td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> nlwarning ("new service without alias is already in my list with id %d, add it", sid);</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> }</font></td><td><font face="Helvetica,Arial" size="-1"> }</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> aes->Services.push_back (CService ());</font></td><td><font face="Helvetica,Arial" size="-1"> aes->Services.push_back (CService ());</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> sit = aes->Services.end();</font></td><td><font face="Helvetica,Arial" size="-1"> sit = aes->Services.end();</font></td></tr> +<tr bgcolor="#dddddd"><td width="50%"><table width="100%" border=1 cellpadding=5><tr><td><b>Line 380</b> <font size=-1></font></td></tr></table></td><td width="50%"><table width="100%" border=1 cellpadding=5><tr><td><b>Line 450</b> <font size=-1></font></td></tr></table></td> +<tr><td><font face="Helvetica,Arial" size="-1"> (*sit).AliasName = alias;</font></td><td><font face="Helvetica,Arial" size="-1"> (*sit).AliasName = alias;</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> (*sit).Connected = true;</font></td><td><font face="Helvetica,Arial" size="-1"> (*sit).Connected = true;</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> msgin.serial ((*sit).ShortName, (*sit).LongName);</font></td><td><font face="Helvetica,Arial" size="-1"> msgin.serial ((*sit).ShortName, (*sit).LongName);</font></td></tr> +<tr><td bgcolor="#cccccc"> </td><td bgcolor="#ccccff"><font face="Helvetica,Arial" size="-1"> msgin.serialCont ((*sit).Commands);</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> </font></td><td><font face="Helvetica,Arial" size="-1"> </font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> nlinfo ("*:%d:%d is identified to be '%s' '%s' '%s'", aes->Id, sid, (*sit).AliasName.c_str(), (*sit).ShortName.c_str(), (*sit).LongName.c_str());</font></td><td><font face="Helvetica,Arial" size="-1"> nlinfo ("*:%d:%d is identified to be '%s' '%s' '%s'", aes->Id, sid, (*sit).AliasName.c_str(), (*sit).ShortName.c_str(), (*sit).LongName.c_str());</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> </font></td><td><font face="Helvetica,Arial" size="-1"> </font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> // broadcast the message to all admin client</font></td><td><font face="Helvetica,Arial" size="-1"> // broadcast the message to all admin client</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> CMessage msgout (CNetManager::getSIDA ("AS"), "SID");</font></td><td><font face="Helvetica,Arial" size="-1"> CMessage msgout (CNetManager::getSIDA ("AS"), "SID");</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> msgout.serial (aes->Id, sid, (*sit).AliasName, (*sit).ShortName, (*sit).LongName);</font></td><td><font face="Helvetica,Arial" size="-1"> msgout.serial (aes->Id, sid, (*sit).AliasName, (*sit).ShortName, (*sit).LongName);</font></td></tr> +<tr><td bgcolor="#cccccc"> </td><td bgcolor="#ccccff"><font face="Helvetica,Arial" size="-1"> msgout.serialCont ((*sit).Commands);</font></td></tr> +<tr><td bgcolor="#cccccc"> </td><td bgcolor="#ccccff"><font face="Helvetica,Arial" size="-1"> </font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> CNetManager::send ("AS", msgout, 0);</font></td><td><font face="Helvetica,Arial" size="-1"> CNetManager::send ("AS", msgout, 0);</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> }</font></td><td><font face="Helvetica,Arial" size="-1"> }</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> </font></td><td><font face="Helvetica,Arial" size="-1"> </font></td></tr> +<tr bgcolor="#dddddd"><td width="50%"><table width="100%" border=1 cellpadding=5><tr><td><b>Line 458</b> <font size=-1></font></td></tr></table></td><td width="50%"><table width="100%" border=1 cellpadding=5><tr><td><b>Line 531</b> <font size=-1></font></td></tr></table></td> +<tr><td><font face="Helvetica,Arial" size="-1"> // erase only if it's not a service in the config</font></td><td><font face="Helvetica,Arial" size="-1"> // erase only if it's not a service in the config</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> aes->Services.erase (sit);</font></td><td><font face="Helvetica,Arial" size="-1"> aes->Services.erase (sit);</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> }</font></td><td><font face="Helvetica,Arial" size="-1"> }</font></td></tr> +<tr><td bgcolor="#cccccc"> </td><td bgcolor="#ccccff"><font face="Helvetica,Arial" size="-1"> </font></td></tr> +<tr><td bgcolor="#cccccc"> </td><td bgcolor="#ccccff"><font face="Helvetica,Arial" size="-1"> displayServices ();</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> }</font></td><td><font face="Helvetica,Arial" size="-1"> }</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> </font></td><td><font face="Helvetica,Arial" size="-1"> </font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> // i'm connected to a new admin executor service</font></td><td><font face="Helvetica,Arial" size="-1"> // i'm connected to a new admin executor service</font></td></tr> +<tr bgcolor="#dddddd"><td width="50%"><table width="100%" border=1 cellpadding=5><tr><td><b>Line 495</b> <font size=-1></font></td></tr></table></td><td width="50%"><table width="100%" border=1 cellpadding=5><tr><td><b>Line 570</b> <font size=-1></font></td></tr></table></td> +<tr><td><font face="Helvetica,Arial" size="-1"> aes->Connected = false;</font></td><td><font face="Helvetica,Arial" size="-1"> aes->Connected = false;</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> </font></td><td><font face="Helvetica,Arial" size="-1"> </font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> SIT sit;</font></td><td><font face="Helvetica,Arial" size="-1"> SIT sit;</font></td></tr> +<tr><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> for (sit = aes->Services.begin(); sit != aes->Services.end(); sit++)</font></td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> for (sit = aes->Services.begin(); sit != aes->Services.end();)</font></td></tr> +<tr><td bgcolor="#99cc99"> </td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> {</font></td></tr> +<tr><td bgcolor="#99cc99"> </td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> // keep only inconfig services</font></td></tr> +<tr><td bgcolor="#99cc99"> </td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> if ((*sit).InConfig)</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> {</font></td><td><font face="Helvetica,Arial" size="-1"> {</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> (*sit).Id = 0xFFFFFFFF;</font></td><td><font face="Helvetica,Arial" size="-1"> (*sit).Id = 0xFFFFFFFF;</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> (*sit).ShortName = (*sit).LongName = "";</font></td><td><font face="Helvetica,Arial" size="-1"> (*sit).ShortName = (*sit).LongName = "";</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> (*sit).Ready = (*sit).Connected = false;</font></td><td><font face="Helvetica,Arial" size="-1"> (*sit).Ready = (*sit).Connected = false;</font></td></tr> +<tr><td bgcolor="#cccccc"> </td><td bgcolor="#ccccff"><font face="Helvetica,Arial" size="-1"> sit++;</font></td></tr> +<tr><td bgcolor="#cccccc"> </td><td bgcolor="#ccccff"><font face="Helvetica,Arial" size="-1"> }</font></td></tr> +<tr><td bgcolor="#cccccc"> </td><td bgcolor="#ccccff"><font face="Helvetica,Arial" size="-1"> else</font></td></tr> +<tr><td bgcolor="#cccccc"> </td><td bgcolor="#ccccff"><font face="Helvetica,Arial" size="-1"> {</font></td></tr> +<tr><td bgcolor="#cccccc"> </td><td bgcolor="#ccccff"><font face="Helvetica,Arial" size="-1"> // erase only if it's not a service in the config</font></td></tr> +<tr><td bgcolor="#cccccc"> </td><td bgcolor="#ccccff"><font face="Helvetica,Arial" size="-1"> sit = aes->Services.erase (sit);</font></td></tr> +<tr><td bgcolor="#cccccc"> </td><td bgcolor="#ccccff"><font face="Helvetica,Arial" size="-1"> }</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> }</font></td><td><font face="Helvetica,Arial" size="-1"> }</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> </font></td><td><font face="Helvetica,Arial" size="-1"> </font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> nlinfo ("*:%d:* disconnected", aes->Id);</font></td><td><font face="Helvetica,Arial" size="-1"> nlinfo ("*:%d:* disconnected", aes->Id);</font></td></tr> +<tr bgcolor="#dddddd"><td width="50%"><table width="100%" border=1 cellpadding=5><tr><td><b>Line 510</b> <font size=-1></font></td></tr></table></td><td width="50%"><table width="100%" border=1 cellpadding=5><tr><td><b>Line 595</b> <font size=-1></font></td></tr></table></td> +<tr><td><font face="Helvetica,Arial" size="-1"> CNetManager::send ("AS", msgout, 0);</font></td><td><font face="Helvetica,Arial" size="-1"> CNetManager::send ("AS", msgout, 0);</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> */</font></td><td><font face="Helvetica,Arial" size="-1"> */</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> </font></td><td><font face="Helvetica,Arial" size="-1"> </font></td></tr> +<tr><td bgcolor="#cccccc"> </td><td bgcolor="#ccccff"><font face="Helvetica,Arial" size="-1"> displayServices ();</font></td></tr> +<tr><td bgcolor="#cccccc"> </td><td bgcolor="#ccccff"><font face="Helvetica,Arial" size="-1"> </font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> // broadcast the new state of this AES</font></td><td><font face="Helvetica,Arial" size="-1"> // broadcast the new state of this AES</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> CMessage msgout (CNetManager::getSIDA ("AS"), "AES_LIST");</font></td><td><font face="Helvetica,Arial" size="-1"> CMessage msgout (CNetManager::getSIDA ("AS"), "AES_LIST");</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> uint32 nbaes = 1;</font></td><td><font face="Helvetica,Arial" size="-1"> uint32 nbaes = 1;</font></td></tr> +<tr bgcolor="#dddddd"><td width="50%"><table width="100%" border=1 cellpadding=5><tr><td><b>Line 553</b> <font size=-1></font></td></tr></table></td><td width="50%"><table width="100%" border=1 cellpadding=5><tr><td><b>Line 640</b> <font size=-1></font></td></tr></table></td> +<tr><td><font face="Helvetica,Arial" size="-1"> ////////////////////////////////////////////////////////////////////////////////////////////////////////</font></td><td><font face="Helvetica,Arial" size="-1"> ////////////////////////////////////////////////////////////////////////////////////////////////////////</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> ////////////////////////////////////////////////////////////////////////////////////////////////////////</font></td><td><font face="Helvetica,Arial" size="-1"> ////////////////////////////////////////////////////////////////////////////////////////////////////////</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> </font></td><td><font face="Helvetica,Arial" size="-1"> </font></td></tr> +<tr><td bgcolor="#ff9999"><font face="Helvetica,Arial" size="-1"> void errorMessage(string message, TSockId from, CCallbackNetBase &netbase)</font></td><td bgcolor="#cccccc"> </td></tr> +<tr><td bgcolor="#ff9999"><font face="Helvetica,Arial" size="-1"> {</font></td><td bgcolor="#cccccc"> </td></tr> +<tr><td bgcolor="#ff9999"><font face="Helvetica,Arial" size="-1"> CMessage msgout (netbase.getSIDA (), "ERR");</font></td><td bgcolor="#cccccc"> </td></tr> +<tr><td bgcolor="#ff9999"><font face="Helvetica,Arial" size="-1"> msgout.serial (message);</font></td><td bgcolor="#cccccc"> </td></tr> +<tr><td bgcolor="#ff9999"><font face="Helvetica,Arial" size="-1"> netbase.send (msgout, from);</font></td><td bgcolor="#cccccc"> </td></tr> +<tr><td bgcolor="#ff9999"><font face="Helvetica,Arial" size="-1"> }</font></td><td bgcolor="#cccccc"> </td></tr> +<tr><td bgcolor="#ff9999"><font face="Helvetica,Arial" size="-1"> </font></td><td bgcolor="#cccccc"> </td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> //</font></td><td><font face="Helvetica,Arial" size="-1"> //</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> // A new admin client is connected.</font></td><td><font face="Helvetica,Arial" size="-1"> // A new admin client is connected.</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> //</font></td><td><font face="Helvetica,Arial" size="-1"> //</font></td></tr> +<tr bgcolor="#dddddd"><td width="50%"><table width="100%" border=1 cellpadding=5><tr><td><b>Line 605</b> <font size=-1></font></td></tr></table></td><td width="50%"><table width="100%" border=1 cellpadding=5><tr><td><b>Line 685</b> <font size=-1></font></td></tr></table></td> +<tr><td><font face="Helvetica,Arial" size="-1"> </font></td><td><font face="Helvetica,Arial" size="-1"> </font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> msgout.serial ((*sit).Id, (*sit).AliasName, (*sit).ShortName, (*sit).LongName);</font></td><td><font face="Helvetica,Arial" size="-1"> msgout.serial ((*sit).Id, (*sit).AliasName, (*sit).ShortName, (*sit).LongName);</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> msgout.serial ((*sit).Ready, (*sit).Connected, (*sit).InConfig);</font></td><td><font face="Helvetica,Arial" size="-1"> msgout.serial ((*sit).Ready, (*sit).Connected, (*sit).InConfig);</font></td></tr> +<tr><td bgcolor="#cccccc"> </td><td bgcolor="#ccccff"><font face="Helvetica,Arial" size="-1"> msgout.serialCont ((*sit).Commands);</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> }</font></td><td><font face="Helvetica,Arial" size="-1"> }</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> }</font></td><td><font face="Helvetica,Arial" size="-1"> }</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> CNetManager::send ("AS", msgout, from);</font></td><td><font face="Helvetica,Arial" size="-1"> CNetManager::send ("AS", msgout, from);</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> </font></td><td><font face="Helvetica,Arial" size="-1"> </font></td></tr> +<tr><td bgcolor="#cccccc"> </td><td bgcolor="#ccccff"><font face="Helvetica,Arial" size="-1"> displayServices ();</font></td></tr> +<tr><td bgcolor="#cccccc"> </td><td bgcolor="#ccccff"><font face="Helvetica,Arial" size="-1"> </font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> //</font></td><td><font face="Helvetica,Arial" size="-1"> //</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> // send service alias list</font></td><td><font face="Helvetica,Arial" size="-1"> // send service alias list</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> //</font></td><td><font face="Helvetica,Arial" size="-1"> //</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> </font></td><td><font face="Helvetica,Arial" size="-1"> </font></td></tr> +<tr><td bgcolor="#cccccc"> </td><td bgcolor="#ccccff"><font face="Helvetica,Arial" size="-1"> nlinfo("send SAL to admin startup");</font></td></tr> +<tr><td bgcolor="#cccccc"> </td><td bgcolor="#ccccff"><font face="Helvetica,Arial" size="-1"> </font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> for (aesit = AdminExecutorServices.begin(); aesit != AdminExecutorServices.end(); aesit++)</font></td><td><font face="Helvetica,Arial" size="-1"> for (aesit = AdminExecutorServices.begin(); aesit != AdminExecutorServices.end(); aesit++)</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> {</font></td><td><font face="Helvetica,Arial" size="-1"> {</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> CMessage msgout2 (CNetManager::getSIDA ("AS"), "SAL");</font></td><td><font face="Helvetica,Arial" size="-1"> CMessage msgout2 (CNetManager::getSIDA ("AS"), "SAL");</font></td></tr> +<tr bgcolor="#dddddd"><td width="50%"><table width="100%" border=1 cellpadding=5><tr><td><b>Line 634</b> <font size=-1></font></td></tr></table></td><td width="50%"><table width="100%" border=1 cellpadding=5><tr><td><b>Line 719</b> <font size=-1></font></td></tr></table></td> +<tr><td><font face="Helvetica,Arial" size="-1"> if (aesit == AdminExecutorServices.end())</font></td><td><font face="Helvetica,Arial" size="-1"> if (aesit == AdminExecutorServices.end())</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> {</font></td><td><font face="Helvetica,Arial" size="-1"> {</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> // don't find the aes, send an error message</font></td><td><font face="Helvetica,Arial" size="-1"> // don't find the aes, send an error message</font></td></tr> +<tr><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> errorMessage ("couldn't execute command, as didn't find the aes", from, netbase);</font></td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> messageToClient (0, "couldn't execute command, as didn't find the aes", from);</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> return;</font></td><td><font face="Helvetica,Arial" size="-1"> return;</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> }</font></td><td><font face="Helvetica,Arial" size="-1"> }</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> </font></td><td><font face="Helvetica,Arial" size="-1"> </font></td></tr> +<tr bgcolor="#dddddd"><td width="50%"><table width="100%" border=1 cellpadding=5><tr><td><b>Line 657</b> <font size=-1></font></td></tr></table></td><td width="50%"><table width="100%" border=1 cellpadding=5><tr><td><b>Line 742</b> <font size=-1></font></td></tr></table></td> +<tr><td><font face="Helvetica,Arial" size="-1"> if (aesit == AdminExecutorServices.end())</font></td><td><font face="Helvetica,Arial" size="-1"> if (aesit == AdminExecutorServices.end())</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> {</font></td><td><font face="Helvetica,Arial" size="-1"> {</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> // don't find the aes, send an error message</font></td><td><font face="Helvetica,Arial" size="-1"> // don't find the aes, send an error message</font></td></tr> +<tr><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> errorMessage ("couldn't start service, as didn't find the aes", from, netbase);</font></td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> messageToClient (0, "couldn't start service, as didn't find the aes", from);</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> return;</font></td><td><font face="Helvetica,Arial" size="-1"> return;</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> }</font></td><td><font face="Helvetica,Arial" size="-1"> }</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> </font></td><td><font face="Helvetica,Arial" size="-1"> </font></td></tr> +<tr bgcolor="#dddddd"><td width="50%"><table width="100%" border=1 cellpadding=5><tr><td><b>Line 677</b> <font size=-1></font></td></tr></table></td><td width="50%"><table width="100%" border=1 cellpadding=5><tr><td><b>Line 762</b> <font size=-1></font></td></tr></table></td> +<tr><td><font face="Helvetica,Arial" size="-1"> AESIT aesit = findAdminExecutorService (aesid, false);</font></td><td><font face="Helvetica,Arial" size="-1"> AESIT aesit = findAdminExecutorService (aesid, false);</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> if (aesit == AdminExecutorServices.end())</font></td><td><font face="Helvetica,Arial" size="-1"> if (aesit == AdminExecutorServices.end())</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> {</font></td><td><font face="Helvetica,Arial" size="-1"> {</font></td></tr> +<tr><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> errorMessage ("couldn't stop service, as didn't find the aes", from, netbase);</font></td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> messageToClient (0, "couldn't stop service, as didn't find the aes", from);</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> // don't find the aes, send an error message</font></td><td><font face="Helvetica,Arial" size="-1"> // don't find the aes, send an error message</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> return;</font></td><td><font face="Helvetica,Arial" size="-1"> return;</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> }</font></td><td><font face="Helvetica,Arial" size="-1"> }</font></td></tr> +<tr bgcolor="#dddddd"><td width="50%"><table width="100%" border=1 cellpadding=5><tr><td><b>Line 686</b> <font size=-1></font></td></tr></table></td><td width="50%"><table width="100%" border=1 cellpadding=5><tr><td><b>Line 771</b> <font size=-1></font></td></tr></table></td> +<tr><td><font face="Helvetica,Arial" size="-1"> if (sit == (*aesit).Services.end())</font></td><td><font face="Helvetica,Arial" size="-1"> if (sit == (*aesit).Services.end())</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> {</font></td><td><font face="Helvetica,Arial" size="-1"> {</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> // don't find the s, send an error message</font></td><td><font face="Helvetica,Arial" size="-1"> // don't find the s, send an error message</font></td></tr> +<tr><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> errorMessage ("couldn't stop service, as didn't find the service", from, netbase);</font></td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> messageToClient (0, "couldn't stop service, as didn't find the service", from);</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> return;</font></td><td><font face="Helvetica,Arial" size="-1"> return;</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> }</font></td><td><font face="Helvetica,Arial" size="-1"> }</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> </font></td><td><font face="Helvetica,Arial" size="-1"> </font></td></tr> +<tr bgcolor="#dddddd"><td width="50%"><table width="100%" border=1 cellpadding=5><tr><td><b>Line 708</b> <font size=-1></font></td></tr></table></td><td width="50%"><table width="100%" border=1 cellpadding=5><tr><td><b>Line 793</b> <font size=-1></font></td></tr></table></td> +<tr><td><font face="Helvetica,Arial" size="-1"> AESIT aesit = findAdminExecutorService (aesid, false);</font></td><td><font face="Helvetica,Arial" size="-1"> AESIT aesit = findAdminExecutorService (aesid, false);</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> if (aesit == AdminExecutorServices.end())</font></td><td><font face="Helvetica,Arial" size="-1"> if (aesit == AdminExecutorServices.end())</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> {</font></td><td><font face="Helvetica,Arial" size="-1"> {</font></td></tr> +<tr><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> errorMessage ("couldn't stop service, as didn't find the aes", from, netbase);</font></td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> messageToClient (0, "couldn't stop service, as didn't find the aes", from);</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> // don't find the aes, send an error message</font></td><td><font face="Helvetica,Arial" size="-1"> // don't find the aes, send an error message</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> return;</font></td><td><font face="Helvetica,Arial" size="-1"> return;</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> }</font></td><td><font face="Helvetica,Arial" size="-1"> }</font></td></tr> +<tr bgcolor="#dddddd"><td width="50%"><table width="100%" border=1 cellpadding=5><tr><td><b>Line 717</b> <font size=-1></font></td></tr></table></td><td width="50%"><table width="100%" border=1 cellpadding=5><tr><td><b>Line 802</b> <font size=-1></font></td></tr></table></td> +<tr><td><font face="Helvetica,Arial" size="-1"> if (sit == (*aesit).Services.end())</font></td><td><font face="Helvetica,Arial" size="-1"> if (sit == (*aesit).Services.end())</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> {</font></td><td><font face="Helvetica,Arial" size="-1"> {</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> // don't find the s, send an error message</font></td><td><font face="Helvetica,Arial" size="-1"> // don't find the s, send an error message</font></td></tr> +<tr><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> errorMessage ("couldn't stop service, as didn't find the service", from, netbase);</font></td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> messageToClient (0, "couldn't stop service, as didn't find the service", from);</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> return;</font></td><td><font face="Helvetica,Arial" size="-1"> return;</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> }</font></td><td><font face="Helvetica,Arial" size="-1"> }</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> </font></td><td><font face="Helvetica,Arial" size="-1"> </font></td></tr> +<tr bgcolor="#dddddd"><td width="50%"><table width="100%" border=1 cellpadding=5><tr><td><b>Line 821</b> <font size=-1></font></td></tr></table></td><td width="50%"><table width="100%" border=1 cellpadding=5><tr><td><b>Line 906</b> <font size=-1></font></td></tr></table></td> +<tr><td><font face="Helvetica,Arial" size="-1"> s.InConfig = true;</font></td><td><font face="Helvetica,Arial" size="-1"> s.InConfig = true;</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> (*aesit).Services.push_back (s);</font></td><td><font face="Helvetica,Arial" size="-1"> (*aesit).Services.push_back (s);</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> }</font></td><td><font face="Helvetica,Arial" size="-1"> }</font></td></tr> +<tr><td bgcolor="#cccccc"> </td><td bgcolor="#ccccff"><font face="Helvetica,Arial" size="-1"> displayServices ();</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> }</font></td><td><font face="Helvetica,Arial" size="-1"> }</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> </font></td><td><font face="Helvetica,Arial" size="-1"> </font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> bool update ()</font></td><td><font face="Helvetica,Arial" size="-1"> bool update ()</font></td></tr> +</table><br><hr noshade width="100%"> +<table border=0><tr><td><table border=1><tr><td>Legend:<br><table border=0 cellspacing=0 cellpadding=1> +<tr><td align=center bgcolor="#ff9999">Removed from v.1.5</td><td bgcolor="#cccccc"> </td></tr><tr bgcolor="#99ff99"><td align=center colspan=2>changed lines</td></tr><tr><td bgcolor="#cccccc"> </td><td align=center bgcolor="#ccccff">Added in v.1.6</td></tr></table></td></tr></table> +<td><FORM METHOD="GET" ACTION="/cvs/cvsweb.cgi/code/nelns/admin_service/admin_service.cpp.diff"> +<INPUT TYPE=HIDDEN NAME="r1" VALUE="1.5"> +<INPUT TYPE=HIDDEN NAME="r2" VALUE="1.6"> +<SELECT NAME="f" onchange="submit()"> +<OPTION VALUE=h SELECTED>Colored Diff<OPTION VALUE=H>Long Colored Diff<OPTION VALUE=u>Unidiff<OPTION VALUE=c>Context Diff<OPTION VALUE=s>Side by Side</SELECT><INPUT TYPE=SUBMIT VALUE="Show"> +</FORM> +</td></tr></table>
\ No newline at end of file |