echelon/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix removal of subsession aliases from tunnel manager on

Browse Source 
I2CP connection shutdown
Sort tweaks for shared clients in summary bar
This commit is contained in:
zzz
2015-06-15 14:35:15 +00:00
parent 2b9ffc1270
commit bc85543ef2
4 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
apps/routerconsole/java/src/net/i2p/router/web/SummaryHelper.java
View File

@ -491,9 +491,11 @@ public class SummaryHelper extends HelperBase {
public int compare(Destination lhs, Destination rhs) {
String lname = getName(lhs);
String rname = getName(rhs);
if (lname.equals(xsc))
boolean lshared = lname.startsWith("shared clients") || lname.startsWith(xsc);
boolean rshared = rname.startsWith("shared clients") || rname.startsWith(xsc);
if (lshared && !rshared)
return -1;
if (rname.equals(xsc))
if (rshared && !lshared)
return 1;
return Collator.getInstance().compare(lname, rname);
}

12
router/java/src/net/i2p/router/client/ClientConnectionRunner.java
View File

@ -202,6 +202,8 @@ class ClientConnectionRunner {
LeaseSet ls = sp.currentLeaseSet;
if (ls != null)
_context.netDb().unpublish(ls);
if (!sp.isPrimary)
_context.tunnelManager().removeAlias(sp.dest);
}
synchronized (_alreadyProcessed) {
_alreadyProcessed.clear();
@ -414,15 +416,21 @@ class ClientConnectionRunner {
if (ls != null)
_context.netDb().unpublish(ls);
isPrimary = sp.isPrimary;
if (!isPrimary)
_context.tunnelManager().removeAlias(sp.dest);
break;
}
}
if (isPrimary) {
if (isPrimary && !_sessions.isEmpty()) {
// kill all the others also
for (SessionParams sp : _sessions.values()) {
_manager.unregisterSession(id, sp.dest);
if (_log.shouldLog(Log.INFO))
_log.info("Destroying remaining client subsession " + sp.sessionId);
_manager.unregisterSession(sp.sessionId, sp.dest);
LeaseSet ls = sp.currentLeaseSet;
if (ls != null)
_context.netDb().unpublish(ls);
_context.tunnelManager().removeAlias(sp.dest);
}
}
}

4
router/java/src/net/i2p/router/client/ClientManager.java
View File

@ -220,14 +220,14 @@ class ClientManager {
* Remove all sessions for this runner.
*/
public void unregisterConnection(ClientConnectionRunner runner) {
if (_log.shouldLog(Log.WARN))
_log.warn("Unregistering (dropping) a client connection");
synchronized (_pendingRunners) {
_pendingRunners.remove(runner);
}
List<SessionId> ids = runner.getSessionIds();
List<Destination> dests = runner.getDestinations();
if (_log.shouldLog(Log.WARN))
_log.warn("Unregistering (dropping) a client connection with ids: " + ids);
synchronized (_runners) {
for (SessionId id : ids) {
_runnerSessionIds.remove(id);

2
router/java/src/net/i2p/router/client/ClientMessageEventListener.java
View File

@ -426,8 +426,6 @@ class ClientMessageEventListener implements I2CPMessageReader.I2CPMessageEventLi
if (left <= 0) {
_runner.stopRunning();
} else {
if (cfg != null)
_context.tunnelManager().removeAlias(cfg.getDestination());
if (_log.shouldLog(Log.INFO))
_log.info("Still " + left + " sessions left");
}