[freenet-cvs] r16975 - trunk/freenet/src/freenet/node

[zot...@freenetproject.org]

Author: zothar
Date: 2008-01-09 01:08:43 +0000 (Wed, 09 Jan 2008)
New Revision: 16975

Modified:
   trunk/freenet/src/freenet/node/DarknetPeerNode.java
   trunk/freenet/src/freenet/node/PeerNode.java
Log:
Add queueOnNotConnected option to sendNodeToNodeMessage.  comments.

Modified: trunk/freenet/src/freenet/node/DarknetPeerNode.java
===================================================================
--- trunk/freenet/src/freenet/node/DarknetPeerNode.java 2008-01-09 00:53:07 UTC 
(rev 16974)
+++ trunk/freenet/src/freenet/node/DarknetPeerNode.java 2008-01-09 01:08:43 UTC 
(rev 16975)
@@ -1249,7 +1249,7 @@
                        fs.putSingle("target_nodename", 
Base64.encode(getName().getBytes("UTF-8")));
                        fs.putSingle("text", 
Base64.encode(message.getBytes("UTF-8")));
                        fs.put("composedTime", now);
-                       sendNodeToNodeMessage(fs, Node.N2N_MESSAGE_TYPE_FPROXY, 
true, now);
+                       sendNodeToNodeMessage(fs, Node.N2N_MESSAGE_TYPE_FPROXY, 
true, now, true);
                        this.setPeerNodeStatus(System.currentTimeMillis());
                        return getPeerNodeStatus();
                } catch (UnsupportedEncodingException e) {
@@ -1258,6 +1258,7 @@
        }

        public int sendFileOfferAccepted(long uid) {
+               // FIXME: perhaps can be refactored to use 
sendNodeToNodeMessage()
                storeOffers();
                long now = System.currentTimeMillis();
                SimpleFieldSet fs = new SimpleFieldSet(true);
@@ -1291,6 +1292,7 @@
        }

        public int sendFileOfferRejected(long uid) {
+               // FIXME: perhaps can be refactored to use 
sendNodeToNodeMessage()
                storeOffers();
                long now = System.currentTimeMillis();
                SimpleFieldSet fs = new SimpleFieldSet(true);
@@ -1324,6 +1326,7 @@
        }

        public int sendFileOffer(File filename, String message) throws 
IOException {
+               // FIXME: perhaps can be refactored to use 
sendNodeToNodeMessage()
                String fnam = filename.getName();
                String mime = DefaultMIMETypes.guessMIMEType(fnam, false);
                long uid = node.random.nextLong();

Modified: trunk/freenet/src/freenet/node/PeerNode.java
===================================================================
--- trunk/freenet/src/freenet/node/PeerNode.java        2008-01-09 00:53:07 UTC 
(rev 16974)
+++ trunk/freenet/src/freenet/node/PeerNode.java        2008-01-09 01:08:43 UTC 
(rev 16975)
@@ -3501,7 +3501,7 @@

        private int handshakeIPAlternator;

-       public void sendNodeToNodeMessage(SimpleFieldSet fs, int n2nType, 
boolean includeSentTime, long now) {
+       public void sendNodeToNodeMessage(SimpleFieldSet fs, int n2nType, 
boolean includeSentTime, long now, boolean queueOnNotConnected) {
                fs.put("n2nType", n2nType);
                if(includeSentTime) {
                        fs.put("sentTime", now);
@@ -3516,7 +3516,7 @@
                                if(includeSentTime) {
                                        fs.removeValue("sentTime");
                                }
-                               if(isDarknet()) {
+                               if(isDarknet() && queueOnNotConnected) {
                                        queueN2NM(fs);
                                }
                        }