Update of /cvsroot/freenet/freenet/src/freenet/presentation
In directory sc8-pr-cvs1:/tmp/cvs-serv25857/src/freenet/presentation
Modified Files:
Tag: stable
FCPRawMessage.java FNPRawMessage.java FreenetProtocol.java
Log Message:
5029: Merge from unstable after months of work. MASSIVE changes.
Highlights:
* Next Generation Routing, massive related changes
* Major changes to handling of messages and connections (PeerHandler and related
changes)
* Even more non-blocking I/O
* Documentation improvements
* Lots of new diagnostics and config options
* Lots of bug fixes and performance tweaking
* Probably lots of new bugs too!
Index: FCPRawMessage.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/presentation/FCPRawMessage.java,v
retrieving revision 1.2.6.2
retrieving revision 1.2.6.3
diff -u -w -r1.2.6.2 -r1.2.6.3
--- FCPRawMessage.java 5 Jul 2003 01:09:55 -0000 1.2.6.2
+++ FCPRawMessage.java 28 Oct 2003 20:20:44 -0000 1.2.6.3
@@ -58,7 +58,7 @@
trailingFieldLength = 0;
String dlvalue = fs.get("DataLength");
if (dlvalue != null) {
- trailingFieldLength = Fields.stringToLong(dlvalue);
+ trailingFieldLength = Fields.hexToLong(dlvalue);
//fs.remove("DataLength");
}
}
@@ -81,7 +81,7 @@
// Output tansport options
if (trailingFieldLength != 0)
- fs.add("Length",Fields.longToString(trailingFieldLength));
+ fs.add("Length",Fields.longToHex(trailingFieldLength));
// Output message fields
Index: FNPRawMessage.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/presentation/FNPRawMessage.java,v
retrieving revision 1.3.6.2
retrieving revision 1.3.6.3
diff -u -w -r1.3.6.2 -r1.3.6.3
--- FNPRawMessage.java 5 Jul 2003 01:09:55 -0000 1.3.6.2
+++ FNPRawMessage.java 28 Oct 2003 20:20:44 -0000 1.3.6.3
@@ -90,11 +90,11 @@
trailingFieldLength = 0;
}
else {
- trailingFieldLength = Fields.stringToLong(dlvalue);
+ trailingFieldLength = Fields.hexToLong(dlvalue);
fs.remove("DataLength");
}
/*
- trailingFieldLength = dlvalue == null ? 0 : Fields.stringToLong(dlvalue);
+ trailingFieldLength = dlvalue == null ? 0 : Fields.hexToLong(dlvalue);
if (dlvalue != null)
fs.remove("DataLength");
if (trailingFieldLength != 0) {// we have a trailing
@@ -130,7 +130,7 @@
fs.add("Connection","sustain");
if (trailingFieldLength != 0)
- fs.add("DataLength",Fields.longToString(trailingFieldLength));
+ fs.add("DataLength",Fields.longToHex(trailingFieldLength));
// Output message fields
Index: FreenetProtocol.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/presentation/FreenetProtocol.java,v
retrieving revision 1.1.1.1.6.1
retrieving revision 1.1.1.1.6.2
diff -u -w -r1.1.1.1.6.1 -r1.1.1.1.6.2
--- FreenetProtocol.java 1 Jul 2003 02:27:17 -0000 1.1.1.1.6.1
+++ FreenetProtocol.java 28 Oct 2003 20:20:44 -0000 1.1.1.1.6.2
@@ -102,11 +102,11 @@
}
public Message getCloseMessage() {
- return new VoidMessage(Core.randSource.nextLong(), true, null);
+ return new VoidMessage(Core.getRandSource().nextLong(), true, null);
}
public Message getSustainMessage() {
- return new VoidMessage(Core.randSource.nextLong(), false, true, null);
+ return new VoidMessage(Core.getRandSource().nextLong(), false, true, null);
}
}
_______________________________________________
cvs mailing list
[EMAIL PROTECTED]
http://dodo.freenetproject.org/cgi-bin/mailman/listinfo/cvs
