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

* I2PTunnel standard and IRC clients:

Browse Source 
- Allow host:port targets; set defaults in i2ptunnel.config (ticket #1066)
   - Don't fail start if hostname is unresolvable; retry at connect time (ticket #946)
   - Output IRC message on connect fail
   - Update target list on-the-fly when configuration changes
This commit is contained in:
zzz
2013-10-23 20:20:54 +00:00
parent 0f5a0b6b1b
commit 8f7b31aed3
10 changed files with 265 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
apps/ministreaming/java/src/net/i2p/client/streaming/I2PSocketAddress.java
View File

@@ -11,22 +11,52 @@ import net.i2p.data.DataHelper;
* Ports are not widely used in I2P, in most cases the port will be zero.
* See InetSocketAddress for javadocs.
*
* Warning, this interface and implementation is preliminary and subject to change without notice.
*
* @since 0.9.1
*/
public class I2PSocketAddress extends SocketAddress {
private final int _port;
private final Destination _dest;
private Destination _dest;
private final String _host;
// no constructor for port-only "wildcard" address
/**
* Convenience constructor that parses host:port.
*
* Does a naming service lookup to resolve the dest.
* May take several seconds for b32.
* @param host hostname or b64 dest or b32, may have :port appended
* @throws IllegalArgumentException for port < 0 or port > 65535 or invalid port
* @since 0.9.9
*/
public I2PSocketAddress(String host) {
int port = 0;
int colon = host.indexOf(":");
if (colon > 0) {
try {
port = Integer.parseInt(host.substring(colon + 1));
host = host.substring(0, colon);
if (port < 0 || port > 65535)
throw new IllegalArgumentException("bad port " + port);
} catch (IndexOutOfBoundsException ioobe) {
throw new IllegalArgumentException("bad port " + host);
} catch (NumberFormatException nfe) {
throw new IllegalArgumentException("bad port " + host);
}
}
_port = port;
_dest = I2PAppContext.getGlobalContext().namingService().lookup(host);
_host = host;
}
/**
* Does not do a reverse lookup. Host will be null.
* @throws IllegalArgumentException for port < 0 or port > 65535
*/
public I2PSocketAddress(Destination dest, int port) {
if (dest == null)
throw new NullPointerException();
if (port < 0 || port > 65535)
throw new IllegalArgumentException("bad port " + port);
_port = port;
_dest = dest;
_host = null;
@@ -35,19 +65,27 @@ public class I2PSocketAddress extends SocketAddress {
/**
* Does a naming service lookup to resolve the dest.
* May take several seconds for b32.
* @throws IllegalArgumentException for port < 0 or port > 65535
*/
public I2PSocketAddress(String host, int port) {
if (port < 0 || port > 65535)
throw new IllegalArgumentException("bad port " + port);
_port = port;
_dest = I2PAppContext.getGlobalContext().namingService().lookup(host);
_host = host;
}
/**
* @throws IllegalArgumentException for port < 0 or port > 65535
*/
public static I2PSocketAddress createUnresolved(String host, int port) {
return new I2PSocketAddress(port, host);
}
/** unresolved */
private I2PSocketAddress(int port, String host) {
if (port < 0 || port > 65535)
throw new IllegalArgumentException("bad port " + port);
_port = port;
_dest = null;
_host = host;
@@ -57,7 +95,14 @@ public class I2PSocketAddress extends SocketAddress {
return _port;
}
public Destination getAddress() {
/**
* Does a naming service lookup to resolve the dest if this was created unresolved
* or if the resolution failed in the constructor.
* If unresolved, this may take several seconds for b32.
*/
public synchronized Destination getAddress() {
if (_dest == null)
_dest = I2PAppContext.getGlobalContext().namingService().lookup(_host);
return _dest;
}