Author: toad
Date: 2008-12-16 23:35:49 +0000 (Tue, 16 Dec 2008)
New Revision: 24395
Modified:
trunk/freenet/src/freenet/node/FNPPacketMangler.java
trunk/freenet/src/freenet/node/PeerNode.java
Log:
Remove support for negType 3
Modified: trunk/freenet/src/freenet/node/FNPPacketMangler.java
===================================================================
--- trunk/freenet/src/freenet/node/FNPPacketMangler.java 2008-12-16
23:30:24 UTC (rev 24394)
+++ trunk/freenet/src/freenet/node/FNPPacketMangler.java 2008-12-16
23:35:49 UTC (rev 24395)
@@ -551,7 +551,7 @@
Logger.error(this, "Decrypted auth packet but invalid
version: "+version);
return;
}
- if(!(negType == 2 || negType == 3 || negType == 4)) {
+ if(!(negType == 2 || negType == 4)) {
Logger.error(this, "Unknown neg type: "+negType);
return;
}
@@ -598,7 +598,7 @@
Logger.error(this, "Decrypted auth packet but invalid
version: "+version);
return;
}
- if(!(negType == 2 || negType == 3 || negType == 4)) {
+ if(!(negType == 2 || negType == 4)) {
Logger.error(this, "Unknown neg type: "+negType);
return;
}
@@ -663,8 +663,8 @@
} else if (negType == 1) {
Logger.error(this, "Old StationToStation (negType 1)
not supported.");
return;
- } else if (negType==2 || negType == 3 || negType == 4){
- // negType == 3 => no new PacketTracker when rekeying
+ } else if (negType==2 || negType == 4){
+ // negType == 3 was buggy
// negType == 4 => negotiate whether to use a new
PacketTracker when rekeying
/*
* We implement Just Fast Keying key management
protocol with active identity protection
@@ -1158,8 +1158,7 @@
if(trackerID < 0) trackerID = -1;
ptr += 8;
} else {
- if(negType == 3) trackerID = -2; // emulate negtype = 3
behaviour
- else trackerID = -1;
+ trackerID = -1;
}
long bootID = Fields.bytesToLong(data, ptr);
ptr += 8;
@@ -1378,8 +1377,7 @@
ptr += 8;
reusedTracker = data[ptr++] != 0;
} else {
- if(negType == 3) trackerID = -2;
- else trackerID = -1;
+ trackerID = -1;
reusedTracker = false;
}
long bootID = Fields.bytesToLong(data, ptr);
Modified: trunk/freenet/src/freenet/node/PeerNode.java
===================================================================
--- trunk/freenet/src/freenet/node/PeerNode.java 2008-12-16 23:30:24 UTC
(rev 24394)
+++ trunk/freenet/src/freenet/node/PeerNode.java 2008-12-16 23:35:49 UTC
(rev 24395)
@@ -1813,9 +1813,9 @@
* @param length Number of bytes to read.
* @param encKey The new session key.
* @param replyTo The IP the handshake came in on.
- * @param trackerID The tracker ID proposed by the other side. If -1,
create a new tracker. If -2,
- * reuse the old tracker if possible. If any other value, check whether
we have it, and if we do,
- * return that, otherwise return the ID of the new tracker.
+ * @param trackerID The tracker ID proposed by the other side. If -1,
create a new tracker. If any
+ * other value, check whether we have it, and if we do, return that,
otherwise return the ID of the
+ * new tracker.
* @param isJFK4 If true, we are processing a JFK(4) and must respect
the tracker ID chosen by the
* responder. If false, we are processing a JFK(3) and we can either
reuse the suggested tracker ID,
* which the other side is able to reuse, or we can create a new tracker
ID.
@@ -1926,19 +1926,6 @@
packets = new PacketTracker(this);
notReusingTracker = true;
if(logMINOR) Logger.minor(this, "Creating new
PacketTracker as instructed for "+this);
- } else if(trackerID == -2 && !bootIDChanged) {
- // Reuse if not deprecated and not boot ID
changed
- if(currentTracker != null &&
!currentTracker.packets.isDeprecated() && negType >= 3) {
- packets = currentTracker.packets;
- if(logMINOR) Logger.minor(this,
"Re-using packet tracker (not given an ID): "+packets.trackerID+" on "+this+"
from current "+currentTracker);
- } else if(previousTracker != null &&
!previousTracker.packets.isDeprecated() && negType >= 3) {
- packets = previousTracker.packets;
- if(logMINOR) Logger.minor(this,
"Re-using packet tracker (not given an ID): "+packets.trackerID+" on "+this+"
from prev "+previousTracker);
- } else {
- packets = new PacketTracker(this);
- notReusingTracker = true;
- if(logMINOR) Logger.minor(this, "Cannot
reuse trackers (not given an ID) on "+this);
- }
} else {
if(isJFK4 && negType >= 4 && trackerID < 0)
Logger.error(this, "JFK(4) packet with
neg type "+negType+" has negative tracker ID: "+trackerID);
_______________________________________________
cvs mailing list
[email protected]
http://emu.freenetproject.org/cgi-bin/mailman/listinfo/cvs
