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

SSU2: Post-termination handler part 3 WIP

Browse Source 
PacketBuilder2 takes SSU2Sender
Don't check session lifetime or router shutdown to send token with termination
This commit is contained in:
zzz
2022-12-06 12:14:16 -05:00
parent 2e817416d5
commit 2451ea31bb
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
router/java/src/net/i2p/router/transport/udp/PacketBuilder2.java
View File

@@ -148,7 +148,7 @@ class PacketBuilder2 {
*
* @param otherBlocks may be null or empty
*/
public UDPPacket buildPacket(List<Fragment> fragments, List<Block> otherBlocks, PeerState2 peer) {
public UDPPacket buildPacket(List<Fragment> fragments, List<Block> otherBlocks, SSU2Sender peer) {
// calculate data size
int numFragments = fragments.size();
int dataSize = 0;
@@ -356,13 +356,11 @@ class PacketBuilder2 {
* Build a data packet with a termination block.
* This will also include acks, a new token block, and padding.
*/
public UDPPacket buildSessionDestroyPacket(int reason, PeerState2 peer) {
public UDPPacket buildSessionDestroyPacket(int reason, SSU2Sender peer) {
if (_log.shouldDebug())
_log.debug("Sending termination " + reason + " to : " + peer);
List<Block> blocks = new ArrayList<Block>(2);
if (peer.getKeyEstablishedTime() - _context.clock().now() > EstablishmentManager.IB_TOKEN_EXPIRATION / 2 &&
!_context.router().gracefulShutdownInProgress() &&
(peer.isIPv6() || !_transport.isSnatted())) {
if (peer.isIPv6() || !_transport.isSnatted()) {
// update token
EstablishmentManager.Token token = _transport.getEstablisher().getInboundToken(peer.getRemoteHostId());
Block block = new SSU2Payload.NewTokenBlock(token);