Author: toad
Date: 2008-12-17 14:17:21 +0000 (Wed, 17 Dec 2008)
New Revision: 24428
Modified:
branches/db4o/freenet/src/freenet/node/FNPPacketMangler.java
branches/db4o/freenet/src/freenet/node/Version.java
Log:
More of the 1190 merge.
Modified: branches/db4o/freenet/src/freenet/node/FNPPacketMangler.java
===================================================================
--- branches/db4o/freenet/src/freenet/node/FNPPacketMangler.java
2008-12-17 14:16:58 UTC (rev 24427)
+++ branches/db4o/freenet/src/freenet/node/FNPPacketMangler.java
2008-12-17 14:17:21 UTC (rev 24428)
@@ -551,7 +551,7 @@
Logger.error(this, "Decrypted auth packet but invalid
version: "+version);
return;
}
- if(!(negType == 2 || negType == 3)) {
+ if(!(negType == 2 || negType == 3 || negType == 4)) {
Logger.error(this, "Unknown neg type: "+negType);
return;
}
Modified: branches/db4o/freenet/src/freenet/node/Version.java
===================================================================
--- branches/db4o/freenet/src/freenet/node/Version.java 2008-12-17 14:16:58 UTC
(rev 24427)
+++ branches/db4o/freenet/src/freenet/node/Version.java 2008-12-17 14:17:21 UTC
(rev 24428)
@@ -24,11 +24,11 @@
public static final String protocolVersion = "1.0";
/** The build number of the current revision */
- private static final int buildNumber = 1189;
+ private static final int buildNumber = 1190;
/** Oldest build of Fred we will talk to */
private static final int oldLastGoodBuild = 1188;
- private static final int newLastGoodBuild = 1189;
+ private static final int newLastGoodBuild = 1190;
static final long transitionTime;
static {
_______________________________________________
cvs mailing list
[email protected]
http://emu.freenetproject.org/cgi-bin/mailman/listinfo/cvs
