Update of /cvsroot/freenet/freenet/src/freenet/session
In directory sc8-pr-cvs1:/tmp/cvs-serv17951/src/freenet/session
Modified Files:
FnpLink.java FnpLinkManager.java Link.java PlainLink.java
Log Message:
6195: (mostly) asynchronous trailer writing, lots of logging improvements (most code
supports selective logging now), bugfixes
Index: FnpLink.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/session/FnpLink.java,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- FnpLink.java 8 Sep 2003 17:03:04 -0000 1.30
+++ FnpLink.java 18 Sep 2003 17:48:12 -0000 1.31
@@ -9,8 +9,8 @@
public final class FnpLink implements LinkConstants, Link {
- public static int AUTH_LAYER_VERSION = 0x01;
-
+ public static int AUTH_LAYER_VERSION = 0x01;
+
protected static final int
VER_BIT_LENGTH = 5,
VER_BIT_MASK = 0x1f,
@@ -42,7 +42,7 @@
protected FnpLink(FnpLinkManager flm, Connection c) {
linkManager = flm;
conn = c;
- logDEBUG = Core.logger.shouldLog(Logger.DEBUG);
+ logDEBUG = Core.logger.shouldLog(Logger.DEBUG,this);
//profiling
//WARNING:remove before release
synchronized(profLock) {
@@ -787,8 +787,8 @@
}
}
- public void encryptBytes(byte[] buf) {
- out.getCipher().blockEncipher(buf, 0, buf.length);
+ public void encryptBytes(byte[] buf, int offset, int length) {
+ out.getCipher().blockEncipher(buf, offset, length);
}
// FIXME: neither of these should be inner classes
Index: FnpLinkManager.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/session/FnpLinkManager.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- FnpLinkManager.java 29 Jul 2003 17:30:46 -0000 1.18
+++ FnpLinkManager.java 18 Sep 2003 17:48:12 -0000 1.19
@@ -67,7 +67,7 @@
Identity bob,
Connection c) throws CommunicationException {
long startTime = System.currentTimeMillis();
- boolean logDEBUG = Core.logger.shouldLog(Logger.DEBUG);
+ boolean logDEBUG = Core.logger.shouldLog(Logger.DEBUG,this);
if(logDEBUG)
Core.logger.log(this, "createOutgoing() at "+startTime,
Core.logger.DEBUG);
@@ -172,7 +172,7 @@
LinkToken lt=new FnpLinkToken(remotePK, me, k, linkIdentifier);
//Core.logger.log(this, "Adding link identified by "
// + linkIdentifier.toString(16), Core.logger.DEBUG);
- if(Core.logger.shouldLog(Logger.DEBUG)) Core.logger.log(this, "Adding link to
peer " + remotePK,
+ if(Core.logger.shouldLog(Logger.DEBUG,this)) Core.logger.log(this, "Adding
link to peer " + remotePK,
Core.logger.DEBUG);
Core.diagnostics.occurrenceCounting("liveLinks", 1);
synchronized (this) {
Index: Link.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/session/Link.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Link.java 8 Sep 2003 17:03:05 -0000 1.3
+++ Link.java 18 Sep 2003 17:48:12 -0000 1.4
@@ -85,7 +85,7 @@
/**
* Encrypt some bytes in-place for transmission in order
*/
- public void encryptBytes(byte[] data);
+ public void encryptBytes(byte[] data, int offset, int length);
/**
* Wrap the (raw) InputStream given
Index: PlainLink.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/session/PlainLink.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- PlainLink.java 8 Sep 2003 17:03:05 -0000 1.4
+++ PlainLink.java 18 Sep 2003 17:48:12 -0000 1.5
@@ -105,7 +105,7 @@
return is;
}
- public void encryptBytes(byte[] b) {
+ public void encryptBytes(byte[] b, int offset, int length) {
// Do nothing!
}
_______________________________________________
cvs mailing list
[EMAIL PROTECTED]
http://dodo.freenetproject.org/cgi-bin/mailman/listinfo/cvs
