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

[t...@freenetproject.org]

Author: toad
Date: 2008-03-20 17:25:07 +0000 (Thu, 20 Mar 2008)
New Revision: 18653

Modified:
   trunk/freenet/src/freenet/node/RequestSender.java
Log:
Get offered SSK: actually wait for the headers form.

Modified: trunk/freenet/src/freenet/node/RequestSender.java
===================================================================
--- trunk/freenet/src/freenet/node/RequestSender.java   2008-03-20 17:20:03 UTC 
(rev 18652)
+++ trunk/freenet/src/freenet/node/RequestSender.java   2008-03-20 17:25:07 UTC 
(rev 18653)
@@ -301,9 +301,10 @@
                } else {
                        // Data, possibly followed by pubkey
                        MessageFilter mfDF = 
MessageFilter.create().setSource(pn).setField(DMT.UID, 
uid).setTimeout(GET_OFFER_TIMEOUT).setType(DMT.FNPSSKDataFound);
+                       MessageFilter mfAltDF = 
MessageFilter.create().setSource(pn).setField(DMT.UID, 
uid).setTimeout(GET_OFFER_TIMEOUT).setType(DMT.FNPSSKDataFoundHeaders);
                        Message reply;
                                try {
-                                       reply = 
node.usm.waitFor(mfDF.or(mfRO.or(mfGetInvalid)), this);
+                                       reply = 
node.usm.waitFor(mfDF.or(mfRO.or(mfGetInvalid.or(mfAltDF))), this);
                                } catch (DisconnectedException e) {
                                        if(logMINOR)
                                                Logger.minor(this, 
"Disconnected: "+pn+" getting offer for "+key);