1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
|
<!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.15</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.14 and 1.15</h3>
<table border=0 cellspacing=0 cellpadding=0 width="100%">
<tr bgcolor="#ffffff">
<th width="50%" valign=TOP>version 1.14, 2002/03/19 17:42:48</th>
<th width="50%" valign=TOP>version 1.15, 2002/03/25 09:28:00</th>
<tr bgcolor="#dddddd"><td width="50%"><table width="100%" border=1 cellpadding=5><tr><td><b>Line 36</b> <font size=-1></font></td></tr></table></td><td width="50%"><table width="100%" border=1 cellpadding=5><tr><td><b>Line 36</b> <font size=-1></font></td></tr></table></td>
<tr><td><font face="Helvetica,Arial" size="-1"> #define NELNS_LOGS ""</font></td><td><font face="Helvetica,Arial" size="-1"> #define NELNS_LOGS ""</font></td></tr>
<tr><td><font face="Helvetica,Arial" size="-1"> #endif // NELNS_LOGS</font></td><td><font face="Helvetica,Arial" size="-1"> #endif // NELNS_LOGS</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"> #include "nel/misc/types_nl.h"</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"> #include <string></font></td><td><font face="Helvetica,Arial" size="-1"> #include <string></font></td></tr>
<tr><td><font face="Helvetica,Arial" size="-1"> #include <list></font></td><td><font face="Helvetica,Arial" size="-1"> #include <list></font></td></tr>
<tr><td><font face="Helvetica,Arial" size="-1"> </font></td><td><font face="Helvetica,Arial" size="-1"> </font></td></tr>
<tr><td bgcolor="#ff9999"><font face="Helvetica,Arial" size="-1"> #include "nel/net/service.h"</font></td><td bgcolor="#cccccc"> </td></tr>
<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/command.h"</font></td><td><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 bgcolor="#cccccc"> </td><td bgcolor="#ccccff"><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><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"> using namespace std;</font></td><td><font face="Helvetica,Arial" size="-1"> using namespace std;</font></td></tr>
<tr bgcolor="#dddddd"><td width="50%"><table width="100%" border=1 cellpadding=5><tr><td><b>Line 196</b> <font size=-1></font></td></tr></table></td><td width="50%"><table width="100%" border=1 cellpadding=5><tr><td><b>Line 198</b> <font size=-1></font></td></tr></table></td>
<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><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("Services");</font></td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> CConfigFile::CVar &script = IService::getInstance()->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 bgcolor="#dddddd"><td width="50%"><table width="100%" border=1 cellpadding=5><tr><td><b>Line 275</b> <font size=-1></font></td></tr></table></td><td width="50%"><table width="100%" border=1 cellpadding=5><tr><td><b>Line 277</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"> CConfigFile::CVar &script = IService::ConfigFile.getVar("Services");</font></td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> CConfigFile::CVar &script = IService::getInstance()->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 690</b> <font size=-1></font></td></tr></table></td><td width="50%"><table width="100%" border=1 cellpadding=5><tr><td><b>Line 692</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"> msgin.serial (password);</font></td><td><font face="Helvetica,Arial" size="-1"> msgin.serial (password);</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 (password == IService::ConfigFile.getVar("Password").asString())</font></td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> if (password == IService::getInstance()->ConfigFile.getVar("Password").asString())</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"> // good authentification</font></td><td><font face="Helvetica,Arial" size="-1"> // good authentification</font></td></tr>
<tr><td><font face="Helvetica,Arial" size="-1"> ok = true;</font></td><td><font face="Helvetica,Arial" size="-1"> ok = true;</font></td></tr>
<tr bgcolor="#dddddd"><td width="50%"><table width="100%" border=1 cellpadding=5><tr><td><b>Line 982</b> <font size=-1></font></td></tr></table></td><td width="50%"><table width="100%" border=1 cellpadding=5><tr><td><b>Line 984</b> <font size=-1></font></td></tr></table></td>
<tr><td><font face="Helvetica,Arial" size="-1"> // AESAS is a client connection to the admin executor</font></td><td><font face="Helvetica,Arial" size="-1"> // AESAS is a client connection to the admin executor</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"> /// Naming Service</font></td><td><font face="Helvetica,Arial" size="-1"> /// Naming Service</font></td></tr>
<tr><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> NLNET_SERVICE_MAIN (CAdminService, "AS", "admin_service", 49995, ClientCallbackArray, NELNS_CONFIG, NELNS_LOGS);</font></td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> NLNET_OLD_SERVICE_MAIN (CAdminService, "AS", "admin_service", 49995, ClientCallbackArray, NELNS_CONFIG, NELNS_LOGS);</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.14</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.15</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.14">
<INPUT TYPE=HIDDEN NAME="r2" VALUE="1.15">
<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>
|
