Update of /cvsroot/freenet/freenet/src/freenet
In directory sc8-pr-cvs1:/tmp/cvs-serv18179/src/freenet
Modified Files:
Version.java PeerHandler.java
Log Message:
6317:
Make most xfer rates bytes/sec, fix conversion errors leading to crazy estimates,
change transferSucceeded arguments.
Add min/max xfer rates to node RT status summary page.
Logging.
Index: Version.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/Version.java,v
retrieving revision 1.513
retrieving revision 1.514
diff -u -w -r1.513 -r1.514
--- Version.java 6 Nov 2003 01:41:16 -0000 1.513
+++ Version.java 7 Nov 2003 18:17:14 -0000 1.514
@@ -20,7 +20,7 @@
public static String protocolVersion = "1.47";
/** The build number of the current revision */
- public static final int buildNumber = 6316;
+ public static final int buildNumber = 6317;
public static final int ignoreBuildsAfter = 6500;
Index: PeerHandler.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/PeerHandler.java,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -w -r1.44 -r1.45
--- PeerHandler.java 5 Nov 2003 14:02:54 -0000 1.44
+++ PeerHandler.java 7 Nov 2003 18:17:15 -0000 1.45
@@ -691,7 +691,11 @@
// If it's FCP, or if it's not got a return address,
// and we can't send now or wait for a packet send to finish,
// then dump the message
- SendFailedException sfe = new SendFailedException(null, id,
"No open connections " + "and can't contact node", true);
+ String sfeMsg =
+ (ref == null || ref.noPhysical()) ?
+
"No open connections and no way to contact node" :
+
"No open connections and probably can't contact node";
+ SendFailedException sfe = new SendFailedException(null, id,
sfeMsg, true);
pm.notifyFailure(sfe);
if(logDEBUG)
Core.logger.log(this, "Failed to send packet, no more
conns, " + "no way to open connection: DISCARDING " + pm + " on " + this, id == null ?
Logger.NORMAL : Logger.MINOR); // id == null => FCP
_______________________________________________
cvs mailing list
[EMAIL PROTECTED]
http://dodo.freenetproject.org/cgi-bin/mailman/listinfo/cvs
