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

minor NTCP cleanup

Browse Source
This commit is contained in:
zzz
2012-08-16 19:02:38 +00:00
parent a900511d5e
commit ee63f3b86d
3 changed files with 14 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
router/java/src/net/i2p/router/transport/ntcp/NTCPAddress.java
View File

@ -21,8 +21,8 @@ import net.i2p.util.Log;
* Wrap up an address * Wrap up an address
*/ */
public class NTCPAddress { public class NTCPAddress {
private int _port; private final int _port;
private String _host; private final String _host;
//private InetAddress _addr; //private InetAddress _addr;
/** Port number used in RouterAddress definitions */ /** Port number used in RouterAddress definitions */
public final static String PROP_PORT = "port"; public final static String PROP_PORT = "port";
@ -33,16 +33,18 @@ public class NTCPAddress {
public NTCPAddress(String host, int port) { public NTCPAddress(String host, int port) {
if (host != null) if (host != null)
_host = host.trim(); _host = host.trim();
else
_host = null;
_port = port; _port = port;
} }
/*
public NTCPAddress() { public NTCPAddress() {
_host = null; _host = null;
_port = -1; _port = -1;
// _addr = null; // _addr = null;
} }
/*
public NTCPAddress(InetAddress addr, int port) { public NTCPAddress(InetAddress addr, int port) {
if (addr != null) if (addr != null)
_host = addr.getHostAddress(); _host = addr.getHostAddress();
@ -58,24 +60,22 @@ public class NTCPAddress {
return; return;
} }
String host = addr.getOption(PROP_HOST); String host = addr.getOption(PROP_HOST);
int iport = -1;
if (host == null) { if (host == null) {
_host = null; _host = null;
_port = -1;
} else { } else {
_host = host.trim(); _host = host.trim();
String port = addr.getOption(PROP_PORT); String port = addr.getOption(PROP_PORT);
if ( (port != null) && (port.trim().length() > 0) && !("null".equals(port)) ) { if ( (port != null) && (port.trim().length() > 0) && !("null".equals(port)) ) {
try { try {
_port = Integer.parseInt(port.trim()); iport = Integer.parseInt(port.trim());
} catch (NumberFormatException nfe) { } catch (NumberFormatException nfe) {
Log log = I2PAppContext.getGlobalContext().logManager().getLog(NTCPAddress.class); Log log = I2PAppContext.getGlobalContext().logManager().getLog(NTCPAddress.class);
log.error("Invalid port [" + port + "]", nfe); log.error("Invalid port [" + port + "]", nfe);
_port = -1;
} }
} else {
_port = -1;
} }
} }
_port = iport;
} }
public RouterAddress toRouterAddress() { public RouterAddress toRouterAddress() {
@ -97,11 +97,11 @@ public class NTCPAddress {
} }
public String getHost() { return _host; } public String getHost() { return _host; }
public void setHost(String host) { _host = host; } //public void setHost(String host) { _host = host; }
//public InetAddress getAddress() { return _addr; } //public InetAddress getAddress() { return _addr; }
//public void setAddress(InetAddress addr) { _addr = addr; } //public void setAddress(InetAddress addr) { _addr = addr; }
public int getPort() { return _port; } public int getPort() { return _port; }
public void setPort(int port) { _port = port; } //public void setPort(int port) { _port = port; }
public boolean isPubliclyRoutable() { public boolean isPubliclyRoutable() {
return isPubliclyRoutable(_host); return isPubliclyRoutable(_host);
@ -131,12 +131,11 @@ public class NTCPAddress {
@Override @Override
public int hashCode() { public int hashCode() {
int rv = 0; int rv = _port;
rv += _port;
//if (_addr != null) //if (_addr != null)
// rv += _addr.getHostAddress().hashCode(); // rv += _addr.getHostAddress().hashCode();
//else //else
if (_host != null) rv += _host.trim().hashCode(); if (_host != null) rv ^= _host.hashCode();
return rv; return rv;
} }

2
router/java/src/net/i2p/router/transport/ntcp/NTCPConnection.java
View File

@ -76,7 +76,7 @@ class NTCPConnection implements FIFOBandwidthLimiter.CompleteListener {
private EstablishState _establishState; private EstablishState _establishState;
private final NTCPTransport _transport; private final NTCPTransport _transport;
private final boolean _isInbound; private final boolean _isInbound;
private boolean _closed; private volatile boolean _closed;
private NTCPAddress _remAddr; private NTCPAddress _remAddr;
private RouterIdentity _remotePeer; private RouterIdentity _remotePeer;
private long _clockSkew; // in seconds private long _clockSkew; // in seconds

2
router/java/src/net/i2p/router/transport/ntcp/Reader.java
View File

@ -78,7 +78,7 @@ class Reader {
} }
private class Runner implements Runnable { private class Runner implements Runnable {
private boolean _stop; private volatile boolean _stop;
public Runner() {} public Runner() {}