dandri/i2p.i2p
1
0
Fork 0
mirror of https://github.com/i2p/i2p.i2p.git synced 2026-06-05 12:51:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'i2p.i2p.2.5.0-revert-outbound-changes' into 'master'

Browse Source 
Router: revert changes to OutboundTunnelEndpoint

See merge request i2p-hackers/i2p.i2p!184
This commit is contained in:
idk
2024-02-29 20:45:32 +00:00
parent 9c1f58f54d 2af30251a6
commit b1069cbb3a
1 changed files with 0 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
router/java/src/net/i2p/router/tunnel/OutboundTunnelEndpoint.java
-39
View File
@@ -2,7 +2,6 @@ package net.i2p.router.tunnel;
import net.i2p.data.Hash;
import net.i2p.data.TunnelId;
import net.i2p.data.i2np.DatabaseStoreMessage;
import net.i2p.data.i2np.I2NPMessage;
import net.i2p.data.i2np.TunnelDataMessage;
import net.i2p.router.OutNetMessage;
@@ -21,7 +20,6 @@ class OutboundTunnelEndpoint {
private final HopProcessor _processor;
private final FragmentHandler _handler;
private final OutboundMessageDistributor _outDistributor;
private int _lsdsm, _ridsm, _i2npmsg, _totalmsg;
public OutboundTunnelEndpoint(RouterContext ctx, HopConfig config, HopProcessor processor) {
_context = ctx;
@@ -30,7 +28,6 @@ class OutboundTunnelEndpoint {
_processor = processor;
_handler = new RouterFragmentHandler(ctx, new DefragmentedHandler());
_outDistributor = new OutboundMessageDistributor(ctx, OutNetMessage.PRIORITY_PARTICIPATING);
_totalmsg = _lsdsm = _ridsm = _i2npmsg = 0;
}
public void dispatch(TunnelDataMessage msg, Hash recvFrom) {
@@ -59,7 +56,6 @@ class OutboundTunnelEndpoint {
private class DefragmentedHandler implements FragmentHandler.DefragmentedReceiver {
public void receiveComplete(I2NPMessage msg, Hash toRouter, TunnelId toTunnel) {
_totalmsg++;
if (toRouter == null) {
// Delivery type LOCAL is not supported at the OBEP
// We don't have any use for it yet.
@@ -73,41 +69,6 @@ class OutboundTunnelEndpoint {
+ " to be forwarded on to "
+ toRouter.toBase64().substring(0,4)
+ (toTunnel != null ? ":" + toTunnel.getTunnelId() : ""));
if (toTunnel == null) {
int msgtype = msg.getType();
if (msgtype == DatabaseStoreMessage.MESSAGE_TYPE) {
DatabaseStoreMessage dsm = (DatabaseStoreMessage)msg;
if (!dsm.getEntry().isLeaseSet()) {
_ridsm++;
_context.statManager().addRateData("tunnel.outboundTunnelEndpointFwdRIDSM", 1);
if (_log.shouldLog(Log.WARN))
_log.warn("OBEP directly forwarding RI DSM (count: "
+ _ridsm + "/" + _totalmsg + ") from tunnel id "
+ _config.getReceiveTunnelId()
+ " to router "
+ toRouter.toBase64().substring(0,4)
+ " with message: " + dsm);
} else {
_lsdsm++;
if (_log.shouldLog(Log.INFO))
_log.info("OBEP directly forwarding LS DSM (count: "
+ _lsdsm + "/" + _totalmsg + ") from tunnel id "
+ _config.getReceiveTunnelId()
+ " to router "
+ toRouter.toBase64().substring(0,4)
+ " with message: " + dsm);
}
} else {
_i2npmsg++;
if (_log.shouldLog(Log.INFO))
_log.info("OBEP directly forwarding I2NP Message (count: "
+ _i2npmsg + "/" + _totalmsg + ") from tunnel id "
+ _config.getReceiveTunnelId()
+ " to router "
+ toRouter.toBase64().substring(0,4)
+ " with message: " + msg);
}
}
int size = msg.getMessageSize();
// don't drop it if we are the target
boolean toUs = _context.routerHash().equals(toRouter);