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
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
|
<!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.6</TITLE></HEAD>
<BODY BGCOLOR="#eeeeee">
<table width="100%" border=0 cellspacing=0 cellpadding=1 bgcolor="#aaaaaa"><tr valign=bottom><td><a href="/cvs/cvsweb.cgi/code/nelns/admin_executor_service/admin_executor_service.cpp"><IMG SRC="/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="/inc/img/picto-news.gif" ALT="[TXT]" BORDER="0" WIDTH="13" HEIGHT="15"></td><td align=right><IMG SRC="/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.5 and 1.6</h3>
<table border=0 cellspacing=0 cellpadding=0 width="100%">
<tr bgcolor="#ffffff">
<th width="50%" valign=TOP>version 1.5, 2001/05/18 16:51:33</th>
<th width="50%" valign=TOP>version 1.6, 2001/05/31 16:44:38</th>
<tr bgcolor="#dddddd"><td width="50%"><table width="100%" border=1 cellpadding=5><tr><td><b>Line 58</b> <font size=-1></font></td></tr></table></td><td width="50%"><table width="100%" border=1 cellpadding=5><tr><td><b>Line 58</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"> TSockId SockId; /// connection to the service</font></td><td><font face="Helvetica,Arial" size="-1"> TSockId SockId; /// connection to the service</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="#cccccc"> </td><td bgcolor="#ccccff"><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 118</b> <font size=-1></font></td></tr></table></td><td width="50%"><table width="100%" border=1 cellpadding=5><tr><td><b>Line 119</b> <font size=-1></font></td></tr></table></td>
<tr><td><font face="Helvetica,Arial" size="-1"> _chdir(oldpath);</font></td><td><font face="Helvetica,Arial" size="-1"> _chdir(oldpath);</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 ("end executing: %s", Command.c_str());</font></td><td><font face="Helvetica,Arial" size="-1"> nlinfo ("end executing: %s", Command.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"> </font></td></tr>
<tr><td><font face="Helvetica,Arial" size="-1"> }</font></td><td><font face="Helvetica,Arial" size="-1"> }</font></td></tr>
<tr><td><font face="Helvetica,Arial" size="-1"> };</font></td><td><font face="Helvetica,Arial" size="-1"> };</font></td></tr>
<tr><td><font face="Helvetica,Arial" size="-1"> </font></td><td><font face="Helvetica,Arial" size="-1"> </font></td></tr>
<tr><td bgcolor="#cccccc"> </td><td bgcolor="#ccccff"><font face="Helvetica,Arial" size="-1"> class CExecuteServiceThread : public IRunnable</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"> public:</font></td></tr>
<tr><td bgcolor="#cccccc"> </td><td bgcolor="#ccccff"><font face="Helvetica,Arial" size="-1"> string ServiceAlias, ServiceCommand, ServicePath;</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"> CExecuteServiceThread (string serviceAlias, string serviceCommand, string servicePath = "") :</font></td></tr>
<tr><td bgcolor="#cccccc"> </td><td bgcolor="#ccccff"><font face="Helvetica,Arial" size="-1"> ServiceCommand(serviceCommand), ServicePath(servicePath), ServiceAlias(serviceAlias) { }</font></td></tr>
<tr><td bgcolor="#cccccc"> </td><td bgcolor="#ccccff"><font face="Helvetica,Arial" size="-1"> </font></td></tr>
<tr><td bgcolor="#cccccc"> </td><td bgcolor="#ccccff"><font face="Helvetica,Arial" size="-1"> void run ()</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 ("start service '%s' '%s' in '%s' directory", ServiceAlias.c_str(), ServiceCommand.c_str(), ServicePath.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"> char oldpath[256];</font></td></tr>
<tr><td bgcolor="#cccccc"> </td><td bgcolor="#ccccff"><font face="Helvetica,Arial" size="-1"> if (!ServicePath.empty())</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"> _getcwd(oldpath,256);</font></td></tr>
<tr><td bgcolor="#cccccc"> </td><td bgcolor="#ccccff"><font face="Helvetica,Arial" size="-1"> _chdir(ServicePath.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"> </font></td></tr>
<tr><td bgcolor="#cccccc"> </td><td bgcolor="#ccccff"><font face="Helvetica,Arial" size="-1"> system (ServiceCommand.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"> if (!ServicePath.empty())</font></td></tr>
<tr><td bgcolor="#cccccc"> </td><td bgcolor="#ccccff"><font face="Helvetica,Arial" size="-1"> _chdir(oldpath);</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 ("end service '%s' '%s' in '%s' directory", ServiceAlias.c_str(), ServiceCommand.c_str(), ServicePath.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"> };</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 executeCommand (string command, bool background)</font></td><td><font face="Helvetica,Arial" size="-1"> void executeCommand (string command, bool background)</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 221</b> <font size=-1></font></td></tr></table></td><td width="50%"><table width="100%" border=1 cellpadding=5><tr><td><b>Line 251</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"> CService *s = (CService*) from->appId();</font></td><td><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 (s->ShortName, s->LongName);</font></td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> msgin.serial (s->AliasName, s->ShortName, s->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 is identified to be '%s' '%s'", s->Id, s->ShortName.c_str(), s->LongName.c_str());</font></td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> nlinfo ("*:*:%d is identified to be '%s' '%s' '%s'", s->Id, s->AliasName.c_str(), 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><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><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 (s->Id, s->ShortName, s->LongName);</font></td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> msgout.serial (s->Id, s->AliasName, s->ShortName, s->LongName);</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 bgcolor="#dddddd"><td width="50%"><table width="100%" border=1 cellpadding=5><tr><td><b>Line 336</b> <font size=-1></font></td></tr></table></td><td width="50%"><table width="100%" border=1 cellpadding=5><tr><td><b>Line 366</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="#cccccc"> </td><td bgcolor="#ccccff"><font face="Helvetica,Arial" size="-1"> // give the service alias to the service to forward it back when it will connected to the aes.</font></td></tr>
<tr><td bgcolor="#cccccc"> </td><td bgcolor="#ccccff"><font face="Helvetica,Arial" size="-1"> command += " -n";</font></td></tr>
<tr><td bgcolor="#cccccc"> </td><td bgcolor="#ccccff"><font face="Helvetica,Arial" size="-1"> command += serviceAlias.c_str();</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"> command += " >NUL:";</font></td><td><font face="Helvetica,Arial" size="-1"> command += " >NUL:";</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"> IThread *thread = IThread::create (new CExecuteCommandThread (command, path));</font></td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> IThread *thread = IThread::create (new CExecuteServiceThread (serviceAlias, command, path));</font></td></tr>
<tr><td><font face="Helvetica,Arial" size="-1"> thread->start ();</font></td><td><font face="Helvetica,Arial" size="-1"> thread->start ();</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>
</table><br><hr noshade width="100%">
<table border=0><tr><td><table border=1><tr><td>Legend:<br><table border=0 cellspacing=0 cellpadding=1>
<tr><td align=center bgcolor="#ff9999">Removed from v.1.5</td><td bgcolor="#cccccc"> </td></tr><tr bgcolor="#99ff99"><td align=center colspan=2>changed lines</td></tr><tr><td bgcolor="#cccccc"> </td><td align=center bgcolor="#ccccff">Added in v.1.6</td></tr></table></td></tr></table>
<td><FORM METHOD="GET" ACTION="/cvs/cvsweb.cgi/code/nelns/admin_executor_service/admin_executor_service.cpp.diff">
<INPUT TYPE=HIDDEN NAME="r1" VALUE="1.5">
<INPUT TYPE=HIDDEN NAME="r2" VALUE="1.6">
<SELECT NAME="f" onchange="submit()">
<OPTION VALUE=h SELECTED>Colored Diff<OPTION VALUE=H>Long Colored Diff<OPTION VALUE=u>Unidiff<OPTION VALUE=c>Context Diff<OPTION VALUE=s>Side by Side</SELECT><INPUT TYPE=SUBMIT VALUE="Show">
</FORM>
</td></tr></table>
|
