echelon/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

comment out unused GarlicConfig methods

Browse Source
This commit is contained in:
zzz
2012-03-23 17:02:32 +00:00
parent 0d565818d4
commit 008c79e743
6 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
router/java/src/net/i2p/router/message/GarlicConfig.java
View File

@ -29,9 +29,10 @@ class GarlicConfig {
private long _expiration;
private final List<GarlicConfig> _cloveConfigs;
private DeliveryInstructions _instructions;
private boolean _requestAck;
private RouterInfo _replyThroughRouter; // router through which any replies will be sent before delivery to us
private DeliveryInstructions _replyInstructions; // how the message will be sent from the replyThroughRouter to us
// unused
//private boolean _requestAck;
//private RouterInfo _replyThroughRouter; // router through which any replies will be sent before delivery to us
//private DeliveryInstructions _replyInstructions; // how the message will be sent from the replyThroughRouter to us
// unused and undocumented
//private Certificate _replyBlockCertificate;
//private long _replyBlockMessageId;
@ -100,8 +101,10 @@ class GarlicConfig {
* no reply is expected.
*
*/
/****
public void setRequestAck(boolean request) { _requestAck = request; }
public boolean getRequestAck() { return _requestAck; }
****/
/**
* Specify the router through which a reply to this clove can be sent. The
@ -109,8 +112,10 @@ class GarlicConfig {
* and it them uses those to send the reply to this router.
*
*/
/****
public void setReplyThroughRouter(RouterInfo replyThroughRouter) { _replyThroughRouter = replyThroughRouter; }
public RouterInfo getReplyThroughRouter() { return _replyThroughRouter; }
****/
/**
* Specify how any reply will be routed so that it reaches this router after being
@ -119,8 +124,10 @@ class GarlicConfig {
* the replyThrough router
*
*/
/****
public void setReplyInstructions(DeliveryInstructions instructions) { _replyInstructions = instructions; }
public DeliveryInstructions getReplyInstructions() { return _replyInstructions; }
****/
/****
public long getReplyBlockMessageId() { return _replyBlockMessageId; }
@ -164,9 +171,9 @@ class GarlicConfig {
//buf.append("<replyBlockCertificate>").append(getReplyBlockCertificate()).append("</replyBlockCertificate>").append(NL);
//buf.append("<replyBlockExpiration>").append(new Date(getReplyBlockExpiration())).append("</replyBlockExpiration>").append(NL);
//buf.append("<replyBlockMessageId>").append(getReplyBlockMessageId()).append("</replyBlockMessageId>").append(NL);
buf.append("<replyInstructions>").append(getReplyInstructions()).append("</replyInstructions>").append(NL);
buf.append("<replyThroughRouter>").append(getReplyThroughRouter()).append("</replyThroughRouter>").append(NL);
buf.append("<requestAck>").append(getRequestAck()).append("</requestAck>").append(NL);
//buf.append("<replyInstructions>").append(getReplyInstructions()).append("</replyInstructions>").append(NL);
//buf.append("<replyThroughRouter>").append(getReplyThroughRouter()).append("</replyThroughRouter>").append(NL);
//buf.append("<requestAck>").append(getRequestAck()).append("</requestAck>").append(NL);
buf.append(getSubData());
buf.append("<subcloves>").append(NL);
for (int i = 0; i < getCloveCount(); i++)

1
router/java/src/net/i2p/router/message/OutboundClientMessageJobHelper.java
View File

@ -121,7 +121,6 @@ class OutboundClientMessageJobHelper {
config.setId(ctx.random().nextLong(I2NPMessage.MAX_ID_VALUE));
config.setExpiration(expiration); // +2*Router.CLOCK_FUDGE_FACTOR);
config.setRecipientPublicKey(recipientPK);
config.setRequestAck(false);
if (log.shouldLog(Log.INFO))
log.info("Creating garlic config to be encrypted to " + recipientPK

5
router/java/src/net/i2p/router/message/OutboundClientMessageOneShotJob.java
View File

@ -725,8 +725,9 @@ public class OutboundClientMessageOneShotJob extends JobImpl {
msg.setMessageExpiration(clove.getExpiration());
clove.setPayload(msg);
clove.setRecipientPublicKey(null);
clove.setRequestAck(false);
// defaults
//clove.setRecipientPublicKey(null);
//clove.setRequestAck(false);
_clove = clove;
_cloveId = _clove.getId();

1
router/java/src/net/i2p/router/networkdb/kademlia/MessageWrapper.java
View File

@ -51,7 +51,6 @@ class MessageWrapper {
payload.setPayload(m);
payload.setRecipient(to);
payload.setDeliveryInstructions(instructions);
payload.setRequestAck(false);
payload.setExpiration(m.getMessageExpiration());
SessionKeyManager skm;

1
router/java/src/net/i2p/router/tunnel/pool/TestJob.java
View File

@ -124,7 +124,6 @@ class TestJob extends JobImpl {
payload.setPayload(m);
payload.setRecipient(getContext().router().getRouterInfo());
payload.setDeliveryInstructions(instructions);
payload.setRequestAck(false);
payload.setExpiration(m.getMessageExpiration());
SessionKey encryptKey = getContext().keyGenerator().generateSessionKey();

2
router/java/test/net/i2p/router/message/BuildTestMessageJob.java
View File

@ -121,7 +121,6 @@ public class BuildTestMessageJob extends JobImpl {
config.setId(getContext().random().nextLong(I2NPMessage.MAX_ID_VALUE));
config.setExpiration(_timeoutMs+getContext().clock().now()+2*Router.CLOCK_FUDGE_FACTOR);
config.setRecipient(_target);
config.setRequestAck(false);
return config;
}
@ -151,7 +150,6 @@ public class BuildTestMessageJob extends JobImpl {
ackClove.setId(getContext().random().nextLong(I2NPMessage.MAX_ID_VALUE));
ackClove.setPayload(msg);
ackClove.setRecipient(_target);
ackClove.setRequestAck(false);
return ackClove;
}