Author: toad Date: 2008-03-20 20:14:10 +0000 (Thu, 20 Mar 2008) New Revision: 18661
Modified:
trunk/freenet/src/freenet/node/RequestSender.java
Log:
indenting
Modified: trunk/freenet/src/freenet/node/RequestSender.java
===================================================================
--- trunk/freenet/src/freenet/node/RequestSender.java 2008-03-20 19:40:46 UTC
(rev 18660)
+++ trunk/freenet/src/freenet/node/RequestSender.java 2008-03-20 20:14:10 UTC
(rev 18661)
@@ -390,37 +390,37 @@
}
sskData = ((ShortBuffer)
dataMessage.getObject(DMT.DATA)).getData();
if(pubKey == null) {
- MessageFilter mfPK =
MessageFilter.create().setSource(pn).setField(DMT.UID,
uid).setTimeout(GET_OFFER_TIMEOUT).setType(DMT.FNPSSKPubKey);
- Message pk;
- try {
- pk = node.usm.waitFor(mfPK,
this);
- } catch (DisconnectedException e) {
- if(logMINOR)
- Logger.minor(this,
"Disconnected: "+pn+" getting pubkey for offer for "+key);
- offers.deleteLastOffer();
- continue;
+ MessageFilter mfPK =
MessageFilter.create().setSource(pn).setField(DMT.UID,
uid).setTimeout(GET_OFFER_TIMEOUT).setType(DMT.FNPSSKPubKey);
+ Message pk;
+ try {
+ pk =
node.usm.waitFor(mfPK, this);
+ } catch (DisconnectedException
e) {
+ if(logMINOR)
+
Logger.minor(this, "Disconnected: "+pn+" getting pubkey for offer for "+key);
+
offers.deleteLastOffer();
+ continue;
+ }
+ if(pk == null) {
+ Logger.error(this, "Got
data but not pubkey from "+pn+" for offer for "+key);
+
offers.deleteLastOffer();
+ continue;
+ }
+ try {
+ pubKey =
DSAPublicKey.create(((ShortBuffer)pk.getObject(DMT.PUBKEY_AS_BYTES)).getData());
+ } catch (CryptFormatException
e) {
+ Logger.error(this,
"Bogus pubkey from "+pn+" for offer for "+key+" : "+e, e);
+
offers.deleteLastOffer();
+ continue;
+ }
+
+ try {
+
((NodeSSK)key).setPubKey(pubKey);
+ } catch (SSKVerifyException e) {
+ Logger.error(this,
"Bogus SSK data from "+pn+" for offer for "+key+" : "+e, e);
+
offers.deleteLastOffer();
+ continue;
+ }
}
- if(pk == null) {
- Logger.error(this, "Got data but not
pubkey from "+pn+" for offer for "+key);
- offers.deleteLastOffer();
- continue;
- }
- try {
- pubKey =
DSAPublicKey.create(((ShortBuffer)pk.getObject(DMT.PUBKEY_AS_BYTES)).getData());
- } catch (CryptFormatException e) {
- Logger.error(this, "Bogus
pubkey from "+pn+" for offer for "+key+" : "+e, e);
- offers.deleteLastOffer();
- continue;
- }
-
- try {
-
((NodeSSK)key).setPubKey(pubKey);
- } catch (SSKVerifyException e) {
- Logger.error(this, "Bogus SSK
data from "+pn+" for offer for "+key+" : "+e, e);
- offers.deleteLastOffer();
- continue;
- }
- }
if(finishSSKFromGetOffer(pn)) {
if(logMINOR) Logger.minor(this,
"Successfully fetched SSK from offer from "+pn+" for "+key);
