I2P_Developers/i2p.itoopie
3
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

2004-12-06 jrandom

Browse Source 
* Don't do a 'passive flush' while there are already outbound messages
      unacked.
    * Show the reseed link if up to 10 peers profiles are active (thanks
      dburton!)
This commit is contained in:
jrandom
2004-12-07 01:09:16 +00:00
committed by zzz
parent acfb6c4578
commit fa12dc867f
4 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/routerconsole/jsp/summary.jsp
View File

@ -23,7 +23,7 @@
if (helper.getActivePeers() <= 0) { if (helper.getActivePeers() <= 0) {
%><b><a href="config.jsp">check your NAT/firewall</a></b><br /><% %><b><a href="config.jsp">check your NAT/firewall</a></b><br /><%
} }
if (helper.getActiveProfiles() <= 4) { // 4 is the min fallback if (helper.getActiveProfiles() <= 10) { // 10 is the min fallback
if ("true".equals(System.getProperty("net.i2p.router.web.ReseedHandler.reseedInProgress", "false"))) { if ("true".equals(System.getProperty("net.i2p.router.web.ReseedHandler.reseedInProgress", "false"))) {
out.print(" <i>reseeding</i>"); out.print(" <i>reseeding</i>");
} else { } else {

3
apps/streaming/java/src/net/i2p/client/streaming/MessageOutputStream.java
View File

@ -160,6 +160,8 @@ public class MessageOutputStream extends OutputStream {
_log.debug("flusher time reached: left = " + timeLeft); _log.debug("flusher time reached: left = " + timeLeft);
if (timeLeft > 0) if (timeLeft > 0)
enqueue(); enqueue();
else if (_dataReceiver.writeInProcess())
enqueue(); // don't passive flush if there is a write being done (unacked outbound)
else else
doFlush(); doFlush();
} }
@ -341,6 +343,7 @@ public class MessageOutputStream extends OutputStream {
* Nonblocking write * Nonblocking write
*/ */
public WriteStatus writeData(byte buf[], int off, int size); public WriteStatus writeData(byte buf[], int off, int size);
public boolean writeInProcess();
} }
/** Define a way to detect the status of a write */ /** Define a way to detect the status of a write */

8
history.txt
View File

@ -1,4 +1,10 @@
$Id: history.txt,v 1.98 2004/12/05 21:08:03 jrandom Exp $ $Id: history.txt,v 1.99 2004/12/06 00:03:58 jrandom Exp $
2004-12-06 jrandom
* Don't do a 'passive flush' while there are already outbound messages
unacked.
* Show the reseed link if up to 10 peers profiles are active (thanks
dburton!)
2004-12-06 jrandom 2004-12-06 jrandom
* Don't propogate streaming connection failures out to the SAM bridge as * Don't propogate streaming connection failures out to the SAM bridge as

4
router/java/src/net/i2p/router/RouterVersion.java
View File

@ -15,9 +15,9 @@ import net.i2p.CoreVersion;
* *
*/ */
public class RouterVersion { public class RouterVersion {
public final static String ID = "$Revision: 1.103 $ $Date: 2004/12/05 21:08:02 $"; public final static String ID = "$Revision: 1.104 $ $Date: 2004/12/06 00:03:57 $";
public final static String VERSION = "0.4.2.2"; public final static String VERSION = "0.4.2.2";
public final static long BUILD = 7; public final static long BUILD = 8;
public static void main(String args[]) { public static void main(String args[]) {
System.out.println("I2P Router version: " + VERSION); System.out.println("I2P Router version: " + VERSION);
System.out.println("Router ID: " + RouterVersion.ID); System.out.println("Router ID: " + RouterVersion.ID);