diff options
Diffstat (limited to 'cvs/cvsweb.cgi/code/nelns/admin_service/admin_service.cpp.diff?r1=1.4&r2=1.5')
| -rw-r--r-- | cvs/cvsweb.cgi/code/nelns/admin_service/admin_service.cpp.diff?r1=1.4&r2=1.5 | 379 |
1 files changed, 379 insertions, 0 deletions
diff --git a/cvs/cvsweb.cgi/code/nelns/admin_service/admin_service.cpp.diff?r1=1.4&r2=1.5 b/cvs/cvsweb.cgi/code/nelns/admin_service/admin_service.cpp.diff?r1=1.4&r2=1.5 new file mode 100644 index 00000000..0e5911d0 --- /dev/null +++ b/cvs/cvsweb.cgi/code/nelns/admin_service/admin_service.cpp.diff?r1=1.4&r2=1.5 @@ -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.5</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.4 and 1.5</h3> +<table border=0 cellspacing=0 cellpadding=0 width="100%"> +<tr bgcolor="#ffffff"> +<th width="50%" valign=TOP>version 1.4, 2001/05/18 16:51:33</th> +<th width="50%" valign=TOP>version 1.5, 2001/05/31 16:44:54</th> +<tr bgcolor="#dddddd"><td width="50%"><table width="100%" border=1 cellpadding=5><tr><td><b>Line 45</b> <font size=-1></font></td></tr></table></td><td width="50%"><table width="100%" border=1 cellpadding=5><tr><td><b>Line 45</b> <font size=-1></font></td></tr></table></td> +<tr><td><font face="Helvetica,Arial" size="-1"> CService () : Id(0xFFFFFFFF), Ready(false), Connected(false), InConfig(false) { }</font></td><td><font face="Helvetica,Arial" size="-1"> CService () : Id(0xFFFFFFFF), Ready(false), Connected(false), InConfig(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"> uint32 Id; /// uint32 to identify the service</font></td><td><font face="Helvetica,Arial" size="-1"> uint32 Id; /// uint32 to identify the service</font></td></tr> +<tr><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> string ServiceAlias; /// alias of the service used in the AES and AS to find him (unique per AES)</font></td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> string AliasName; /// alias of the service used in the AES and AS to find him (unique per AES)</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> string ShortName; /// name of the service in short format ("NS" for example)</font></td><td><font face="Helvetica,Arial" size="-1"> string ShortName; /// name of the service in short format ("NS" for example)</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> string LongName; /// name of the service in long format ("naming_service")</font></td><td><font face="Helvetica,Arial" size="-1"> string LongName; /// name of the service in long format ("naming_service")</font></td></tr> +<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 bgcolor="#dddddd"><td width="50%"><table width="100%" border=1 cellpadding=5><tr><td><b>Line 83</b> <font size=-1></font></td></tr></table></td><td width="50%"><table width="100%" border=1 cellpadding=5><tr><td><b>Line 83</b> <font size=-1></font></td></tr></table></td> +<tr><td><font face="Helvetica,Arial" size="-1"> return sit;</font></td><td><font face="Helvetica,Arial" size="-1"> return 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><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"> SIT findService (const string &alias, bool asrt = true)</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"> SIT sit;</font></td></tr> +<tr><td bgcolor="#cccccc"> </td><td bgcolor="#ccccff"><font face="Helvetica,Arial" size="-1"> for (sit = Services.begin(); sit != Services.end(); sit++)</font></td></tr> +<tr><td bgcolor="#cccccc"> </td><td bgcolor="#ccccff"><font face="Helvetica,Arial" size="-1"> if ((*sit).AliasName == alias)</font></td></tr> +<tr><td bgcolor="#cccccc"> </td><td bgcolor="#ccccff"><font face="Helvetica,Arial" size="-1"> break;</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"> if (asrt)</font></td></tr> +<tr><td bgcolor="#cccccc"> </td><td bgcolor="#ccccff"><font face="Helvetica,Arial" size="-1"> nlassert (sit != Services.end());</font></td></tr> +<tr><td bgcolor="#cccccc"> </td><td bgcolor="#ccccff"><font face="Helvetica,Arial" size="-1"> return 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"> </font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> private:</font></td><td><font face="Helvetica,Arial" size="-1"> private:</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> static uint32 NextId;</font></td><td><font face="Helvetica,Arial" size="-1"> static uint32 NextId;</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 138</b> <font size=-1></font></td></tr></table></td><td width="50%"><table width="100%" border=1 cellpadding=5><tr><td><b>Line 150</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="#99ff99"><font face="Helvetica,Arial" size="-1"> bool ScriptRunning = false;</font></td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> bool StartAllServices = false;</font></td></tr> +<tr><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> string ScriptName;</font></td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> uint32 StartAllServicesPos;</font></td></tr> +<tr><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> uint32 ScriptPos;</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"> void doNextScriptStep ()</font></td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> void doNextStartAllServicesStep ()</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"> nlassert (ScriptRunning);</font></td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> nlassert (StartAllServices);</font></td></tr> +<tr><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> </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><font face="Helvetica,Arial" size="-1"> // get the script</font></td><td><font face="Helvetica,Arial" size="-1"> // get the script</font></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"> try</font></td><td><font face="Helvetica,Arial" size="-1"> try</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"> CConfigFile::CVar &script = IService::ConfigFile.getVar(ScriptName);</font></td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> CConfigFile::CVar &script = IService::ConfigFile.getVar("Services");</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"> // check the position</font></td><td><font face="Helvetica,Arial" size="-1"> // check the position</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"> if (ScriptPos*2 >= (uint32)script.size())</font></td><td bgcolor="#99ff99"><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 bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> ScriptRunning = false;</font></td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> StartAllServices = false;</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><font face="Helvetica,Arial" size="-1"> // todo send that the script is finish to the admin</font></td><td><font face="Helvetica,Arial" size="-1"> // todo send that the script is finish to the admin</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 170</b> <font size=-1></font></td></tr></table></td><td width="50%"><table width="100%" border=1 cellpadding=5><tr><td><b>Line 179</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"> try</font></td><td><font face="Helvetica,Arial" size="-1"> try</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"> serverAlias = script.asString (ScriptPos*2);</font></td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> serverAlias = script.asString (StartAllServicesPos*2);</font></td></tr> +<tr><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> serviceAlias = script.asString (ScriptPos*2+1);</font></td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> serviceAlias = script.asString (StartAllServicesPos*2+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(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="#99ff99"><font face="Helvetica,Arial" size="-1"> nlwarning ("script '%s' not contains a good number of entries (must be a multiple of 2)", ScriptName.c_str());</font></td><td bgcolor="#99ff99"><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 bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> ScriptRunning = false;</font></td><td bgcolor="#99ff99"><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><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"> ScriptRunning = false;</font></td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> StartAllServices = false;</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><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 bgcolor="#cccccc"> </td><td bgcolor="#ccccff"><font face="Helvetica,Arial" size="-1"> // check if the service is not currently running</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"> StartAllServicesPos++;</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"> SIT sit = (*aesit).findService (serviceAlias);</font></td></tr> +<tr><td bgcolor="#cccccc"> </td><td bgcolor="#ccccff"><font face="Helvetica,Arial" size="-1"> if ((*sit).Connected)</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"> // the service is already running, go to the next process</font></td></tr> +<tr><td bgcolor="#cccccc"> </td><td bgcolor="#ccccff"><font face="Helvetica,Arial" size="-1"> doNextStartAllServicesStep ();</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><font face="Helvetica,Arial" size="-1"> // send the resquest to the AES</font></td><td><font face="Helvetica,Arial" size="-1"> // send the resquest to the AES</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 msgout (CNetManager::getSIDA((*aesit).ServerAlias), "STARTS");</font></td><td><font face="Helvetica,Arial" size="-1"> CMessage msgout (CNetManager::getSIDA((*aesit).ServerAlias), "STARTS");</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> msgout.serial (serviceAlias);</font></td><td><font face="Helvetica,Arial" size="-1"> msgout.serial (serviceAlias);</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> CNetManager::send ((*aesit).ServerAlias, msgout);</font></td><td><font face="Helvetica,Arial" size="-1"> CNetManager::send ((*aesit).ServerAlias, msgout);</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="#99ff99"><font face="Helvetica,Arial" size="-1"> ScriptPos++;</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><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="#99ff99"><font face="Helvetica,Arial" size="-1"> nlwarning ("script '%s' not found", ScriptName.c_str());</font></td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> nlwarning ("'Services' variable is not found");</font></td></tr> +<tr><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> ScriptRunning = false;</font></td><td bgcolor="#99ff99"><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><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"> void initScript(string scriptName)</font></td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> void initStartAllServices ()</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"> if (ScriptRunning)</font></td><td bgcolor="#99ff99"><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><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 bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> ScriptRunning = false;</font></td><td bgcolor="#99ff99"><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><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"> try</font></td><td><font face="Helvetica,Arial" size="-1"> try</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"> CConfigFile::CVar &script = IService::ConfigFile.getVar(scriptName);</font></td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> CConfigFile::CVar &script = IService::ConfigFile.getVar("Services");</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"> for (sint i = 0 ; i < script.size (); i+=2)</font></td><td><font face="Helvetica,Arial" size="-1"> for (sint i = 0 ; i < script.size (); i+=2)</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 222</b> <font size=-1></font></td></tr></table></td><td width="50%"><table width="100%" border=1 cellpadding=5><tr><td><b>Line 242</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 not running, can't run the script");</font></td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> nlwarning("aes '%s' not 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 bgcolor="#dddddd"><td width="50%"><table width="100%" border=1 cellpadding=5><tr><td><b>Line 233</b> <font size=-1></font></td></tr></table></td><td width="50%"><table width="100%" border=1 cellpadding=5><tr><td><b>Line 253</b> <font size=-1></font></td></tr></table></td> +<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 bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> ScriptName = scriptName;</font></td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> StartAllServicesPos = 0;</font></td></tr> +<tr><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> ScriptPos = 0;</font></td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> StartAllServices = true;</font></td></tr> +<tr><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> ScriptRunning = true;</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"> doNextScriptStep();</font></td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> doNextStartAllServicesStep();</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 bgcolor="#dddddd"><td width="50%"><table width="100%" border=1 cellpadding=5><tr><td><b>Line 316</b> <font size=-1></font></td></tr></table></td><td width="50%"><table width="100%" border=1 cellpadding=5><tr><td><b>Line 335</b> <font size=-1></font></td></tr></table></td> +<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><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 sid;</font></td><td><font face="Helvetica,Arial" size="-1"> uint32 sid;</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"> string alias;</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"> SIT sit = aes->findService(sid);</font></td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> msgin.serial (sid, alias);</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;</font></td></tr> +<tr><td bgcolor="#99cc99"> </td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> if (!alias.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 = aes->findService (alias, false);</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"> 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"> // the alias is not found</font></td></tr> +<tr><td bgcolor="#99cc99"> </td><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></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 (CService ());</font></td></tr> +<tr><td bgcolor="#99cc99"> </td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> sit = aes->Services.end();</font></td></tr> +<tr><td bgcolor="#99cc99"> </td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> 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"> 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"> // normal case</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 = aes->findService (sid, false);</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"> 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"> // normal case for unknown services</font></td></tr> +<tr><td bgcolor="#99cc99"> </td><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></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"> nlwarning ("new service without alias is already in my list with id %d", sid);</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 (CService ());</font></td></tr> +<tr><td bgcolor="#99cc99"> </td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> sit = aes->Services.end();</font></td></tr> +<tr><td bgcolor="#99cc99"> </td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> 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"> </font></td></tr> +<tr><td bgcolor="#99cc99"> </td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> (*sit).Id = sid;</font></td></tr> +<tr><td bgcolor="#99cc99"> </td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> (*sit).AliasName = alias;</font></td></tr> +<tr><td bgcolor="#99cc99"> </td><td bgcolor="#99ff99"><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><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 ("*:%d:%d is identified to be '%s' '%s'", aes->Id, sid, (*sit).ShortName.c_str(), (*sit).LongName.c_str());</font></td><td bgcolor="#99ff99"><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 bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> msgout.serial (aes->Id, sid, (*sit).ShortName, (*sit).LongName);</font></td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> msgout.serial (aes->Id, sid, (*sit).AliasName, (*sit).ShortName, (*sit).LongName);</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 347</b> <font size=-1></font></td></tr></table></td><td width="50%"><table width="100%" border=1 cellpadding=5><tr><td><b>Line 407</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"> // if we are in a script execution, continue</font></td><td><font face="Helvetica,Arial" size="-1"> // if we are in a script execution, continue</font></td></tr> +<tr><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> if (ScriptRunning)</font></td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> if (StartAllServices)</font></td></tr> +<tr><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> doNextScriptStep();</font></td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> doNextStartAllServicesStep();</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"> static void cbServiceConnection (CMessage& msgin, TSockId from, CCallbackNetBase &netbase)</font></td><td><font face="Helvetica,Arial" size="-1"> static void cbServiceConnection (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="#99ff99"><font face="Helvetica,Arial" size="-1"> /* CAdminExecutorService *aes = (CAdminExecutorService*) from->appId();</font></td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> CAdminExecutorService *aes = (CAdminExecutorService*) from->appId();</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 sid;</font></td><td><font face="Helvetica,Arial" size="-1"> uint32 sid;</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> msgin.serial (sid);</font></td><td><font face="Helvetica,Arial" size="-1"> msgin.serial (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"> nlinfo ("*:%d:%d connected", aes->Id, sid);</font></td><td><font face="Helvetica,Arial" size="-1"> nlinfo ("*:%d:%d connected", aes->Id, 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 bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> aes->Services.push_back (CService(sid));</font></td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> // don't do anything. we have to wait identification to add it in out lists</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"> aes->Services.push_back (CService(sid));</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 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"), "SC");</font></td><td><font face="Helvetica,Arial" size="-1"> CMessage msgout (CNetManager::getSIDA ("AS"), "SC");</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> msgout.serial (aes->Id, sid);</font></td><td><font face="Helvetica,Arial" size="-1"> msgout.serial (aes->Id, sid);</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 bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> */}</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"> static void cbServiceDisconnection (CMessage& msgin, TSockId from, CCallbackNetBase &netbase)</font></td><td><font face="Helvetica,Arial" size="-1"> static void cbServiceDisconnection (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 384</b> <font size=-1></font></td></tr></table></td><td width="50%"><table width="100%" border=1 cellpadding=5><tr><td><b>Line 447</b> <font size=-1></font></td></tr></table></td> +<tr><td><font face="Helvetica,Arial" size="-1"> msgout.serial (aes->Id, (*sit).Id);</font></td><td><font face="Helvetica,Arial" size="-1"> msgout.serial (aes->Id, (*sit).Id);</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 bgcolor="#cccccc"> </td><td bgcolor="#ccccff"><font face="Helvetica,Arial" size="-1"> if ((*sit).InConfig)</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"> (*sit).Ready = (*sit).Connected = false;</font></td></tr> +<tr><td bgcolor="#cccccc"> </td><td bgcolor="#ccccff"><font face="Helvetica,Arial" size="-1"> (*sit).Id = 0xFFFFFFFF;</font></td></tr> +<tr><td bgcolor="#cccccc"> </td><td bgcolor="#ccccff"><font face="Helvetica,Arial" size="-1"> (*sit).ShortName = (*sit).LongName = "";</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><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><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><td><font face="Helvetica,Arial" size="-1"> void cbAESConnection (const string &serviceName, TSockId from, void *arg)</font></td><td><font face="Helvetica,Arial" size="-1"> void cbAESConnection (const string &serviceName, TSockId from, void *arg)</font></td></tr> +<tr bgcolor="#dddddd"><td width="50%"><table width="100%" border=1 cellpadding=5><tr><td><b>Line 420</b> <font size=-1></font></td></tr></table></td><td width="50%"><table width="100%" border=1 cellpadding=5><tr><td><b>Line 493</b> <font size=-1></font></td></tr></table></td> +<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><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->Connected = false;</font></td><td><font face="Helvetica,Arial" size="-1"> aes->Connected = false;</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"> SIT sit;</font></td></tr> +<tr><td bgcolor="#cccccc"> </td><td bgcolor="#ccccff"><font face="Helvetica,Arial" size="-1"> for (sit = aes->Services.begin(); sit != aes->Services.end(); 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"> (*sit).Id = 0xFFFFFFFF;</font></td></tr> +<tr><td bgcolor="#cccccc"> </td><td bgcolor="#ccccff"><font face="Helvetica,Arial" size="-1"> (*sit).ShortName = (*sit).LongName = "";</font></td></tr> +<tr><td bgcolor="#cccccc"> </td><td bgcolor="#ccccff"><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"> }</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 ("*:%d:* disconnected", aes->Id);</font></td><td><font face="Helvetica,Arial" size="-1"> nlinfo ("*:%d:* disconnected", aes->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"> // broadcast the message to all admin client that an admin exec is disconnected</font></td><td><font face="Helvetica,Arial" size="-1"> // broadcast the message to all admin client that an admin exec is disconnected</font></td></tr> +<tr bgcolor="#dddddd"><td width="50%"><table width="100%" border=1 cellpadding=5><tr><td><b>Line 521</b> <font size=-1></font></td></tr></table></td><td width="50%"><table width="100%" border=1 cellpadding=5><tr><td><b>Line 603</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"> // send info about services of the AES</font></td><td><font face="Helvetica,Arial" size="-1"> // send info about services of the AES</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 ((*sit).Id, (*sit).ServiceAlias, (*sit).ShortName, (*sit).LongName);</font></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><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><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 541</b> <font size=-1></font></td></tr></table></td><td width="50%"><table width="100%" border=1 cellpadding=5><tr><td><b>Line 623</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"> static void cbExecuteScript (CMessage& msgin, 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"> string script;</font></td><td bgcolor="#cccccc"> </td></tr> +<tr><td bgcolor="#ff9999"><font face="Helvetica,Arial" size="-1"> msgin.serial (script);</font></td><td bgcolor="#cccccc"> </td></tr> +<tr><td bgcolor="#ff9999"><font face="Helvetica,Arial" size="-1"> initScript (script);</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 bgcolor="#ff9999"><font face="Helvetica,Arial" size="-1"> </font></td><td bgcolor="#cccccc"> </td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> static void cbExecuteSystemCommand (CMessage& msgin, TSockId from, CCallbackNetBase &netbase)</font></td><td><font face="Helvetica,Arial" size="-1"> static void cbExecuteSystemCommand (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><font face="Helvetica,Arial" size="-1"> string command;</font></td><td><font face="Helvetica,Arial" size="-1"> string command;</font></td></tr> +<tr bgcolor="#dddddd"><td width="50%"><table width="100%" border=1 cellpadding=5><tr><td><b>Line 574</b> <font size=-1></font></td></tr></table></td><td width="50%"><table width="100%" border=1 cellpadding=5><tr><td><b>Line 648</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"> static void cbStartService (CMessage& msgin, TSockId from, CCallbackNetBase &netbase)</font></td><td><font face="Helvetica,Arial" size="-1"> static void cbStartService (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="#99ff99"><font face="Helvetica,Arial" size="-1"> string serviceName;</font></td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> string serviceAlias;</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> uint32 aesid;</font></td><td><font face="Helvetica,Arial" size="-1"> uint32 aesid;</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> msgin.serial (aesid);</font></td><td><font face="Helvetica,Arial" size="-1"> msgin.serial (aesid);</font></td></tr> +<tr><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> msgin.serial (serviceName);</font></td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> msgin.serial (serviceAlias);</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"> 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 bgcolor="#dddddd"><td width="50%"><table width="100%" border=1 cellpadding=5><tr><td><b>Line 590</b> <font size=-1></font></td></tr></table></td><td width="50%"><table width="100%" border=1 cellpadding=5><tr><td><b>Line 664</b> <font size=-1></font></td></tr></table></td> +<tr><td><font face="Helvetica,Arial" size="-1"> // send the resquest to the AES</font></td><td><font face="Helvetica,Arial" size="-1"> // send the resquest to the AES</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 msgout (CNetManager::getSIDA((*aesit).ServerAlias), "STARTS");</font></td><td><font face="Helvetica,Arial" size="-1"> CMessage msgout (CNetManager::getSIDA((*aesit).ServerAlias), "STARTS");</font></td></tr> +<tr><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> msgout.serial (serviceName);</font></td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> msgout.serial (serviceAlias);</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> CNetManager::send ((*aesit).ServerAlias, msgout);</font></td><td><font face="Helvetica,Arial" size="-1"> CNetManager::send ((*aesit).ServerAlias, msgout);</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 655</b> <font size=-1></font></td></tr></table></td><td width="50%"><table width="100%" border=1 cellpadding=5><tr><td><b>Line 729</b> <font size=-1></font></td></tr></table></td> +<tr><td><font face="Helvetica,Arial" size="-1"> CNetManager::send ((*aesit).ServerAlias, msgout);</font></td><td><font face="Helvetica,Arial" size="-1"> CNetManager::send ((*aesit).ServerAlias, msgout);</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"> static void cbStartAllServices (CMessage& msgin, TSockId from, CCallbackNetBase &netbase)</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"> initStartAllServices ();</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"> static void cbStopAllServices (CMessage& msgin, TSockId from, CCallbackNetBase &netbase)</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"> for (AESIT aesit = AdminExecutorServices.begin(); aesit != AdminExecutorServices.end(); aesit++)</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"> for (SIT sit = (*aesit).Services.begin(); sit != (*aesit).Services.end(); 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"> if ((*sit).Connected)</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((*aesit).ServerAlias), "STOPS");</font></td></tr> +<tr><td bgcolor="#cccccc"> </td><td bgcolor="#ccccff"><font face="Helvetica,Arial" size="-1"> msgout.serial ((*sit).Id);</font></td></tr> +<tr><td bgcolor="#cccccc"> </td><td bgcolor="#ccccff"><font face="Helvetica,Arial" size="-1"> CNetManager::send ((*aesit).ServerAlias, msgout);</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 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"> TCallbackItem ClientCallbackArray[] =</font></td><td><font face="Helvetica,Arial" size="-1"> TCallbackItem ClientCallbackArray[] =</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"> { "SYS", cbExecuteSystemCommand },</font></td><td><font face="Helvetica,Arial" size="-1"> { "SYS", cbExecuteSystemCommand },</font></td></tr> +<tr><td bgcolor="#ff9999"><font face="Helvetica,Arial" size="-1"> { "EXEC", cbExecuteScript },</font></td><td bgcolor="#cccccc"> </td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> { "STARTS", cbStartService },</font></td><td><font face="Helvetica,Arial" size="-1"> { "STARTS", cbStartService },</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> { "STOPS", cbStopService },</font></td><td><font face="Helvetica,Arial" size="-1"> { "STOPS", cbStopService },</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> { "EXEC_COMMAND", cbExecCommand },</font></td><td><font face="Helvetica,Arial" size="-1"> { "EXEC_COMMAND", cbExecCommand },</font></td></tr> +<tr><td bgcolor="#cccccc"> </td><td bgcolor="#ccccff"><font face="Helvetica,Arial" size="-1"> { "START_ALL_SERVICES", cbStartAllServices },</font></td></tr> +<tr><td bgcolor="#cccccc"> </td><td bgcolor="#ccccff"><font face="Helvetica,Arial" size="-1"> { "STOP_ALL_SERVICES", cbStopAllServices },</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 bgcolor="#dddddd"><td width="50%"><table width="100%" border=1 cellpadding=5><tr><td><b>Line 678</b> <font size=-1></font></td></tr></table></td><td width="50%"><table width="100%" border=1 cellpadding=5><tr><td><b>Line 773</b> <font size=-1></font></td></tr></table></td> +<tr><td><font face="Helvetica,Arial" size="-1"> /// Init the service, load the universal time.</font></td><td><font face="Helvetica,Arial" size="-1"> /// Init the service, load the universal time.</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> void init ()</font></td><td><font face="Helvetica,Arial" size="-1"> void init ()</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"> DebugLog->addNegativeFilter ("L0:");</font></td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> // DebugLog->addNegativeFilter ("L0:");</font></td></tr> +<tr><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> DebugLog->addNegativeFilter ("L1:");</font></td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> // DebugLog->addNegativeFilter ("L1:");</font></td></tr> +<tr><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> DebugLog->addNegativeFilter ("L2:");</font></td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> // DebugLog->addNegativeFilter ("L2:");</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::setConnectionCallback ("AS", clientConnection, NULL);</font></td><td><font face="Helvetica,Arial" size="-1"> CNetManager::setConnectionCallback ("AS", clientConnection, NULL);</font></td></tr> +<tr bgcolor="#dddddd"><td width="50%"><table width="100%" border=1 cellpadding=5><tr><td><b>Line 722</b> <font size=-1></font></td></tr></table></td><td width="50%"><table width="100%" border=1 cellpadding=5><tr><td><b>Line 817</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"> // add new AES in the list</font></td><td><font face="Helvetica,Arial" size="-1"> // add new AES in the list</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> CService s;</font></td><td><font face="Helvetica,Arial" size="-1"> CService s;</font></td></tr> +<tr><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> s.ServiceAlias = serviceAlias;</font></td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> s.AliasName = serviceAlias;</font></td></tr> +<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> +</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.4</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.5</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.4"> +<INPUT TYPE=HIDDEN NAME="r2" VALUE="1.5"> +<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 |