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

client demo cleanup

Browse Source
This commit is contained in:
zzz
2015-11-25 14:48:43 +00:00
parent 110a0a1b7a
commit 6081856dd1
4 changed files with 36 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
apps/sam/java/src/net/i2p/sam/client/SAMEventHandler.java
View File

@ -13,13 +13,13 @@ import net.i2p.util.Log;
*/ */
public class SAMEventHandler extends SAMClientEventListenerImpl { public class SAMEventHandler extends SAMClientEventListenerImpl {
//private I2PAppContext _context; //private I2PAppContext _context;
private Log _log; private final Log _log;
private Boolean _helloOk; private Boolean _helloOk;
private Object _helloLock = new Object(); private final Object _helloLock = new Object();
private Boolean _sessionCreateOk; private Boolean _sessionCreateOk;
private Object _sessionCreateLock = new Object(); private final Object _sessionCreateLock = new Object();
private Object _namingReplyLock = new Object(); private final Object _namingReplyLock = new Object();
private Map<String,String> _namingReplies = new HashMap<String,String>(); private final Map<String,String> _namingReplies = new HashMap<String,String>();
public SAMEventHandler(I2PAppContext ctx) { public SAMEventHandler(I2PAppContext ctx) {
//_context = ctx; //_context = ctx;

9
apps/sam/java/src/net/i2p/sam/client/SAMReader.java
View File

@ -16,10 +16,10 @@ import net.i2p.util.Log;
* *
*/ */
public class SAMReader { public class SAMReader {
private Log _log; private final Log _log;
private InputStream _inRaw; private final InputStream _inRaw;
private SAMClientEventListener _listener; private final SAMClientEventListener _listener;
private boolean _live; private volatile boolean _live;
public SAMReader(I2PAppContext context, InputStream samIn, SAMClientEventListener listener) { public SAMReader(I2PAppContext context, InputStream samIn, SAMClientEventListener listener) {
_log = context.logManager().getLog(SAMReader.class); _log = context.logManager().getLog(SAMReader.class);
@ -32,6 +32,7 @@ public class SAMReader {
I2PAppThread t = new I2PAppThread(new Runner(), "SAM reader"); I2PAppThread t = new I2PAppThread(new Runner(), "SAM reader");
t.start(); t.start();
} }
public void stopReading() { _live = false; } public void stopReading() { _live = false; }
/** /**

24
apps/sam/java/src/net/i2p/sam/client/SAMStreamSend.java
View File

@ -20,21 +20,21 @@ import net.i2p.util.Log;
* *
*/ */
public class SAMStreamSend { public class SAMStreamSend {
private I2PAppContext _context; private final I2PAppContext _context;
private Log _log; private final Log _log;
private String _samHost; private final String _samHost;
private String _samPort; private final String _samPort;
private String _destFile; private final String _destFile;
private String _dataFile; private final String _dataFile;
private String _conOptions; private final String _conOptions;
private Socket _samSocket; private Socket _samSocket;
private OutputStream _samOut; private OutputStream _samOut;
private InputStream _samIn; private InputStream _samIn;
private SAMReader _reader; private SAMReader _reader;
//private boolean _dead; //private boolean _dead;
private SAMEventHandler _eventHandler; private final SAMEventHandler _eventHandler;
/** Connection id (Integer) to peer (Flooder) */ /** Connection id (Integer) to peer (Flooder) */
private Map<Integer, Sender> _remotePeers; private final Map<Integer, Sender> _remotePeers;
public static void main(String args[]) { public static void main(String args[]) {
if (args.length < 4) { if (args.length < 4) {
@ -165,13 +165,11 @@ public class SAMStreamSend {
private int _connectionId; private int _connectionId;
private String _remoteDestination; private String _remoteDestination;
private InputStream _in; private InputStream _in;
private boolean _closed; private volatile boolean _closed;
private long _started; private long _started;
private long _totalSent; private long _totalSent;
public Sender() { public Sender() {}
_closed = false;
}
public boolean openConnection() { public boolean openConnection() {
FileInputStream fin = null; FileInputStream fin = null;

29
apps/sam/java/src/net/i2p/sam/client/SAMStreamSink.java
View File

@ -20,21 +20,21 @@ import net.i2p.util.Log;
* *
*/ */
public class SAMStreamSink { public class SAMStreamSink {
private I2PAppContext _context; private final I2PAppContext _context;
private Log _log; private final Log _log;
private String _samHost; private final String _samHost;
private String _samPort; private final String _samPort;
private String _destFile; private final String _destFile;
private String _sinkDir; private final String _sinkDir;
private String _conOptions; private final String _conOptions;
private Socket _samSocket; private Socket _samSocket;
private OutputStream _samOut; private OutputStream _samOut;
private InputStream _samIn; private InputStream _samIn;
private SAMReader _reader; private SAMReader _reader;
//private boolean _dead; //private boolean _dead;
private SAMEventHandler _eventHandler; private final SAMEventHandler _eventHandler;
/** Connection id (Integer) to peer (Flooder) */ /** Connection id (Integer) to peer (Flooder) */
private Map<Integer, Sink> _remotePeers; private final Map<Integer, Sink> _remotePeers;
public static void main(String args[]) { public static void main(String args[]) {
if (args.length < 4) { if (args.length < 4) {
@ -200,12 +200,12 @@ public class SAMStreamSink {
} }
private class Sink { private class Sink {
private int _connectionId; private final int _connectionId;
private String _remoteDestination; private final String _remoteDestination;
private boolean _closed; private volatile boolean _closed;
private long _started; private final long _started;
private long _lastReceivedOn; private long _lastReceivedOn;
private OutputStream _out; private final OutputStream _out;
public Sink(int conId, String remDest) throws IOException { public Sink(int conId, String remDest) throws IOException {
_connectionId = conId; _connectionId = conId;
@ -222,6 +222,7 @@ public class SAMStreamSink {
File out = File.createTempFile("sink", ".dat", sinkDir); File out = File.createTempFile("sink", ".dat", sinkDir);
_out = new FileOutputStream(out); _out = new FileOutputStream(out);
_started = _context.clock().now();
} }
public int getConnectionId() { return _connectionId; } public int getConnectionId() { return _connectionId; }