diff options
Diffstat (limited to 'cvs/cvsweb.cgi/code/nelns/admin_executor_service/admin_executor_service.cpp.diff?r1=1.9&r2=1.10')
| -rw-r--r-- | cvs/cvsweb.cgi/code/nelns/admin_executor_service/admin_executor_service.cpp.diff?r1=1.9&r2=1.10 | 52 |
1 files changed, 52 insertions, 0 deletions
diff --git a/cvs/cvsweb.cgi/code/nelns/admin_executor_service/admin_executor_service.cpp.diff?r1=1.9&r2=1.10 b/cvs/cvsweb.cgi/code/nelns/admin_executor_service/admin_executor_service.cpp.diff?r1=1.9&r2=1.10 new file mode 100644 index 00000000..48727289 --- /dev/null +++ b/cvs/cvsweb.cgi/code/nelns/admin_executor_service/admin_executor_service.cpp.diff?r1=1.9&r2=1.10 @@ -0,0 +1,52 @@ +<!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.10</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.9 and 1.10</h3> +<table border=0 cellspacing=0 cellpadding=0 width="100%"> +<tr bgcolor="#ffffff"> +<th width="50%" valign=TOP>version 1.9, 2001/06/18 14:54:06</th> +<th width="50%" valign=TOP>version 1.10, 2001/06/27 08:35:13</th> +<tr bgcolor="#dddddd"><td width="50%"><table width="100%" border=1 cellpadding=5><tr><td><b>Line 41</b> <font size=-1></font></td></tr></table></td><td width="50%"><table width="100%" border=1 cellpadding=5><tr><td><b>Line 41</b> <font size=-1></font></td></tr></table></td> +<tr><td><font face="Helvetica,Arial" size="-1"> #include "nel/misc/debug.h"</font></td><td><font face="Helvetica,Arial" size="-1"> #include "nel/misc/debug.h"</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> #include "nel/misc/config_file.h"</font></td><td><font face="Helvetica,Arial" size="-1"> #include "nel/misc/config_file.h"</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> #include "nel/misc/thread.h"</font></td><td><font face="Helvetica,Arial" size="-1"> #include "nel/misc/thread.h"</font></td></tr> +<tr><td bgcolor="#cccccc"> </td><td bgcolor="#ccccff"><font face="Helvetica,Arial" size="-1"> #include "nel/misc/command.h"</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"> #include "nel/net/service.h"</font></td><td><font face="Helvetica,Arial" size="-1"> #include "nel/net/service.h"</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> #include "nel/net/net_manager.h"</font></td><td><font face="Helvetica,Arial" size="-1"> #include "nel/net/net_manager.h"</font></td></tr> +<tr bgcolor="#dddddd"><td width="50%"><table width="100%" border=1 cellpadding=5><tr><td><b>Line 67</b> <font size=-1></font></td></tr></table></td><td width="50%"><table width="100%" border=1 cellpadding=5><tr><td><b>Line 68</b> <font size=-1></font></td></tr></table></td> +<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><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> vector<string> Commands;</font></td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> vector<CSerialCommand> 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"> 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 bgcolor="#dddddd"><td width="50%"><table width="100%" border=1 cellpadding=5><tr><td><b>Line 282</b> <font size=-1></font></td></tr></table></td><td width="50%"><table width="100%" border=1 cellpadding=5><tr><td><b>Line 283</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 cbLog (CMessage& msgin, TSockId from, CCallbackNetBase &netbase)</font></td><td><font face="Helvetica,Arial" size="-1"> static void cbLog (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="#cccccc"> </td><td bgcolor="#ccccff"><font face="Helvetica,Arial" size="-1"> CService *s = (CService*) (uint) from->appId();</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> // received an answer for a command, give it to the AS</font></td><td><font face="Helvetica,Arial" size="-1"> // received an answer for a command, give it to the AS</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 the admin service</font></td><td><font face="Helvetica,Arial" size="-1"> // broadcast the message to the admin service</font></td></tr> +<tr><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> CMessage msgout (CNetManager::getSIDA ("AESAS"), "LOG");</font></td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> CMessage msgout (CNetManager::getSIDA ("AESAS"), "XLOG");</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> string log;</font></td><td><font face="Helvetica,Arial" size="-1"> string log;</font></td></tr> +<tr><td><font face="Helvetica,Arial" size="-1"> msgin.serial (log);</font></td><td><font face="Helvetica,Arial" size="-1"> msgin.serial (log);</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"> msgout.serial (log);</font></td><td><font face="Helvetica,Arial" size="-1"> msgout.serial (log);</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> +</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.9</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.10</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.9"> +<INPUT TYPE=HIDDEN NAME="r2" VALUE="1.10"> +<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 |