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

Util: Hook in ByteArrayStream

Browse Source 
Set accurate lengths for zero-copy
This commit is contained in:
zzz
2020-11-04 12:04:24 +00:00
parent 35da97936d
commit e242015145
25 changed files with 78 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
apps/ministreaming/java/src/net/i2p/client/streaming/I2PSocketManagerFactory.java
View File

@ -1,7 +1,6 @@
package net.i2p.client.streaming;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.lang.reflect.Constructor;
@ -15,6 +14,7 @@ import net.i2p.client.I2PClientFactory;
import net.i2p.client.I2PSession;
import net.i2p.client.I2PSessionException;
import net.i2p.crypto.SigType;
import net.i2p.util.ByteArrayStream;
import net.i2p.util.Log;
/**
@ -171,10 +171,10 @@ public class I2PSocketManagerFactory {
public static I2PSocketManager createManager(String i2cpHost, int i2cpPort, Properties opts,
IncomingConnectionFilter filter) {
I2PClient client = I2PClientFactory.createClient();
ByteArrayOutputStream keyStream = new ByteArrayOutputStream(1024);
ByteArrayStream keyStream = new ByteArrayStream(1024);
try {
client.createDestination(keyStream, getSigType(opts));
ByteArrayInputStream in = new ByteArrayInputStream(keyStream.toByteArray());
ByteArrayInputStream in = keyStream.asInputStream();
return createManager(in, i2cpHost, i2cpPort, opts, filter);
} catch (IOException ioe) {
getLog().error("Error creating the destination for socket manager", ioe);
@ -359,7 +359,7 @@ public class I2PSocketManagerFactory {
throws I2PSessionException {
if (myPrivateKeyStream == null) {
I2PClient client = I2PClientFactory.createClient();
ByteArrayOutputStream keyStream = new ByteArrayOutputStream(1024);
ByteArrayStream keyStream = new ByteArrayStream(1024);
try {
client.createDestination(keyStream, getSigType(opts));
} catch (I2PException e) {
@ -367,7 +367,7 @@ public class I2PSocketManagerFactory {
} catch (IOException e) {
throw new I2PSessionException("Error creating keys", e);
}
myPrivateKeyStream = new ByteArrayInputStream(keyStream.toByteArray());
myPrivateKeyStream = keyStream.asInputStream();
}
return createManager(myPrivateKeyStream, i2cpHost, i2cpPort, opts, false, filter);
}

7
apps/streaming/java/src/net/i2p/client/streaming/impl/I2PSocketManagerFull.java
View File

@ -1,7 +1,5 @@
package net.i2p.client.streaming.impl;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.net.ConnectException;
@ -38,6 +36,7 @@ import net.i2p.data.Hash;
import net.i2p.data.PrivateKey;
import net.i2p.data.PublicKey;
import net.i2p.data.SimpleDataStructure;
import net.i2p.util.ByteArrayStream;
import net.i2p.util.ConvertToHash;
import net.i2p.util.ConcurrentHashSet;
import net.i2p.util.Log;
@ -275,7 +274,7 @@ public class I2PSocketManagerFull implements I2PSocketManager {
// We don't actually need the same pubkey in the dest, just in the LS.
// The dest one is unused. But this is how we find the LS keys
// to reuse in RequestLeaseSetMessageHandler.
ByteArrayOutputStream keyStream = new ByteArrayOutputStream(1024);
ByteArrayStream keyStream = new ByteArrayStream(1024);
try {
SigType type = getSigType(opts);
if (type != SigType.DSA_SHA1) {
@ -299,7 +298,7 @@ public class I2PSocketManagerFull implements I2PSocketManager {
} catch (RuntimeException e) {
throw new I2PSessionException("Error creating keys", e);
}
privateKeyStream = new ByteArrayInputStream(keyStream.toByteArray());
privateKeyStream = keyStream.asInputStream();
}
I2PSession rv = _session.addSubsession(privateKeyStream, opts);
boolean added = _subsessions.add(rv);