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
|
<!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.11</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="/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="/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_service/">admin_service</a></b></td></tr></table><h3 align=center>Diff for /code/nelns/admin_service/admin_service.cpp between version 1.10 and 1.11</h3>
<table border=0 cellspacing=0 cellpadding=0 width="100%">
<tr bgcolor="#ffffff">
<th width="50%" valign=TOP>version 1.10, 2001/07/05 08:26:07</th>
<th width="50%" valign=TOP>version 1.11, 2001/07/10 16:49:53</th>
<tr bgcolor="#dddddd"><td width="50%"><table width="100%" border=1 cellpadding=5><tr><td><b>Line 514</b> <font size=-1></font></td></tr></table></td><td width="50%"><table width="100%" border=1 cellpadding=5><tr><td><b>Line 514</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"> nlinfo ("*:%d:%d disconnected", aes->Id, sid);</font></td><td><font face="Helvetica,Arial" size="-1"> nlinfo ("*:%d:%d disconnected", 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"> SIT sit = aes->findService(sid);</font></td><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> SIT sit = aes->findService(sid, 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"> // 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"), "SD");</font></td><td><font face="Helvetica,Arial" size="-1"> CMessage msgout (CNetManager::getSIDA ("AS"), "SD");</font></td></tr>
<tr><td bgcolor="#99ff99"><font face="Helvetica,Arial" size="-1"> msgout.serial (aes->Id, (*sit).Id);</font></td><td bgcolor="#99ff99"><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><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"> // the service could disconnect before it's identification, in this case, we don't have it in the service list</font></td></tr>
<tr><td bgcolor="#cccccc"> </td><td bgcolor="#ccccff"><font face="Helvetica,Arial" size="-1"> if (sit != aes->Services.end ())</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"> if ((*sit).InConfig)</font></td><td><font face="Helvetica,Arial" size="-1"> if ((*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"> (*sit).Ready = (*sit).Connected = false;</font></td><td><font face="Helvetica,Arial" size="-1"> (*sit).Ready = (*sit).Connected = false;</font></td></tr>
<tr bgcolor="#dddddd"><td width="50%"><table width="100%" border=1 cellpadding=5><tr><td><b>Line 532</b> <font size=-1></font></td></tr></table></td><td width="50%"><table width="100%" border=1 cellpadding=5><tr><td><b>Line 535</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"> // erase only if it's not a service in the config</font></td><td><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 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"> displayServices ();</font></td><td><font face="Helvetica,Arial" size="-1"> displayServices ();</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.10</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.11</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.10">
<INPUT TYPE=HIDDEN NAME="r2" VALUE="1.11">
<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>
|
