On Wed, Dec 17, 2008 at 7:43 AM, <toad at freenetproject.org> wrote:
> Author: toad
> Date: 2008-12-16 23:43:16 +0000 (Tue, 16 Dec 2008)
> New Revision: 24396
>
> Modified:
> trunk/freenet/src/freenet/node/FNPPacketMangler.java
> trunk/freenet/src/freenet/node/OutgoingPacketMangler.java
> trunk/freenet/src/freenet/node/PacketTracker.java
> trunk/freenet/src/freenet/node/PeerNode.java
> Log:
> Rename KeyTracker to SessionKey
>
>
> Modified: trunk/freenet/src/freenet/node/FNPPacketMangler.java
> ===================================================================
> --- trunk/freenet/src/freenet/node/FNPPacketMangler.java 2008-12-16
> 23:35:49 UTC (rev 24395)
> +++ trunk/freenet/src/freenet/node/FNPPacketMangler.java 2008-12-16
> 23:43:16 UTC (rev 24396)
> @@ -1803,7 +1803,7 @@
> * We need to know where the packet has come from in order to
> * decrypt and authenticate it.
> */
> - private boolean tryProcess(byte[] buf, int offset, int length,
> KeyTracker tracker, long now) {
> + private boolean tryProcess(byte[] buf, int offset, int length,
> SessionKey tracker, long now) {
> // Need to be able to call with tracker == null to simplify
> code above
> if(tracker == null) {
> if(Logger.shouldLog(Logger.DEBUG, this))
> Logger.debug(this, "Tracker == null");
> @@ -1917,9 +1917,9 @@
> * Process an incoming packet, once it has been decrypted.
> * @param decrypted The packet's contents.
> * @param seqNumber The detected sequence number of the packet.
> - * @param tracker The KeyTracker responsible for the key used to
> encrypt the packet.
> + * @param tracker The SessionKey responsible for the key used to
> encrypt the packet.
> */
> - private void processDecryptedData(byte[] decrypted, int seqNumber,
> KeyTracker tracker, int overhead) {
> + private void processDecryptedData(byte[] decrypted, int seqNumber,
> SessionKey tracker, int overhead) {
> /**
> * Decoded format:
> * 1 byte - version number (0)
> @@ -2105,7 +2105,7 @@
> if(logMINOR) Logger.minor(this, "processOutgoingOrRequeue
> "+messages.length+" messages for "+pn);
> byte[][] messageData = new byte[messages.length][];
> MessageItem[] newMsgs = new MessageItem[messages.length];
> - KeyTracker kt = pn.getCurrentKeyTracker();
> + SessionKey kt = pn.getCurrentKeyTracker();
getCurrentKeyTracker(); -> getCurrentSessionKey()
[..]
