Author: toad
Date: 2007-06-28 19:10:04 +0000 (Thu, 28 Jun 2007)
New Revision: 13814
Modified:
trunk/freenet/src/freenet/clients/http/DarknetConnectionsToadlet.java
trunk/freenet/src/freenet/node/CHKInsertSender.java
trunk/freenet/src/freenet/node/DNSRequester.java
trunk/freenet/src/freenet/node/IPDetectorPluginManager.java
trunk/freenet/src/freenet/node/LocationManager.java
trunk/freenet/src/freenet/node/Node.java
trunk/freenet/src/freenet/node/NodeDispatcher.java
trunk/freenet/src/freenet/node/NodeIPDetector.java
trunk/freenet/src/freenet/node/NodeStats.java
trunk/freenet/src/freenet/node/PacketSender.java
trunk/freenet/src/freenet/node/PeerNode.java
trunk/freenet/src/freenet/node/SSKInsertSender.java
trunk/freenet/src/freenet/node/TestnetHandler.java
trunk/freenet/src/freenet/node/TextModeClientInterface.java
trunk/freenet/src/freenet/node/fcp/AddPeer.java
trunk/freenet/src/freenet/node/simulator/RealNodeRequestInsertTest.java
trunk/freenet/src/freenet/node/simulator/RealNodeRoutingTest.java
trunk/freenet/src/freenet/node/useralerts/IPUndetectedUserAlert.java
Log:
portNumber -> darknetPortNumber, sock -> darknetSocket, packetMangler ->
darknetPacketMangler
Modified: trunk/freenet/src/freenet/clients/http/DarknetConnectionsToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/DarknetConnectionsToadlet.java
2007-06-28 18:59:26 UTC (rev 13813)
+++ trunk/freenet/src/freenet/clients/http/DarknetConnectionsToadlet.java
2007-06-28 19:10:04 UTC (rev 13814)
@@ -122,7 +122,7 @@
}
DarknetPeerNode pn;
try {
- pn = new DarknetPeerNode(fs, node, node.peers,
false, node.packetMangler);
+ pn = new DarknetPeerNode(fs, node, node.peers,
false, node.darknetPacketMangler);
pn.setPrivateDarknetCommentNote(privateComment);
} catch (FSParseException e1) {
this.sendErrorPage(ctx, 200,
l10n("failedToAddNodeTitle"),
Modified: trunk/freenet/src/freenet/node/CHKInsertSender.java
===================================================================
--- trunk/freenet/src/freenet/node/CHKInsertSender.java 2007-06-28 18:59:26 UTC
(rev 13813)
+++ trunk/freenet/src/freenet/node/CHKInsertSender.java 2007-06-28 19:10:04 UTC
(rev 13814)
@@ -137,7 +137,7 @@
}
void start() {
- Thread t = new Thread(this, "CHKInsertSender for UID "+uid+" on
"+node.portNumber+" at "+System.currentTimeMillis());
+ Thread t = new Thread(this, "CHKInsertSender for UID "+uid+" on
"+node.darknetPortNumber+" at "+System.currentTimeMillis());
t.setDaemon(true);
t.start();
}
Modified: trunk/freenet/src/freenet/node/DNSRequester.java
===================================================================
--- trunk/freenet/src/freenet/node/DNSRequester.java 2007-06-28 18:59:26 UTC
(rev 13813)
+++ trunk/freenet/src/freenet/node/DNSRequester.java 2007-06-28 19:10:04 UTC
(rev 13814)
@@ -19,7 +19,7 @@
DNSRequester(Node node) {
this.node = node;
- myThread = new Thread(this, "DNSRequester thread for
"+node.portNumber);
+ myThread = new Thread(this, "DNSRequester thread for
"+node.darknetPortNumber);
myThread.setDaemon(true);
}
Modified: trunk/freenet/src/freenet/node/IPDetectorPluginManager.java
===================================================================
--- trunk/freenet/src/freenet/node/IPDetectorPluginManager.java 2007-06-28
18:59:26 UTC (rev 13813)
+++ trunk/freenet/src/freenet/node/IPDetectorPluginManager.java 2007-06-28
19:10:04 UTC (rev 13814)
@@ -45,7 +45,7 @@
div.addChild("#", text);
if(suggestPortForward) {
L10n.addL10nSubstitution(div,
"IPDetectorPluginManager.suggestForwardPortWithLink", new String[] { "link",
"/link", "port" },
- new String[] { "<a
href=\"/?_CHECKED_HTTP_=http://wiki.freenetproject.org/FirewallAndRouterIssues\";>",
"</a>", Integer.toString(node.portNumber) });
+ new String[] { "<a
href=\"/?_CHECKED_HTTP_=http://wiki.freenetproject.org/FirewallAndRouterIssues\";>",
"</a>", Integer.toString(node.darknetPortNumber) });
}
return div;
}
@@ -58,7 +58,7 @@
if(!suggestPortForward) return text;
StringBuffer sb = new StringBuffer();
sb.append(text);
- sb.append(l10n("suggestForwardPort", "port",
Integer.toString(node.portNumber)));
+ sb.append(l10n("suggestForwardPort", "port",
Integer.toString(node.darknetPortNumber)));
return sb.toString();
}
Modified: trunk/freenet/src/freenet/node/LocationManager.java
===================================================================
--- trunk/freenet/src/freenet/node/LocationManager.java 2007-06-28 18:59:26 UTC
(rev 13813)
+++ trunk/freenet/src/freenet/node/LocationManager.java 2007-06-28 19:10:04 UTC
(rev 13814)
@@ -197,7 +197,7 @@
*/
private void startSwapRequest() {
Thread t = new Thread(new OutgoingSwapRequestHandler(),
- "Outgoing swap request handler for port "+node.portNumber);
+ "Outgoing swap request handler for port
"+node.darknetPortNumber);
t.setDaemon(true);
t.start();
}
@@ -569,7 +569,7 @@
if(logMINOR) Logger.minor(this, "Already locked");
return false;
}
- if(logMINOR) Logger.minor(this, "Locking on port "+node.portNumber);
+ if(logMINOR) Logger.minor(this, "Locking on port
"+node.darknetPortNumber);
locked = true;
lockedTime = System.currentTimeMillis();
return true;
@@ -581,7 +581,7 @@
locked = false;
long lockTime = System.currentTimeMillis() - lockedTime;
if(logMINOR) {
- Logger.minor(this, "Unlocking on port "+node.portNumber);
+ Logger.minor(this, "Unlocking on port "+node.darknetPortNumber);
Logger.minor(this, "lockTime: "+lockTime);
}
}
@@ -762,7 +762,7 @@
IncomingSwapRequestHandler isrh =
new IncomingSwapRequestHandler(m, pn, item);
if(logMINOR) Logger.minor(this, "Handling... "+uid);
- Thread t = new Thread(isrh, "Incoming swap request handler for
port "+node.portNumber);
+ Thread t = new Thread(isrh, "Incoming swap request handler for
port "+node.darknetPortNumber);
t.setDaemon(true);
t.start();
return true;
Modified: trunk/freenet/src/freenet/node/Node.java
===================================================================
--- trunk/freenet/src/freenet/node/Node.java 2007-06-28 18:59:26 UTC (rev
13813)
+++ trunk/freenet/src/freenet/node/Node.java 2007-06-28 19:10:04 UTC (rev
13814)
@@ -260,9 +260,6 @@
static final long TESTNET_MIN_MAX_ZIPPED_LOGFILES = 512*1024*1024;
static final String TESTNET_MIN_MAX_ZIPPED_LOGFILES_STRING = "512M";
- // FIXME: abstract out address stuff? Possibly to something like
NodeReference?
- final int portNumber;
-
/** Datastore directory */
private final File storeDir;
@@ -373,8 +370,10 @@
/** The object which handles incoming messages and allows us to wait
for them */
final MessageCore usm;
/** The object which handles our specific UDP port, pulls messages from
it, feeds them to the packet mangler for decryption etc */
- final UdpSocketHandler sock;
- public final FNPPacketMangler packetMangler;
+ final UdpSocketHandler darknetSocket;
+ public final FNPPacketMangler darknetPacketMangler;
+ // FIXME: abstract out address stuff? Possibly to something like
NodeReference?
+ final int darknetPortNumber;
final DNSRequester dnsr;
public final PacketSender ps;
final NodeDispatcher dispatcher;
@@ -490,7 +489,7 @@
e1.initCause(e);
throw e1;
}
- if(p.getPort() == portNumber) {
+ if(p.getPort() == darknetPortNumber) {
// DNSRequester doesn't deal with our
own node
ipDetector.setOldIPAddress(p.getFreenetAddress());
break;
@@ -590,7 +589,7 @@
}
public void writeNodeFile() {
- writeNodeFile(new File(nodeDir, "node-"+portNumber), new
File(nodeDir, "node-"+portNumber+".bak"));
+ writeNodeFile(new File(nodeDir, "node-"+darknetPortNumber), new
File(nodeDir, "node-"+darknetPortNumber+".bak"));
}
private void writeNodeFile(File orig, File backup) {
@@ -624,7 +623,7 @@
private void initNodeFileSettings(RandomSource r) {
Logger.normal(this, "Creating new node file from scratch");
- // Don't need to set portNumber
+ // Don't need to set darknetPortNumber
// FIXME use a real IP!
myIdentity = new byte[32];
r.nextBytes(myIdentity);
@@ -774,7 +773,7 @@
nodeConfig.register("listenPort", -1 /* means random */,
sortOrder++, true, true, "Node.port", "Node.portLong", new IntCallback() {
public int get() {
- return portNumber;
+ return darknetPortNumber;
}
public void set(int val) throws
InvalidConfigValueException {
// FIXME implement on the fly
listenPort changing
@@ -825,27 +824,27 @@
throw new
NodeInitException(EXIT_IMPOSSIBLE_USM_PORT, "Could not bind to port: "+port+"
(node already running?)");
}
}
- sock = u;
+ darknetSocket = u;
Logger.normal(this, "FNP port created on "+bindto+ ':' +port);
System.out.println("FNP port created on "+bindto+ ':' +port);
- portNumber = port;
+ darknetPortNumber = port;
nodeConfig.register("testingDropPacketsEvery", 0, sortOrder++,
true, false, "Node.dropPacketEvery", "Node.dropPacketEveryLong",
new IntCallback() {
public int get() {
- return
((UdpSocketHandler)sock).getDropProbability();
+ return
((UdpSocketHandler)darknetSocket).getDropProbability();
}
public void set(int val) throws
InvalidConfigValueException {
-
((UdpSocketHandler)sock).setDropProbability(val);
+
((UdpSocketHandler)darknetSocket).setDropProbability(val);
}
});
int dropProb = nodeConfig.getInt("testingDropPacketsEvery");
- ((UdpSocketHandler)sock).setDropProbability(dropProb);
+ ((UdpSocketHandler)darknetSocket).setDropProbability(dropProb);
Logger.normal(Node.class, "Creating node...");
@@ -979,10 +978,10 @@
// After we have set up testnet and IP address, load the node
file
try {
// FIXME should take file directly?
- readNodeFile(new File(nodeDir,
"node-"+portNumber).getPath(), random);
+ readNodeFile(new File(nodeDir,
"node-"+darknetPortNumber).getPath(), random);
} catch (IOException e) {
try {
- readNodeFile(new
File("node-"+portNumber+".bak").getPath(), random);
+ readNodeFile(new
File("node-"+darknetPortNumber+".bak").getPath(), random);
} catch (IOException e1) {
initNodeFileSettings(random);
}
@@ -996,15 +995,15 @@
}
usm.setDispatcher(dispatcher=new NodeDispatcher(this));
- sock.setLowLevelFilter(packetMangler = new
FNPPacketMangler(this, sock));
+ darknetSocket.setLowLevelFilter(darknetPacketMangler = new
FNPPacketMangler(this, darknetSocket));
// Then read the peers
- peers = new PeerManager(this, new File(nodeDir,
"peers-"+portNumber).getPath(), packetMangler);
+ peers = new PeerManager(this, new File(nodeDir,
"peers-"+darknetPortNumber).getPath(), darknetPacketMangler);
peers.writePeers();
peers.updatePMUserAlert();
// Extra Peer Data Directory
- nodeConfig.register("extraPeerDataDir", new File(nodeDir,
"extra-peer-data-"+portNumber).toString(), sortOrder++, true, false,
"Node.extraPeerDir", "Node.extraPeerDirLong",
+ nodeConfig.register("extraPeerDataDir", new File(nodeDir,
"extra-peer-data-"+darknetPortNumber).toString(), sortOrder++, true, false,
"Node.extraPeerDir", "Node.extraPeerDirLong",
new StringCallback() {
public String get() {
return
extraPeerDataDir.getPath();
@@ -1129,7 +1128,7 @@
envConfig.setLockTimeout(600*1000*1000); // should be long
enough even for severely overloaded nodes!
// Note that the above is in *MICRO*seconds.
- File dbDir = new File(storeDir, "database-"+portNumber);
+ File dbDir = new File(storeDir, "database-"+darknetPortNumber);
dbDir.mkdirs();
File reconstructFile = new File(dbDir, "reconstruct");
@@ -1139,7 +1138,7 @@
boolean tryDbLoad = false;
- String suffix = "-" + portNumber;
+ String suffix = "-" + darknetPortNumber;
// This can take some time
System.out.println("Starting database...");
@@ -1369,7 +1368,7 @@
nodeStats = new NodeStats(this, sortOrder, new
SubConfig("node.load", config), oldThrottleFS, obwLimit, ibwLimit);
- clientCore = new NodeClientCore(this, config, nodeConfig,
nodeDir, portNumber, sortOrder, oldThrottleFS == null ? null :
oldThrottleFS.subset("RequestStarters"));
+ clientCore = new NodeClientCore(this, config, nodeConfig,
nodeDir, darknetPortNumber, sortOrder, oldThrottleFS == null ? null :
oldThrottleFS.subset("RequestStarters"));
nodeConfig.register("disableHangCheckers", false, sortOrder++,
true, false, "Node.disableHangCheckers", "Node.disableHangCheckersLong", new
BooleanCallback() {
@@ -1447,7 +1446,7 @@
nodeStats.start();
usm.start(ps);
- ((UdpSocketHandler)sock).start(disableHangCheckers);
+ ((UdpSocketHandler)darknetSocket).start(disableHangCheckers);
if(isUsingWrapper()) {
Logger.normal(this, "Using wrapper correctly:
"+nodeStarter);
@@ -1458,8 +1457,8 @@
}
Logger.normal(this, "Freenet 0.7 Build
#"+Version.buildNumber()+" r"+Version.cvsRevision);
System.out.println("Freenet 0.7 Build
#"+Version.buildNumber()+" r"+Version.cvsRevision);
- Logger.normal(this, "FNP port is on "+bindto+ ':' +portNumber);
- System.out.println("FNP port is on "+bindto+ ':' +portNumber);
+ Logger.normal(this, "FNP port is on "+bindto+ ':'
+darknetPortNumber);
+ System.out.println("FNP port is on "+bindto+ ':'
+darknetPortNumber);
// Start services
// SubConfig pluginManagerConfig = new SubConfig("pluginmanager3",
config);
@@ -1719,7 +1718,7 @@
fs.putAppend("physical.udp",
ips[i].toString()); // Keep; important that node know all our IPs
}
// Negotiation types
- int[] negTypes = packetMangler.supportedNegTypes();
+ int[] negTypes = darknetPacketMangler.supportedNegTypes();
fs.put("auth.negTypes", negTypes);
fs.putSingle("identity", Base64.encode(myIdentity)); // FIXME
!forSetup after 11104 is mandatory
fs.put("location", lm.getLocation().getValue()); // FIXME maybe
!forSetup; see #943
@@ -1814,7 +1813,7 @@
*/
public Object makeRequestSender(Key key, short htl, long uid, PeerNode
source, double closestLocation, boolean resetClosestLocation, boolean
localOnly, boolean cache, boolean ignoreStore) {
logMINOR = Logger.shouldLog(Logger.MINOR, this);
- if(logMINOR) Logger.minor(this, "makeRequestSender("+key+ ','
+htl+ ',' +uid+ ',' +source+") on "+portNumber);
+ if(logMINOR) Logger.minor(this, "makeRequestSender("+key+ ','
+htl+ ',' +uid+ ',' +source+") on "+darknetPortNumber);
// In store?
KeyBlock chk = null;
if(!ignoreStore) {
@@ -2574,7 +2573,7 @@
}
public int getFNPPort(){
- return this.portNumber;
+ return this.darknetPortNumber;
}
public int getIdentityHash(){
@@ -2831,15 +2830,15 @@
* Connect this node to another node (for purposes of testing)
*/
public void connect(Node node) throws FSParseException,
PeerParseException, ReferenceSignatureVerificationException {
- peers.connect(node.exportPublicFieldSet(), packetMangler);
+ peers.connect(node.exportPublicFieldSet(),
darknetPacketMangler);
}
public short maxHTL() {
return maxHTL;
}
- public int getPortNumber() {
- return portNumber;
+ public int getDarknetPortNumber() {
+ return darknetPortNumber;
}
public void JEStatsDump() {
Modified: trunk/freenet/src/freenet/node/NodeDispatcher.java
===================================================================
--- trunk/freenet/src/freenet/node/NodeDispatcher.java 2007-06-28 18:59:26 UTC
(rev 13813)
+++ trunk/freenet/src/freenet/node/NodeDispatcher.java 2007-06-28 19:10:04 UTC
(rev 13814)
@@ -234,12 +234,12 @@
long now = System.currentTimeMillis();
if(m.getSpec().equals(DMT.FNPSSKInsertRequest)) {
SSKInsertHandler rh = new SSKInsertHandler(m, id, node,
now);
- Thread t = new Thread(rh, "InsertHandler for "+id+" on
"+node.portNumber);
+ Thread t = new Thread(rh, "InsertHandler for "+id+" on
"+node.darknetPortNumber);
t.setDaemon(true);
t.start();
} else {
InsertHandler rh = new InsertHandler(m, id, node, now);
- Thread t = new Thread(rh, "InsertHandler for "+id+" on
"+node.portNumber);
+ Thread t = new Thread(rh, "InsertHandler for "+id+" on
"+node.darknetPortNumber);
t.setDaemon(true);
t.start();
}
@@ -326,7 +326,7 @@
double target = m.getDouble(DMT.TARGET_LOCATION);
if(logMINOR) Logger.minor(this, "id "+id+" from "+pn+" htl
"+htl+" target "+target);
if(Math.abs(node.lm.getLocation().getValue() - target) <=
Double.MIN_VALUE) {
- if(logMINOR) Logger.minor(this, "Dispatching
"+m.getSpec()+" on "+node.portNumber);
+ if(logMINOR) Logger.minor(this, "Dispatching
"+m.getSpec()+" on "+node.darknetPortNumber);
// Handle locally
// Message type specific processing
dispatchRoutedMessage(m, pn, id);
@@ -380,7 +380,7 @@
continue;
}
} else {
- if(logMINOR) Logger.minor(this, "Reached dead
end for "+m.getSpec()+" on "+node.portNumber);
+ if(logMINOR) Logger.minor(this, "Reached dead
end for "+m.getSpec()+" on "+node.darknetPortNumber);
// Reached a dead end...
Message reject =
DMT.createFNPRoutedRejected(id, htl);
if(pn != null) try {
Modified: trunk/freenet/src/freenet/node/NodeIPDetector.java
===================================================================
--- trunk/freenet/src/freenet/node/NodeIPDetector.java 2007-06-28 18:59:26 UTC
(rev 13813)
+++ trunk/freenet/src/freenet/node/NodeIPDetector.java 2007-06-28 19:10:04 UTC
(rev 13814)
@@ -80,18 +80,18 @@
Vector addresses = new Vector();
if(overrideIPAddress != null) {
// If the IP is overridden, the override has to be the
first element.
- Peer p = new Peer(overrideIPAddress, node.portNumber);
+ Peer p = new Peer(overrideIPAddress,
node.darknetPortNumber);
addresses.add(p);
if(p.getFreenetAddress().isRealInternetAddress(false,
true))
addedValidIP = true;
}
boolean dontDetect = false;
- UdpSocketHandler sock = node.sock;
+ UdpSocketHandler sock = node.darknetSocket;
if(sock != null) {
InetAddress addr = sock.getBindTo();
if(addr != null && (IPUtil.isValidAddress(addr,
false))) {
dontDetect = true;
- Peer p = new Peer(addr, node.portNumber);
+ Peer p = new Peer(addr, node.darknetPortNumber);
if(!addresses.contains(p)) addresses.add(p);
dontDetect = true;
}
@@ -119,7 +119,7 @@
}
for(int i=0;i<detectedAddrs.length;i++) {
- Peer p = new Peer(detectedAddrs[i], node.portNumber);
+ Peer p = new Peer(detectedAddrs[i],
node.darknetPortNumber);
if(!addresses.contains(p)) {
Logger.normal(this, "Detected IP address: "+p);
addresses.add(p);
@@ -132,7 +132,7 @@
for(int i=0;i<pluginDetectedIPs.length;i++) {
InetAddress addr =
pluginDetectedIPs[i].publicAddress;
if(addr == null) continue;
- Peer a = new Peer(new FreenetInetAddress(addr),
node.portNumber);
+ Peer a = new Peer(new FreenetInetAddress(addr),
node.darknetPortNumber);
if(!addresses.contains(a)) {
Logger.normal(this, "Plugin detected IP
address: "+a);
addresses.add(a);
@@ -141,7 +141,7 @@
}
}
if(addresses.isEmpty() && (oldIPAddress != null) &&
!oldIPAddress.equals(overrideIPAddress))
- addresses.add(new Peer(oldIPAddress, node.portNumber));
+ addresses.add(new Peer(oldIPAddress,
node.darknetPortNumber));
// Try to pick it up from our connections
if(node.peers != null) {
PeerNode[] peerList = node.peers.connectedPeers;
@@ -220,7 +220,7 @@
node.clientCore.alerts.unregister(maybeSymmetricAlert);
}
- Peer p = new
Peer(best.getFreenetAddress(), node.portNumber);
+ Peer p = new
Peer(best.getFreenetAddress(), node.darknetPortNumber);
if(!addresses.contains(p))
addresses.add(p);
}
Modified: trunk/freenet/src/freenet/node/NodeStats.java
===================================================================
--- trunk/freenet/src/freenet/node/NodeStats.java 2007-06-28 18:59:26 UTC
(rev 13813)
+++ trunk/freenet/src/freenet/node/NodeStats.java 2007-06-28 19:10:04 UTC
(rev 13814)
@@ -304,7 +304,7 @@
new TokenBucket(Math.max(ibwLimit*60, 32768*20),
(int)((1000L*1000L*1000L) / (ibwLimit *
FRACTION_OF_BANDWIDTH_USED_BY_REQUESTS)), 0);
estimatedSizeOfOneThrottledPacket = 1024 +
DMT.packetTransmitSize(1024, 32) +
- node.packetMangler.fullHeadersLengthOneMessage();
+ node.darknetPacketMangler.fullHeadersLengthOneMessage();
}
protected String l10n(String key) {
Modified: trunk/freenet/src/freenet/node/PacketSender.java
===================================================================
--- trunk/freenet/src/freenet/node/PacketSender.java 2007-06-28 18:59:26 UTC
(rev 13813)
+++ trunk/freenet/src/freenet/node/PacketSender.java 2007-06-28 19:10:04 UTC
(rev 13814)
@@ -49,7 +49,7 @@
resendPackets = new LinkedList();
timedJobsByTime = new TreeMap();
this.node = node;
- myThread = new Thread(this, "PacketSender thread for
"+node.portNumber);
+ myThread = new Thread(this, "PacketSender thread for
"+node.darknetPortNumber);
myThread.setDaemon(true);
myThread.setPriority(Thread.MAX_PRIORITY);
logMINOR = Logger.shouldLog(Logger.MINOR, this);
@@ -226,7 +226,7 @@
if(item == null) continue;
try {
if(logMINOR) Logger.minor(this, "Resending
"+item.packetNumber+" to "+item.kt);
- node.packetMangler.resend(item);
+ node.darknetPacketMangler.resend(item);
mustSend = false;
} catch (KeyChangedException e) {
Logger.error(this, "Caught "+e+" resending packets
to "+kt);
@@ -246,7 +246,7 @@
}
- if(node.packetMangler == null) continue;
+ if(node.darknetPacketMangler == null) continue;
// Any messages to send?
MessageItem[] messages = null;
messages = pn.grabQueuedMessageItems();
@@ -267,7 +267,7 @@
if(logMINOR) Logger.minor(this, "PS
Sending: "+(messages[j].msg == null ? "(not a Message)" :
messages[j].msg.getSpec().getName()));
}
// Send packets, right now, blocking, including
any active notifications
-
node.packetMangler.processOutgoingOrRequeue(messages, pn, true, false);
+
node.darknetPacketMangler.processOutgoingOrRequeue(messages, pn, true, false);
continue;
}
}
@@ -288,14 +288,14 @@
// Force packet to have a sequence number.
Message m = DMT.createFNPVoid();
pn.addToLocalNodeSentMessagesToStatistic(m);
- node.packetMangler.processOutgoingOrRequeue(new
MessageItem[] { new MessageItem(m, null, 0, null) }, pn, true, true);
+ node.darknetPacketMangler.processOutgoingOrRequeue(new
MessageItem[] { new MessageItem(m, null, 0, null) }, pn, true, true);
}
} else {
// Not connected
// Send handshake if necessary
long beforeHandshakeTime = System.currentTimeMillis();
if(pn.shouldSendHandshake())
- node.packetMangler.sendHandshake(pn);
+ node.darknetPacketMangler.sendHandshake(pn);
if(pn.noContactDetails())
pn.startARKFetcher();
long afterHandshakeTime = System.currentTimeMillis();
Modified: trunk/freenet/src/freenet/node/PeerNode.java
===================================================================
--- trunk/freenet/src/freenet/node/PeerNode.java 2007-06-28 18:59:26 UTC
(rev 13813)
+++ trunk/freenet/src/freenet/node/PeerNode.java 2007-06-28 19:10:04 UTC
(rev 13814)
@@ -1789,7 +1789,7 @@
long t = tracker.getNextUrgentTime();
if(t < now) {
try {
- node.packetMangler.processOutgoing(null, 0, 0, tracker, 0);
+ node.darknetPacketMangler.processOutgoing(null, 0, 0,
tracker, 0);
} catch (NotConnectedException e) {
// Ignore
} catch (KeyChangedException e) {
@@ -1804,7 +1804,7 @@
long t = tracker.getNextUrgentTime();
if(t < now) {
try {
- node.packetMangler.processOutgoing(null, 0, 0, tracker, 0);
+ node.darknetPacketMangler.processOutgoing(null, 0, 0,
tracker, 0);
} catch (NotConnectedException e) {
// Ignore
} catch (KeyChangedException e) {
Modified: trunk/freenet/src/freenet/node/SSKInsertSender.java
===================================================================
--- trunk/freenet/src/freenet/node/SSKInsertSender.java 2007-06-28 18:59:26 UTC
(rev 13813)
+++ trunk/freenet/src/freenet/node/SSKInsertSender.java 2007-06-28 19:10:04 UTC
(rev 13814)
@@ -97,7 +97,7 @@
}
void start() {
- Thread t = new Thread(this, "SSKInsertSender for UID "+uid+" on
"+node.portNumber+" at "+System.currentTimeMillis());
+ Thread t = new Thread(this, "SSKInsertSender for UID "+uid+" on
"+node.darknetPortNumber+" at "+System.currentTimeMillis());
t.setDaemon(true);
t.start();
}
Modified: trunk/freenet/src/freenet/node/TestnetHandler.java
===================================================================
--- trunk/freenet/src/freenet/node/TestnetHandler.java 2007-06-28 18:59:26 UTC
(rev 13813)
+++ trunk/freenet/src/freenet/node/TestnetHandler.java 2007-06-28 19:10:04 UTC
(rev 13814)
@@ -255,7 +255,7 @@
if(enabled) {
// Get the testnet port
- testnetConfig.register("port", node.portNumber+1000, 2, true,
false, "TestnetHandler.port", "TestnetHandler.portLong",
+ testnetConfig.register("port", node.darknetPortNumber+1000, 2,
true, false, "TestnetHandler.port", "TestnetHandler.portLong",
new TestnetPortNumberCallback(node));
int port = testnetConfig.getInt("port");
Modified: trunk/freenet/src/freenet/node/TextModeClientInterface.java
===================================================================
--- trunk/freenet/src/freenet/node/TextModeClientInterface.java 2007-06-28
18:59:26 UTC (rev 13813)
+++ trunk/freenet/src/freenet/node/TextModeClientInterface.java 2007-06-28
19:10:04 UTC (rev 13814)
@@ -1016,7 +1016,7 @@
}
PeerNode pn;
try {
- pn = new DarknetPeerNode(fs, n, n.peers, false, n.packetMangler);
+ pn = new DarknetPeerNode(fs, n, n.peers, false,
n.darknetPacketMangler);
} catch (FSParseException e1) {
System.err.println("Did not parse: "+e1);
Logger.error(this, "Did not parse: "+e1, e1);
Modified: trunk/freenet/src/freenet/node/fcp/AddPeer.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/AddPeer.java 2007-06-28 18:59:26 UTC
(rev 13813)
+++ trunk/freenet/src/freenet/node/fcp/AddPeer.java 2007-06-28 19:10:04 UTC
(rev 13814)
@@ -112,7 +112,7 @@
fs.setEndMarker( "End" );
PeerNode pn;
try {
- pn = new DarknetPeerNode(fs, node, node.peers, false,
node.packetMangler);
+ pn = new DarknetPeerNode(fs, node, node.peers, false,
node.darknetPacketMangler);
} catch (FSParseException e) {
throw new
MessageInvalidException(ProtocolErrorMessage.REF_PARSE_ERROR, "Error parsing
ref: "+e.getMessage(), null, false);
} catch (PeerParseException e) {
Modified:
trunk/freenet/src/freenet/node/simulator/RealNodeRequestInsertTest.java
===================================================================
--- trunk/freenet/src/freenet/node/simulator/RealNodeRequestInsertTest.java
2007-06-28 18:59:26 UTC (rev 13813)
+++ trunk/freenet/src/freenet/node/simulator/RealNodeRequestInsertTest.java
2007-06-28 19:10:04 UTC (rev 13814)
@@ -130,7 +130,7 @@
Node randomNode2 = randomNode;
while(randomNode2 == randomNode)
randomNode2 = nodes[random.nextInt(NUMBER_OF_NODES)];
- Logger.normal(RealNodeRoutingTest.class, "Pinging
"+randomNode2.getPortNumber()+" from "+randomNode.getPortNumber());
+ Logger.normal(RealNodeRoutingTest.class, "Pinging
"+randomNode2.getDarknetPortNumber()+" from
"+randomNode.getDarknetPortNumber());
double loc2 = randomNode2.getLocation();
int hopsTaken = randomNode.routedPing(loc2);
pings++;
@@ -139,13 +139,13 @@
avg.report(0.0);
avg2.report(0.0);
double ratio = (double)successes /
((double)(failures+successes));
- Logger.normal(RealNodeRoutingTest.class, "Routed ping
"+pings+" FAILED from "+randomNode.getPortNumber()+" to
"+randomNode2.getPortNumber()+" (long:"+ratio+", short:"+avg.currentValue()+",
vague:"+avg2.currentValue()+ ')');
+ Logger.normal(RealNodeRoutingTest.class, "Routed ping
"+pings+" FAILED from "+randomNode.getDarknetPortNumber()+" to
"+randomNode2.getDarknetPortNumber()+" (long:"+ratio+",
short:"+avg.currentValue()+", vague:"+avg2.currentValue()+ ')');
} else {
successes++;
avg.report(1.0);
avg2.report(1.0);
double ratio = (double)successes /
((double)(failures+successes));
- Logger.normal(RealNodeRoutingTest.class, "Routed ping
"+pings+" success: "+hopsTaken+ ' ' +randomNode.getPortNumber()+" to
"+randomNode2.getPortNumber()+" (long:"+ratio+", short:"+avg.currentValue()+",
vague:"+avg2.currentValue()+ ')');
+ Logger.normal(RealNodeRoutingTest.class, "Routed ping
"+pings+" success: "+hopsTaken+ ' ' +randomNode.getDarknetPortNumber()+" to
"+randomNode2.getDarknetPortNumber()+" (long:"+ratio+",
short:"+avg.currentValue()+", vague:"+avg2.currentValue()+ ')');
}
} catch (Throwable t) {
Logger.error(RealNodeRoutingTest.class, "Caught "+t, t);
Modified: trunk/freenet/src/freenet/node/simulator/RealNodeRoutingTest.java
===================================================================
--- trunk/freenet/src/freenet/node/simulator/RealNodeRoutingTest.java
2007-06-28 18:59:26 UTC (rev 13813)
+++ trunk/freenet/src/freenet/node/simulator/RealNodeRoutingTest.java
2007-06-28 19:10:04 UTC (rev 13814)
@@ -121,7 +121,7 @@
Node randomNode2 = randomNode;
while(randomNode2 == randomNode)
randomNode2 = nodes[random.nextInt(NUMBER_OF_NODES)];
- Logger.normal(RealNodeRoutingTest.class, "Pinging
"+randomNode2.getPortNumber()+" from "+randomNode.getPortNumber());
+ Logger.normal(RealNodeRoutingTest.class, "Pinging
"+randomNode2.getDarknetPortNumber()+" from
"+randomNode.getDarknetPortNumber());
double loc2 = randomNode2.getLocation();
int hopsTaken = randomNode.routedPing(loc2);
pings++;
@@ -130,13 +130,13 @@
avg.report(0.0);
avg2.report(0.0);
double ratio = (double)successes /
((double)(failures+successes));
- Logger.normal(RealNodeRoutingTest.class, "Routed ping
"+pings+" FAILED from "+randomNode.getPortNumber()+" to
"+randomNode2.getPortNumber()+" (long:"+ratio+", short:"+avg.currentValue()+",
vague:"+avg2.currentValue()+ ')');
+ Logger.normal(RealNodeRoutingTest.class, "Routed ping
"+pings+" FAILED from "+randomNode.getDarknetPortNumber()+" to
"+randomNode2.getDarknetPortNumber()+" (long:"+ratio+",
short:"+avg.currentValue()+", vague:"+avg2.currentValue()+ ')');
} else {
successes++;
avg.report(1.0);
avg2.report(1.0);
double ratio = (double)successes /
((double)(failures+successes));
- Logger.normal(RealNodeRoutingTest.class, "Routed ping
"+pings+" success: "+hopsTaken+ ' ' +randomNode.getPortNumber()+" to
"+randomNode2.getPortNumber()+" (long:"+ratio+", short:"+avg.currentValue()+",
vague:"+avg2.currentValue()+ ')');
+ Logger.normal(RealNodeRoutingTest.class, "Routed ping
"+pings+" success: "+hopsTaken+ ' ' +randomNode.getDarknetPortNumber()+" to
"+randomNode2.getDarknetPortNumber()+" (long:"+ratio+",
short:"+avg.currentValue()+", vague:"+avg2.currentValue()+ ')');
}
} catch (Throwable t) {
Logger.error(RealNodeRoutingTest.class, "Caught "+t, t);
Modified: trunk/freenet/src/freenet/node/useralerts/IPUndetectedUserAlert.java
===================================================================
--- trunk/freenet/src/freenet/node/useralerts/IPUndetectedUserAlert.java
2007-06-28 18:59:26 UTC (rev 13813)
+++ trunk/freenet/src/freenet/node/useralerts/IPUndetectedUserAlert.java
2007-06-28 19:10:04 UTC (rev 13814)
@@ -30,7 +30,7 @@
if(node.ipDetector.isDetecting())
return l10n("detecting");
else
- return l10n("unknownAddress", "port",
Integer.toString(node.getPortNumber()));
+ return l10n("unknownAddress", "port",
Integer.toString(node.getDarknetPortNumber()));
}
private String l10n(String key) {
@@ -48,7 +48,7 @@
HTMLNode textNode = new HTMLNode("div");
L10n.addL10nSubstitution(textNode,
"IPUndetectedUserAlert."+(node.ipDetector.isDetecting() ?
"detectingWithConfigLink" : "unknownAddressWithConfigLink"),
new String[] { "link", "/link", "port" },
- new String[] { "<a href=\"/config/\">", "</a>",
Integer.toString(node.getPortNumber()) });
+ new String[] { "<a href=\"/config/\">", "</a>",
Integer.toString(node.getDarknetPortNumber()) });
HTMLNode formNode = textNode.addChild("form", new String[] {
"action", "method" }, new String[] { "/config/", "post" });
formNode.addChild("input", new String[] { "type", "name",
"value" }, new String[] { "hidden", "formPassword",
node.clientCore.formPassword });
HTMLNode listNode = formNode.addChild("ul", "class", "config");
