Update of /cvsroot/freenet/freenet/src/freenet
In directory sc8-pr-cvs1:/tmp/cvs-serv13416/src/freenet
Modified Files:
MessageObject.java OpenConnectionManager.java
Presentation.java DSAAuthentity.java Storables.java
PresentationHandler.java TransportHandler.java Address.java
Peer.java PeerPacket.java Key.java ConnectionHandler.java
NullIdentity.java RawMessage.java ListeningAddress.java
Message.java MessageHandler.java Core.java PeerHandler.java
DSAIdentity.java MessageSendCallback.java
Log Message:
No functional changes. Fix lots of warnings from Eclipse about imports. Should speed
up compilation slightly, beautify code slightly.
Index: MessageObject.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/MessageObject.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -w -r1.1.1.1 -r1.2
--- MessageObject.java 13 Jan 2002 05:24:00 -0000 1.1.1.1
+++ MessageObject.java 30 Oct 2003 01:34:00 -0000 1.2
@@ -1,5 +1,4 @@
package freenet;
-import freenet.node.Node;
/**
* The MessageObject interface represents any object that can be
Index: OpenConnectionManager.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/OpenConnectionManager.java,v
retrieving revision 1.150
retrieving revision 1.151
diff -u -w -r1.150 -r1.151
--- OpenConnectionManager.java 29 Oct 2003 10:52:35 -0000 1.150
+++ OpenConnectionManager.java 30 Oct 2003 01:34:00 -0000 1.151
@@ -1,33 +1,31 @@
/* -*- Mode: java; c-basic-indent: 4; tab-width: 4 -*- */
package freenet;
-import freenet.thread.ThreadFactory;
-import freenet.node.Main;
-import freenet.node.NodeReference;
-import freenet.node.Node;
-import freenet.session.*;
-import freenet.support.Logger;
-import freenet.support.MultiValueTable;
-import freenet.support.LRUQueue;
-import freenet.support.io.NIOInputStream;
-import freenet.transport.tcpConnection;
-
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.PrintWriter;
import java.text.NumberFormat;
import java.util.Collections;
+import java.util.Date;
+import java.util.Enumeration;
import java.util.HashSet;
import java.util.Hashtable;
import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
-import java.util.Enumeration;
-import java.util.Date;
-import java.io.OutputStream;
-import java.io.IOException;
-import java.io.PrintWriter;
import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import sun.rmi.transport.proxy.HttpReceiveSocket;
+import freenet.node.Main;
+import freenet.node.Node;
+import freenet.node.NodeReference;
+import freenet.session.Link;
+import freenet.session.LinkManager;
+import freenet.support.LRUQueue;
+import freenet.support.Logger;
+import freenet.support.MultiValueTable;
+import freenet.support.io.NIOInputStream;
+import freenet.thread.ThreadFactory;
+import freenet.transport.tcpConnection;
//import sun.rmi.transport.proxy.HttpReceiveSocket;
@@ -905,10 +903,10 @@
Presentation presentation = p.getPresentation();
try {
- if(logDEBUG) core.logger.log(OpenConnectionManager.this,
+ if(logDEBUG) Core.logger.log(OpenConnectionManager.this,
" blocked connections " +
blockedConnectionCount,
- core.logger.DEBUGGING);
+ Logger.DEBUGGING);
// IMPORTANT:
// The connect() call below can block for
// a long time before failing
@@ -960,28 +958,28 @@
core.identity,
p.getIdentity(), c);
if(logDEBUG)
- core.logger.log(OpenConnectionManager.this,
+ Core.logger.log(OpenConnectionManager.this,
"Connection between: "
+ l.getMyAddress() +
" and " + l.getPeerAddress()+
" ("+this+","+c+")",
- core.logger.DEBUG);
+ Logger.DEBUG);
/* OutputStream */ crypt = l.getOutputStream();
int j = presentation.designatorNum();
if(logDEBUG)
- core.logger.log(this, "Got OStream, writing control " + c,
Logger.DEBUG);
+ Core.logger.log(this, "Got OStream, writing control " + c,
Logger.DEBUG);
crypt.write((j >> 8) & 0xff);
crypt.write(j & 0xff);
if(logDEBUG)
- core.logger.log(this, "Written control bytes, flushing " + c,
Logger.DEBUG);
+ Core.logger.log(this, "Written control bytes, flushing " + c,
Logger.DEBUG);
l.getOutputStream().flush();
//crypt.flush(); or here, we might as well wait
c.enableThrottle();
ch = new ConnectionHandler(OpenConnectionManager.this,
presentation, l,
core.ticker(),
- 3, core.maxPadding, true,
+ 3, Core.maxPadding, true,
Node.sendingQueueLength,
Node.sendingQueueBytes);
if(logDEBUG) Core.logger.log(this, "Got ConnectionHandler: "+
@@ -1012,8 +1010,8 @@
Core.logger.log(this, "connectingTime: "+connectingTime+
" at "+now+" ("+this+")",
connectingTime > 500 ?
- Core.logger.MINOR : Core.logger.DEBUG);
- core.diagnostics.occurrenceContinuous("connectingTime",
+ Logger.MINOR : Logger.DEBUG);
+ Core.diagnostics.occurrenceContinuous("connectingTime",
connectingTime);
connected = true;
@@ -1044,7 +1042,7 @@
p.getIdentity(),
e.getMessage(),
false);
- core.logger.log(OpenConnectionManager.this,
+ Core.logger.log(OpenConnectionManager.this,
"[LOOPING (A)!]Transport level connect "+
"failed to: "+ p.getAddress() + " -- " +
e+" ("+this+","+c+","+ch+")", e, Logger.NORMAL);
@@ -1053,7 +1051,7 @@
this.e = new ConnectFailedException(e);
e.setIdentity(p.getIdentity());
if(logDEBUG)
- core.logger.log(OpenConnectionManager.this,
+ Core.logger.log(OpenConnectionManager.this,
"Transport level connect failed to: "
+ p.getAddress() + " -- " + e+" ("+
this+","+ch+")", Logger.DEBUG);
@@ -1062,7 +1060,7 @@
this.e = e;
e.setIdentity(p.getIdentity());
if(logDEBUG)
- core.logger.log(OpenConnectionManager.this,
+ Core.logger.log(OpenConnectionManager.this,
"Transport level connect failed to: "
+ p.getAddress() + " -- " + e+" ("+
this+","+ch+")", Logger.DEBUG);
@@ -1090,22 +1088,22 @@
//}
} catch (NegotiationFailedException e) {
this.e = e;
- if(core.logger.shouldLog(Logger.MINOR,this))
- core.logger.log(OpenConnectionManager.this,
+ if(Core.logger.shouldLog(Logger.MINOR,this))
+ Core.logger.log(OpenConnectionManager.this,
"Negotiation failed with: "
+ p.getAddress() + " -- " + e+" ("+
this+","+ch+")", Logger.MINOR);
//e, Logger.MINOR);
} catch (AuthenticationFailedException e) {
this.e = e;
- if(core.logger.shouldLog(Logger.MINOR,this))
- core.logger.log(OpenConnectionManager.this,
+ if(Core.logger.shouldLog(Logger.MINOR,this))
+ Core.logger.log(OpenConnectionManager.this,
"Authentication failed with: "
+ p.getAddress() + " -- " + e+" ("+
this+","+ch+")", Logger.MINOR);
//e, Logger.MINOR);
//} catch (IOException e) {
- // core.logger.log(OpenConnectionManager.this,
+ // Core.logger.log(OpenConnectionManager.this,
// "I/O error during negotiation with: "
// + p.getAddress(),
// e, Logger.MINOR);
@@ -1115,7 +1113,7 @@
p.getIdentity(),
e.getMessage(),
true);
- core.logger.log(OpenConnectionManager.this,
+ Core.logger.log(OpenConnectionManager.this,
"Unknown exception "+e+
" while connecting to: "+ p.getAddress()+
" ("+this+","+ch+")", e, Logger.ERROR);
@@ -1124,12 +1122,12 @@
if (connected) {
if(logDEBUG)
- core.logger.log(this, "Connected: "+p.getAddress()+" "+this+
+ Core.logger.log(this, "Connected: "+p.getAddress()+" "+this+
" : "+ch, Logger.DEBUG);
try {
ch.configRSL(tcpConnection.getRSL());
ch.registerOCM(); // AFTER flushOut() and configWSL
- if(logDEBUG) core.logger.log(this, "Flushed "+this+","+ch,
+ if(logDEBUG) Core.logger.log(this, "Flushed "+this+","+ch,
Logger.DEBUG);
java.net.Socket sock;
@@ -1162,7 +1160,7 @@
p.getIdentity(),
e.getMessage(),
false);
- core.logger.log(OpenConnectionManager.this,
+ Core.logger.log(OpenConnectionManager.this,
"[LOOPING (B)!]Transport level connect "+
"failed to: "+ p.getAddress() +
" -- " + e+" ("+this+","+c+","+ch+")",
Index: Presentation.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/Presentation.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -w -r1.3 -r1.4
--- Presentation.java 19 Jun 2003 13:31:14 -0000 1.3
+++ Presentation.java 30 Oct 2003 01:34:01 -0000 1.4
@@ -1,11 +1,9 @@
package freenet;
-import freenet.support.io.DiscontinueInputStream;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.IOException;
import java.io.EOFException;
-import java.lang.CharSequence;
+import java.io.InputStream;
+
+import freenet.support.io.DiscontinueInputStream;
/**
* Implementations of Presentation are used to handle connections
Index: DSAAuthentity.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/DSAAuthentity.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- DSAAuthentity.java 27 Oct 2003 14:45:17 -0000 1.2
+++ DSAAuthentity.java 30 Oct 2003 01:34:01 -0000 1.3
@@ -1,6 +1,5 @@
package freenet;
import freenet.crypt.*;
-import freenet.support.Fields;
import java.math.BigInteger;
import java.util.Random;
@@ -65,7 +64,7 @@
* Returns the signature of the byte digest.
*/
public CryptoElement sign(byte[] digest) {
- return sign(Util.byteArrayToMPI(digest));
+ return sign(new BigInteger(1, digest));
}
public CryptoElement sign(BigInteger b) {
Index: Storables.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/Storables.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -w -r1.8 -r1.9
--- Storables.java 8 Oct 2003 23:31:17 -0000 1.8
+++ Storables.java 30 Oct 2003 01:34:01 -0000 1.9
@@ -87,7 +87,7 @@
Digest ctx = SHA1.getInstance();
hashUpdate(ctx, new String[] {"Signature"});
BigInteger k = Util.generateLargeRandom(80, 160, r);
- BigInteger m = Util.byteArrayToMPI(ctx.digest());
+ BigInteger m = new BigInteger(1, ctx.digest());
setSignature(DSA.sign(p.getGroup(), sk, k, m));
}
@@ -97,7 +97,7 @@
public boolean verifies() {
Digest ctx = SHA1.getInstance();
hashUpdate(ctx, new String[] {"Signature"});
- BigInteger m = Util.byteArrayToMPI(ctx.digest());
+ BigInteger m = new BigInteger(1, ctx.digest());
return DSA.verify(getPublicKey(), getSignature(), m);
}
Index: PresentationHandler.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/PresentationHandler.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -w -r1.1.1.1 -r1.2
--- PresentationHandler.java 13 Jan 2002 05:24:01 -0000 1.1.1.1
+++ PresentationHandler.java 30 Oct 2003 01:34:01 -0000 1.2
@@ -1,8 +1,8 @@
package freenet;
-import freenet.support.*;
-import freenet.session.*;
import java.util.Enumeration;
import java.util.Hashtable;
+
+import freenet.support.Selector;
public class PresentationHandler {
Index: TransportHandler.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/TransportHandler.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- TransportHandler.java 3 Nov 2002 19:14:13 -0000 1.2
+++ TransportHandler.java 30 Oct 2003 01:34:01 -0000 1.3
@@ -1,9 +1,9 @@
package freenet;
import java.util.Enumeration;
-import java.util.StringTokenizer;
import java.util.Hashtable;
-import freenet.crypt.*;
-import freenet.support.*;
+import java.util.StringTokenizer;
+
+import freenet.support.Selector;
/**
*
* This class handles the abstraction of Transport objects, and the support
Index: Address.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/Address.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -w -r1.4 -r1.5
--- Address.java 12 Mar 2003 20:15:57 -0000 1.4
+++ Address.java 30 Oct 2003 01:34:01 -0000 1.5
@@ -1,7 +1,5 @@
package freenet;
-import java.io.IOException;
-
public abstract class Address extends AddressBase {
protected Address(Transport t) {
Index: Peer.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/Peer.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -w -r1.4 -r1.5
--- Peer.java 23 Sep 2003 00:55:10 -0000 1.4
+++ Peer.java 30 Oct 2003 01:34:01 -0000 1.5
@@ -1,6 +1,5 @@
package freenet;
-import java.util.Hashtable;
import freenet.session.*;
//import freenet.node.NodeReference; // I don't like importing this here, but wtf
Index: PeerPacket.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/PeerPacket.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -w -r1.12 -r1.13
--- PeerPacket.java 20 Oct 2003 17:02:42 -0000 1.12
+++ PeerPacket.java 30 Oct 2003 01:34:01 -0000 1.13
@@ -1,9 +1,12 @@
package freenet;
-import freenet.session.Link;
-import java.io.OutputStream;
import java.io.IOException;
-import freenet.Core;
-import freenet.message.*;
+
+import freenet.message.DataInsert;
+import freenet.message.DataReply;
+import freenet.message.Identify;
+import freenet.message.QueryRejected;
+import freenet.message.Request;
+import freenet.session.Link;
import freenet.support.Logger;
class PeerPacket {
Index: Key.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/Key.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -w -r1.6 -r1.7
--- Key.java 22 Jul 2003 03:15:38 -0000 1.6
+++ Key.java 30 Oct 2003 01:34:01 -0000 1.7
@@ -1,12 +1,17 @@
package freenet;
-import freenet.support.*;
-import freenet.support.io.*;
-import freenet.crypt.*;
-import java.lang.reflect.*;
-import java.util.Hashtable;
import java.io.InputStream;
-import java.math.BigInteger;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
+import java.util.Hashtable;
+
+import freenet.crypt.ProgressiveHashInputStream;
+import freenet.crypt.SHA1;
+import freenet.support.Fields;
+import freenet.support.Logger;
+import freenet.support.Measurable;
+import freenet.support.io.DataNotValidIOException;
+import freenet.support.io.VerifyingInputStream;
/**
* A base implementation of all keys. Used as superclass for other types,
Index: ConnectionHandler.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/ConnectionHandler.java,v
retrieving revision 1.202
retrieving revision 1.203
diff -u -w -r1.202 -r1.203
--- ConnectionHandler.java 28 Oct 2003 03:11:15 -0000 1.202
+++ ConnectionHandler.java 30 Oct 2003 01:34:01 -0000 1.203
@@ -1,20 +1,36 @@
/* -*- Mode: java; c-basic-indent: 4; tab-width: 4 -*- */
package freenet;
//import freenet.transport.VoidAddress;
-import freenet.crypt.EntropySource;
-import freenet.message.*;
-import freenet.node.*;
-import freenet.session.*;
-import freenet.support.*;
-import freenet.support.io.*;
-//import freenet.thread.*;
-import freenet.transport.*;
-import java.util.*;
-import java.nio.*;
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.UnsupportedEncodingException;
import java.net.Socket;
-import java.nio.channels.SelectableChannel;
+import java.nio.BufferOverflowException;
+import java.nio.ByteBuffer;
import java.nio.channels.SocketChannel;
-import java.io.*;
+import java.util.LinkedList;
+
+import freenet.crypt.EntropySource;
+import freenet.message.HTLMessage;
+import freenet.message.Identify;
+import freenet.node.Main;
+import freenet.node.Node;
+import freenet.node.NodeReference;
+import freenet.session.FnpLink;
+import freenet.session.Link;
+import freenet.session.LinkManager;
+import freenet.session.PlainLink;
+import freenet.support.Irreversible;
+import freenet.support.IrreversibleException;
+import freenet.support.Logger;
+import freenet.support.io.DiscontinueInputStream;
+import freenet.support.io.NullInputStream;
+import freenet.transport.NIOReader;
+import freenet.transport.NIOWriter;
+import freenet.transport.ReadSelectorLoop;
+import freenet.transport.WriteSelectorLoop;
+import freenet.transport.tcpConnection;
/*
* This code is part of the Java Adaptive Network Client by Ian Clarke.
@@ -1324,7 +1340,7 @@
}
twcb = cb;
// Send the data
- sendBytes(block, offset, length, wsl.TRAILER);
+ sendBytes(block, offset, length, WriteSelectorLoop.TRAILER);
}
}
Index: NullIdentity.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/NullIdentity.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- NullIdentity.java 25 Feb 2003 21:46:21 -0000 1.2
+++ NullIdentity.java 30 Oct 2003 01:34:01 -0000 1.3
@@ -1,9 +1,9 @@
package freenet;
-import freenet.support.Comparable;
-import freenet.crypt.CryptoKey;
-import freenet.crypt.CryptoElement;
import java.math.BigInteger;
+
+import freenet.crypt.CryptoElement;
+import freenet.crypt.CryptoKey;
/**
* This is an Identity implementation that represents an entity
Index: RawMessage.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/RawMessage.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- RawMessage.java 4 Jul 2003 06:33:00 -0000 1.2
+++ RawMessage.java 30 Oct 2003 01:34:01 -0000 1.3
@@ -18,11 +18,10 @@
**/
package freenet;
-import freenet.support.*;
+import java.io.IOException;
+import java.io.OutputStream;
+
import freenet.support.io.DiscontinueInputStream;
-import java.io.*;
-import java.io.EOFException;
-import java.util.*;
public abstract class RawMessage {
Index: ListeningAddress.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/ListeningAddress.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- ListeningAddress.java 19 Jun 2003 13:31:14 -0000 1.2
+++ ListeningAddress.java 30 Oct 2003 01:34:01 -0000 1.3
@@ -1,7 +1,5 @@
package freenet;
-import java.io.IOException;
-
/**
* Listening Addresses represent are our abstraction of the port in tcp.
* I guess if you had a telephone based tranport you could use the local
Index: Message.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/Message.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -w -r1.11 -r1.12
--- Message.java 24 Oct 2003 02:24:57 -0000 1.11
+++ Message.java 30 Oct 2003 01:34:01 -0000 1.12
@@ -1,11 +1,10 @@
package freenet;
+import freenet.client.ClientMessageObject;
+import freenet.node.BadStateException;
import freenet.node.Node;
import freenet.node.NodeMessageObject;
import freenet.node.State;
-import freenet.node.BadStateException;
-import freenet.client.ClientMessageObject;
-import freenet.support.Fields;
/**
* Messages represent message objects that can be turned into rawmessages
@@ -13,7 +12,6 @@
*
* @author oskar
*/
-
public abstract class Message implements NodeMessageObject,
ClientMessageObject {
Index: MessageHandler.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/MessageHandler.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -w -r1.5 -r1.6
--- MessageHandler.java 14 Oct 2003 00:43:14 -0000 1.5
+++ MessageHandler.java 30 Oct 2003 01:34:01 -0000 1.6
@@ -3,6 +3,8 @@
import java.lang.reflect.*;
import java.util.Hashtable;
import java.io.PrintStream;
+
+import freenet.support.Logger;
/**
* MessageHandlers are responsible for handeling Messages and other
* MessageObjects. They should make sure that all MessageObjects are
@@ -97,7 +99,7 @@
MessageHandler.class,
"MessageFactory.java, Message constructor threw exception.",
e.getTargetException(),
- Core.logger.ERROR
+ Logger.ERROR
);
throw new InvalidMessageException(
"Message constructor threw unknown exception."
@@ -106,12 +108,12 @@
} catch(InstantiationException e) {
Core.logger.log(MessageHandler.class,
"MesageFactory threw exception.", e,
- Core.logger.ERROR);
+ Logger.ERROR);
throw new InvalidMessageException("Unknown Error");
} catch (IllegalAccessException e) {
Core.logger.log(MessageHandler.class,
"MesageFactory threw exception.", e,
- Core.logger.ERROR);
+ Logger.ERROR);
throw new InvalidMessageException("Unknown Error");
}
Index: Core.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/Core.java,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -w -r1.50 -r1.51
--- Core.java 28 Oct 2003 05:09:53 -0000 1.50
+++ Core.java 30 Oct 2003 01:34:01 -0000 1.51
@@ -1,18 +1,27 @@
/* -*- Mode: java; c-basic-indent: 4; indent-tabs-mode: nil -*- */
package freenet;
-import freenet.interfaces.Interface;
+import java.io.File;
+import java.io.IOException;
+import java.io.PrintStream;
+
+import freenet.config.Config;
+import freenet.config.Params;
+import freenet.crypt.CryptoElement;
+import freenet.crypt.Digest;
+import freenet.crypt.RandomSource;
+import freenet.crypt.SHA1;
+import freenet.crypt.Yarrow;
+import freenet.diagnostics.AutoPoll;
+import freenet.diagnostics.Diagnostics;
+import freenet.diagnostics.VoidDiagnostics;
import freenet.interfaces.NIOInterface;
-import freenet.transport.*;
-import freenet.support.*;
-import freenet.thread.*;
-import freenet.session.*;
-import freenet.crypt.*;
-import freenet.config.*;
-import freenet.diagnostics.*;
-import java.util.*;
-import java.io.*;
-
+import freenet.support.Fields;
+import freenet.support.Irreversible;
+import freenet.support.IrreversibleException;
+import freenet.support.KeyHistogram;
+import freenet.support.Logger;
+import freenet.transport.ListenSelectorLoop;
/*
This code is part of the Java Adaptive Network Client by Ian Clarke.
@@ -630,7 +639,7 @@
CryptoElement sig = privateKey.sign(b);
if (field != null)
- fs.add(field, sig.writeAsField());
+ fs.put(field, sig.writeAsField());
return sig;
}
Index: PeerHandler.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/PeerHandler.java,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -w -r1.38 -r1.39
--- PeerHandler.java 29 Oct 2003 10:52:35 -0000 1.38
+++ PeerHandler.java 30 Oct 2003 01:34:01 -0000 1.39
@@ -1,9 +1,10 @@
/* -*- Mode: java; c-basic-indent: 4; tab-width: 4 -*- */
package freenet;
-import java.util.*;
-import java.io.OutputStream;
import java.io.IOException;
-import freenet.Core;
+import java.util.Hashtable;
+import java.util.Iterator;
+import java.util.LinkedList;
+
import freenet.node.Node;
import freenet.node.NodeReference;
import freenet.session.Link;
Index: DSAIdentity.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/DSAIdentity.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -w -r1.4 -r1.5
--- DSAIdentity.java 24 Sep 2003 03:54:38 -0000 1.4
+++ DSAIdentity.java 30 Oct 2003 01:34:01 -0000 1.5
@@ -3,6 +3,8 @@
import freenet.crypt.*;
import freenet.support.Fields;
+import freenet.support.Logger;
+
import java.math.BigInteger;
import java.io.InputStream;
import java.io.IOException;
@@ -103,7 +105,7 @@
} catch (NumberFormatException e) {
Core.logger.log(this, "Signature check failed as signature was " +
- "not DSA: " + e.getMessage(),Core.logger.MINOR);
+ "not DSA: " + e.getMessage(),Logger.MINOR);
return false;
}
}
@@ -115,7 +117,7 @@
// above could be another nodes fault, but if we created a
// signature element of the wrong type we are fucking up.
Core.logger.log(this, "Signature check failed as signature was " +
- "not DSA.",Core.logger.ERROR);
+ "not DSA.",Logger.ERROR);
return false;
}
}
Index: MessageSendCallback.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/MessageSendCallback.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -w -r1.3 -r1.4
--- MessageSendCallback.java 4 Oct 2003 01:16:55 -0000 1.3
+++ MessageSendCallback.java 30 Oct 2003 01:34:01 -0000 1.4
@@ -1,7 +1,6 @@
package freenet;
import freenet.support.ExceptionCallback;
-import java.io.OutputStream;
public interface MessageSendCallback extends ExceptionCallback {
void setTrailerWriter(TrailerWriter tw); // must be called BEFORE the terminal
success() or thrown()
_______________________________________________
cvs mailing list
[EMAIL PROTECTED]
http://dodo.freenetproject.org/cgi-bin/mailman/listinfo/cvs
