Author: toad
Date: 2008-12-06 16:54:54 +0000 (Sat, 06 Dec 2008)
New Revision: 24104
Modified:
trunk/freenet/src/freenet/node/FNPPacketMangler.java
trunk/freenet/src/freenet/node/OutgoingPacketMangler.java
trunk/freenet/src/freenet/node/PacketSender.java
trunk/freenet/src/freenet/node/PeerNode.java
Log:
Don't start connecting to old-opennet-peers until 30 seconds after startup.
Logging.
Modified: trunk/freenet/src/freenet/node/FNPPacketMangler.java
===================================================================
--- trunk/freenet/src/freenet/node/FNPPacketMangler.java 2008-12-06
16:54:03 UTC (rev 24103)
+++ trunk/freenet/src/freenet/node/FNPPacketMangler.java 2008-12-06
16:54:54 UTC (rev 24104)
@@ -2835,7 +2835,7 @@
/* (non-Javadoc)
* @see
freenet.node.OutgoingPacketMangler#sendHandshake(freenet.node.PeerNode)
*/
- public void sendHandshake(PeerNode pn) {
+ public void sendHandshake(PeerNode pn, boolean notRegistered) {
int negType = pn.selectNegType(this);
if(negType == -1) {
// Pick a random negType from what I do support
@@ -2847,13 +2847,13 @@
Peer peer = pn.getHandshakeIP();
if(peer == null) {
- pn.couldNotSendHandshake();
+ pn.couldNotSendHandshake(notRegistered);
return;
}
sendJFKMessage1(pn, peer, pn.handshakeUnknownInitiator(),
pn.handshakeSetupType(), negType);
if(logMINOR)
Logger.minor(this, "Sending handshake to "+peer+" for
"+pn);
- pn.sentHandshake();
+ pn.sentHandshake(notRegistered);
}
/* (non-Javadoc)
Modified: trunk/freenet/src/freenet/node/OutgoingPacketMangler.java
===================================================================
--- trunk/freenet/src/freenet/node/OutgoingPacketMangler.java 2008-12-06
16:54:03 UTC (rev 24103)
+++ trunk/freenet/src/freenet/node/OutgoingPacketMangler.java 2008-12-06
16:54:54 UTC (rev 24104)
@@ -77,7 +77,7 @@
* Send a handshake, if possible, to the node.
* @param pn
*/
- public void sendHandshake(PeerNode pn);
+ public void sendHandshake(PeerNode pn, boolean notRegistered);
/**
* Is a peer disconnected?
Modified: trunk/freenet/src/freenet/node/PacketSender.java
===================================================================
--- trunk/freenet/src/freenet/node/PacketSender.java 2008-12-06 16:54:03 UTC
(rev 24103)
+++ trunk/freenet/src/freenet/node/PacketSender.java 2008-12-06 16:54:54 UTC
(rev 24104)
@@ -294,7 +294,7 @@
if(pn.shouldSendHandshake()) {
// Send handshake if necessary
long beforeHandshakeTime =
System.currentTimeMillis();
- pn.getOutgoingMangler().sendHandshake(pn);
+ pn.getOutgoingMangler().sendHandshake(pn,
false);
long afterHandshakeTime =
System.currentTimeMillis();
if((afterHandshakeTime - beforeHandshakeTime) >
(2 * 1000))
Logger.error(this, "afterHandshakeTime
is more than 2 seconds past beforeHandshakeTime (" + (afterHandshakeTime -
beforeHandshakeTime) + ") in PacketSender working with " + pn.userToString());
@@ -312,7 +312,7 @@
* Well worth it to allow us to reconnect more quickly. */
OpennetManager om = node.getOpennet();
- if(om != null) {
+ if(om != null && node.getUptime() > 30*1000) {
PeerNode[] peers = om.getOldPeers();
for(PeerNode pn : peers) {
@@ -324,7 +324,7 @@
if(pn.shouldSendHandshake()) {
// Send handshake if necessary
long beforeHandshakeTime =
System.currentTimeMillis();
-
pn.getOutgoingMangler().sendHandshake(pn);
+
pn.getOutgoingMangler().sendHandshake(pn, true);
long afterHandshakeTime =
System.currentTimeMillis();
if((afterHandshakeTime -
beforeHandshakeTime) > (2 * 1000))
Logger.error(this,
"afterHandshakeTime is more than 2 seconds past beforeHandshakeTime (" +
(afterHandshakeTime - beforeHandshakeTime) + ") in PacketSender working with "
+ pn.userToString());
Modified: trunk/freenet/src/freenet/node/PeerNode.java
===================================================================
--- trunk/freenet/src/freenet/node/PeerNode.java 2008-12-06 16:54:03 UTC
(rev 24103)
+++ trunk/freenet/src/freenet/node/PeerNode.java 2008-12-06 16:54:54 UTC
(rev 24104)
@@ -1414,11 +1414,12 @@
return fetchARKFlag;
}
- protected void calcNextHandshake(boolean successfulHandshakeSend,
boolean dontFetchARK) {
+ protected void calcNextHandshake(boolean successfulHandshakeSend,
boolean dontFetchARK, boolean notRegistered) {
long now = System.currentTimeMillis();
boolean fetchARKFlag = false;
fetchARKFlag = innerCalcNextHandshake(successfulHandshakeSend,
dontFetchARK, now);
- setPeerNodeStatus(now); // Because of isBursting being set
above and it can't hurt others
+ if(!notRegistered)
+ setPeerNodeStatus(now); // Because of isBursting being
set above and it can't hurt others
// Don't fetch ARKs for peers we have verified (through
handshake) to be incompatible with us
if(fetchARKFlag && !dontFetchARK) {
long arkFetcherStartTime1 = System.currentTimeMillis();
@@ -1457,20 +1458,20 @@
* Call this method when a handshake request has been
* sent.
*/
- public void sentHandshake() {
+ public void sentHandshake(boolean notRegistered) {
if(logMINOR)
Logger.minor(this, "sentHandshake(): " + this);
- calcNextHandshake(true, false);
+ calcNextHandshake(true, false, notRegistered);
}
/**
* Call this method when a handshake request could not be sent (i.e. no
IP address available)
* sent.
*/
- public void couldNotSendHandshake() {
+ public void couldNotSendHandshake(boolean notRegistered) {
if(logMINOR)
Logger.minor(this, "couldNotSendHandshake(): " + this);
- calcNextHandshake(false, false);
+ calcNextHandshake(false, false, notRegistered);
}
/**
@@ -1830,7 +1831,7 @@
// Update sendHandshakeTime; don't send another handshake for a
while.
// If unverified, "a while" determines the timeout; if not,
it's just good practice to avoid a race below.
- calcNextHandshake(true, true);
+ calcNextHandshake(true, true, false);
stopARKFetcher();
try {
// First, the new noderef
_______________________________________________
cvs mailing list
[email protected]
http://emu.freenetproject.org/cgi-bin/mailman/listinfo/cvs
