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

Util: Add methods to validate IP addresses

Browse Source
This commit is contained in:
zzz
2018-02-28 17:58:28 +00:00
parent f129426eed
commit 5cd1419897
11 changed files with 53 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
router/java/src/net/i2p/data/router/RouterAddress.java
View File

@@ -17,8 +17,6 @@ import java.util.Date;
import java.util.Map;
import java.util.Properties;
import org.apache.http.conn.util.InetAddressUtils;
import net.i2p.data.DataFormatException;
import net.i2p.data.DataHelper;
import net.i2p.data.DataStructureImpl;

6
router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java
View File

@@ -24,8 +24,6 @@ import java.util.TreeSet;
import java.util.Vector;
import java.util.concurrent.ConcurrentHashMap;
import org.apache.http.conn.util.InetAddressUtils;
import net.i2p.crypto.SigType;
import net.i2p.data.DataHelper;
import net.i2p.data.Hash;
@@ -1002,12 +1000,12 @@ public class NTCPTransport extends TransportImpl {
String h = hosts[i];
if (h.length() <= 0)
continue;
if (InetAddressUtils.isIPv4Address(h)) {
if (Addresses.isIPv4Address(h)) {
if (v4)
continue;
v4 = true;
ipstrings.add(h);
} else if (InetAddressUtils.isIPv6Address(h)) {
} else if (Addresses.isIPv6Address(h)) {
if (v6)
continue;
v6 = true;

6
router/java/src/net/i2p/router/transport/udp/UDPAddress.java
View File

@@ -4,12 +4,11 @@ import java.net.InetAddress;
import java.net.UnknownHostException;
import java.util.Map;
import org.apache.http.conn.util.InetAddressUtils;
import net.i2p.data.Base64;
import net.i2p.data.router.RouterAddress;
import net.i2p.data.SessionKey;
import net.i2p.router.transport.TransportUtil;
import net.i2p.util.Addresses;
import net.i2p.util.LHMCache;
import net.i2p.util.SystemVersion;
@@ -339,8 +338,7 @@ class UDPAddress {
rv = _inetAddressCache.get(host);
}
if (rv == null) {
if (InetAddressUtils.isIPv4Address(host) ||
InetAddressUtils.isIPv6Address(host)) {
if (Addresses.isIPAddress(host)) {
try {
rv = InetAddress.getByName(host);
synchronized (_inetAddressCache) {

6
router/java/src/net/i2p/router/transport/udp/UDPTransport.java
View File

@@ -20,8 +20,6 @@ import java.util.concurrent.atomic.AtomicLong;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.CopyOnWriteArrayList;
import org.apache.http.conn.util.InetAddressUtils;
import net.i2p.crypto.SigType;
import net.i2p.data.DatabaseEntry;
import net.i2p.data.DataHelper;
@@ -2084,11 +2082,11 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority
String h = hosts[i];
if (h.length() <= 0)
continue;
if (InetAddressUtils.isIPv4Address(h)) {
if (Addresses.isIPv4Address(h)) {
if (v4)
continue;
v4 = true;
} else if (InetAddressUtils.isIPv6Address(h)) {
} else if (Addresses.isIPv6Address(h)) {
if (v6)
continue;
v6 = true;