diff options
Diffstat (limited to 'cvs/cvsweb.cgi/code/nelns/admin_executor_service/admin_executor_service.cpp.diff?r1=1.3&r2=1.4')
| -rw-r--r-- | cvs/cvsweb.cgi/code/nelns/admin_executor_service/admin_executor_service.cpp.diff?r1=1.3&r2=1.4 | 160 |
1 files changed, 160 insertions, 0 deletions
diff --git a/cvs/cvsweb.cgi/code/nelns/admin_executor_service/admin_executor_service.cpp.diff?r1=1.3&r2=1.4 b/cvs/cvsweb.cgi/code/nelns/admin_executor_service/admin_executor_service.cpp.diff?r1=1.3&r2=1.4 new file mode 100644 index 00000000..41d9cc4c --- /dev/null +++ b/cvs/cvsweb.cgi/code/nelns/admin_executor_service/admin_executor_service.cpp.diff?r1=1.3&r2=1.4 @@ -0,0 +1,160 @@ +<!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_executor_service/admin_executor_service.cpp - diff - 1.4</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_executor_service/admin_executor_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_executor_service/admin_executor_service.cpp">admin_executor_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_executor_service/">admin_executor_service</a></b></td></tr></table><h3 align=center>Diff for /code/nelns/admin_executor_service/admin_executor_service.cpp between version 1.3 and 1.4</h3> +<table border=0 cellspacing=0 cellpadding=0 width="100%"> +<tr bgcolor="#ffffff"> +<th width="50%" valign=TOP>version 1.3, 2001/05/03 13:19:13</th> +<th width="50%" valign=TOP>version 1.4, 2001/05/10 08:20:06</th> +<tr bgcolor="#dddddd"><td width="50%"><table width="100%" border=1 cellpadding=5><tr><td><b>Line 46</b> <font size=-1></font></td></tr></table></td><td width="50%"><table width="100%" border=1 cellpadding=5><tr><td><b>Line 46</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"> struct CService</font></td><td><font face="Helvetica,Arial" size="-1"> struct CService</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"> CService(TSockId s) : ServiceSockId(s), ServiceId(NextServiceId++) { }</font></td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> CService(TSockId s) : SockId(s), Id(NextId++), Ready(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 bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> TSockId ServiceSockId; // socket number to communicate with</font></td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> TSockId SockId; /// connection to the service</font></td></tr> +<tr><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> uint32 ServiceId; // id to identify it</font></td><td bgcolor="#99ff99"><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 ShortName;</font></td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> string ShortName; /// name of the service in short format ("NS" for example)</font></td></tr> +<tr><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> string LongName;</font></td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> string LongName; /// name of the service in long format ("naming_service")</font></td></tr> +<tr><td bgcolor="#99cc99"> </td><td bgcolor="#99ff99"><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"> </font></td><td><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 bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> </font></td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> static uint32 NextId;</font></td></tr> +<tr><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> static uint32 NextServiceId;</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"> </font></td><td><font face="Helvetica,Arial" size="-1"> </font></td></tr> +<tr><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> uint32 CService::NextServiceId = 0;</font></td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> uint32 CService::NextId = 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"> list<CService> Services;</font></td><td><font face="Helvetica,Arial" size="-1"> list<CService> Services;</font></td></tr> +<tr><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> typedef list<CService>::iterator sit;</font></td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> typedef list<CService>::iterator 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"> sit find (TSockId sid)</font></td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> SIT find (TSockId 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"> sit it;</font></td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> SIT sit;</font></td></tr> +<tr><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> for (it = Services.begin(); it != Services.end(); it++)</font></td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> for (sit = Services.begin(); sit != 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"> if ((*it).ServiceSockId == sid) break;</font></td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> if ((*sit).SockId == sid) break;</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"> return it;</font></td><td bgcolor="#99ff99"><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="#99ff99"><font face="Helvetica,Arial" size="-1"> sit find (uint32 sid)</font></td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> SIT findService (uint32 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"> sit it;</font></td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> SIT sit;</font></td></tr> +<tr><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> for (it = Services.begin(); it != Services.end(); it++)</font></td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> for (sit = Services.begin(); sit != 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"> if ((*it).ServiceId == sid) break;</font></td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> if ((*sit).Id == sid) break;</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"> return it;</font></td><td bgcolor="#99ff99"><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><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 197</b> <font size=-1></font></td></tr></table></td><td width="50%"><table width="100%" border=1 cellpadding=5><tr><td><b>Line 197</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 cbServiceIdentification (CMessage& msgin, TSockId from, CCallbackNetBase &netbase)</font></td><td><font face="Helvetica,Arial" size="-1"> static void cbServiceIdentification (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"> CService *c = (CService*) from->appId();</font></td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> CService *s = (CService*) 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 bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> msgin.serial (c->ShortName);</font></td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> msgin.serial (s->ShortName, s->LongName);</font></td></tr> +<tr><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> msgin.serial (c->LongName);</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"> nlinfo ("%s %s %s is identified", from->asString().c_str(), c->ShortName.c_str(), c->LongName.c_str());</font></td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> nlinfo ("*:*:%d is identified to be '%s' '%s'", s->Id, s->ShortName.c_str(), s->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 bgcolor="#cccccc"> </td><td bgcolor="#ccccff"><font face="Helvetica,Arial" size="-1"> // broadcast the message to the admin service</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> CMessage msgout (CNetManager::getSIDA ("AESAS"), "SID");</font></td><td><font face="Helvetica,Arial" size="-1"> CMessage msgout (CNetManager::getSIDA ("AESAS"), "SID");</font></td></tr> +<tr><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> msgout.serial (c->ShortName);</font></td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> msgout.serial (s->Id, s->ShortName, s->LongName);</font></td></tr> +<tr><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> msgout.serial (c->LongName);</font></td><td bgcolor="#99cc99"> </td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> CNetManager::send ("AESAS", msgout);</font></td><td><font face="Helvetica,Arial" size="-1"> CNetManager::send ("AESAS", 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><font face="Helvetica,Arial" size="-1"> static void cbServiceReady (CMessage& msgin, TSockId from, CCallbackNetBase &netbase)</font></td><td><font face="Helvetica,Arial" size="-1"> static void cbServiceReady (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"> CService *c = (CService*) from->appId();</font></td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> CService *s = (CService*) 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 bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> nlinfo ("%s %s %s is ready", from->asString().c_str(), c->ShortName.c_str(), c->LongName.c_str());</font></td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> nlinfo ("*:*:%d is ready", s->Id);</font></td></tr> +<tr><td bgcolor="#99cc99"> </td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> s->Ready = 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="#cccccc"> </td><td bgcolor="#ccccff"><font face="Helvetica,Arial" size="-1"> // broadcast the message to the admin service</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> CMessage msgout (CNetManager::getSIDA ("AESAS"), "SR");</font></td><td><font face="Helvetica,Arial" size="-1"> CMessage msgout (CNetManager::getSIDA ("AESAS"), "SR");</font></td></tr> +<tr><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> msgout.serial (c->ShortName);</font></td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> msgout.serial (s->Id);</font></td></tr> +<tr><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> msgout.serial (c->LongName);</font></td><td bgcolor="#99cc99"> </td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> CNetManager::send ("AESAS", msgout);</font></td><td><font face="Helvetica,Arial" size="-1"> CNetManager::send ("AESAS", 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><font face="Helvetica,Arial" size="-1"> void serviceConnection (const string &serviceName, TSockId from, void *arg)</font></td><td><font face="Helvetica,Arial" size="-1"> void serviceConnection (const string &serviceName, TSockId from, void *arg)</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"> Services.push_back (CService(from));</font></td><td><font face="Helvetica,Arial" size="-1"> Services.push_back (CService(from));</font></td></tr> +<tr><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> CService *c = &(Services.back());</font></td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> CService *s = &(Services.back());</font></td></tr> +<tr><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> from->setAppId ((uint64)c);</font></td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> from->setAppId ((uint64)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="#99ff99"><font face="Helvetica,Arial" size="-1"> nlinfo ("%s is connected", from->asString().c_str());</font></td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> nlinfo ("*:*:%d connected", s->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 bgcolor="#cccccc"> </td><td bgcolor="#ccccff"><font face="Helvetica,Arial" size="-1"> // broadcast the message to the admin service</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> CMessage msgout (CNetManager::getSIDA ("AESAS"), "SC");</font></td><td><font face="Helvetica,Arial" size="-1"> CMessage msgout (CNetManager::getSIDA ("AESAS"), "SC");</font></td></tr> +<tr><td bgcolor="#cccccc"> </td><td bgcolor="#ccccff"><font face="Helvetica,Arial" size="-1"> msgout.serial (s->Id);</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> CNetManager::send ("AESAS", msgout);</font></td><td><font face="Helvetica,Arial" size="-1"> CNetManager::send ("AESAS", 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><font face="Helvetica,Arial" size="-1"> void serviceDisconnection (const string &serviceName, TSockId from, void *arg)</font></td><td><font face="Helvetica,Arial" size="-1"> void serviceDisconnection (const string &serviceName, TSockId from, void *arg)</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"> CService *c = (CService*) from->appId();</font></td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> CService *s = (CService*) 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 bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> nlinfo ("%s %s %s is disconnected", from->asString().c_str(), c->ShortName.c_str(), c->LongName.c_str());</font></td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> nlinfo ("*:*:%d disconnected", s->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 bgcolor="#cccccc"> </td><td bgcolor="#ccccff"><font face="Helvetica,Arial" size="-1"> // broadcast the message to the admin service</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> CMessage msgout (CNetManager::getSIDA ("AESAS"), "SD");</font></td><td><font face="Helvetica,Arial" size="-1"> CMessage msgout (CNetManager::getSIDA ("AESAS"), "SD");</font></td></tr> +<tr><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> msgout.serial (c->ShortName);</font></td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> msgout.serial (s->Id);</font></td></tr> +<tr><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> msgout.serial (c->LongName);</font></td><td bgcolor="#99cc99"> </td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> CNetManager::send ("AESAS", msgout);</font></td><td><font face="Helvetica,Arial" size="-1"> CNetManager::send ("AESAS", 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"> // remove the service from the list</font></td></tr> +<tr><td bgcolor="#cccccc"> </td><td bgcolor="#ccccff"><font face="Helvetica,Arial" size="-1"> Services.erase (findService(s->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 bgcolor="#dddddd"><td width="50%"><table width="100%" border=1 cellpadding=5><tr><td><b>Line 281</b> <font size=-1></font></td></tr></table></td><td width="50%"><table width="100%" border=1 cellpadding=5><tr><td><b>Line 286</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="#cccccc"> </td><td bgcolor="#ccccff"><font face="Helvetica,Arial" size="-1"> void cbASServiceConnection (const string &serviceName, TSockId from, void *arg)</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"> // new admin service, send him all out info about services</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"> nlinfo ("AS %s is connected", from->asString().c_str());</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 ("AESAS"), "SL");</font></td></tr> +<tr><td bgcolor="#cccccc"> </td><td bgcolor="#ccccff"><font face="Helvetica,Arial" size="-1"> uint32 nbs = (uint32)Services.size();</font></td></tr> +<tr><td bgcolor="#cccccc"> </td><td bgcolor="#ccccff"><font face="Helvetica,Arial" size="-1"> msgout.serial (nbs);</font></td></tr> +<tr><td bgcolor="#cccccc"> </td><td bgcolor="#ccccff"><font face="Helvetica,Arial" size="-1"> for (SIT sit = Services.begin(); sit != 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"> msgout.serial ((*sit).Id);</font></td></tr> +<tr><td bgcolor="#cccccc"> </td><td bgcolor="#ccccff"><font face="Helvetica,Arial" size="-1"> msgout.serial ((*sit).ShortName);</font></td></tr> +<tr><td bgcolor="#cccccc"> </td><td bgcolor="#ccccff"><font face="Helvetica,Arial" size="-1"> msgout.serial ((*sit).LongName);</font></td></tr> +<tr><td bgcolor="#cccccc"> </td><td bgcolor="#ccccff"><font face="Helvetica,Arial" size="-1"> msgout.serial ((*sit).Ready);</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"> CNetManager::send ("AESAS", msgout, from);</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 AESASCallbackArray[] =</font></td><td><font face="Helvetica,Arial" size="-1"> TCallbackItem AESASCallbackArray[] =</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 305</b> <font size=-1></font></td></tr></table></td><td width="50%"><table width="100%" border=1 cellpadding=5><tr><td><b>Line 328</b> <font size=-1></font></td></tr></table></td> +<tr><td><font face="Helvetica,Arial" size="-1"> CNetManager::setDisconnectionCallback ("AES", serviceDisconnection, NULL);</font></td><td><font face="Helvetica,Arial" size="-1"> CNetManager::setDisconnectionCallback ("AES", serviceDisconnection, NULL);</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"> // install the server for AS</font></td><td><font face="Helvetica,Arial" size="-1"> // install the server for AS</font></td></tr> +<tr><td bgcolor="#cccccc"> </td><td bgcolor="#ccccff"><font face="Helvetica,Arial" size="-1"> CNetManager::setConnectionCallback ("AESAS", cbASServiceConnection, NULL);</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> CNetManager::addServer ("AESAS", 49996);</font></td><td><font face="Helvetica,Arial" size="-1"> CNetManager::addServer ("AESAS", 49996);</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> CNetManager::addCallbackArray ("AESAS", AESASCallbackArray, sizeof(AESASCallbackArray)/sizeof(AESASCallbackArray[0]));</font></td><td><font face="Helvetica,Arial" size="-1"> CNetManager::addCallbackArray ("AESAS", AESASCallbackArray, sizeof(AESASCallbackArray)/sizeof(AESASCallbackArray[0]));</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.3</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.4</td></tr></table></td></tr></table> +<td><FORM METHOD="GET" ACTION="/cvs/cvsweb.cgi/code/nelns/admin_executor_service/admin_executor_service.cpp.diff"> +<INPUT TYPE=HIDDEN NAME="r1" VALUE="1.3"> +<INPUT TYPE=HIDDEN NAME="r2" VALUE="1.4"> +<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 |