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

only use valid IP for geoIP

Browse Source
This commit is contained in:
zzz
2015-01-28 16:25:50 +00:00
parent d5a6ac591c
commit e5801be43e
1 changed files with 20 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
router/java/src/net/i2p/router/transport/CommSystemFacadeImpl.java
View File

@@ -390,24 +390,40 @@ public class CommSystemFacadeImpl extends CommSystemFacade {
RouterInfo ri = _context.netDb().lookupRouterInfoLocally(peer);
if (ri == null)
return null;
ip = getIP(ri);
ip = getValidIP(ri);
if (ip != null)
return _geoIP.get(ip);
return null;
}
/**
* Return first IP (v4 or v6) we find, any transport.
* Not validated, may be local, etc.
*/
private static byte[] getIP(RouterInfo ri) {
// Return first IP (v4 or v6) we find, any transport
// Assume IPv6 doesn't have geoIP for now
for (RouterAddress ra : ri.getAddresses()) {
byte[] rv = ra.getIP();
//if (rv != null && rv.length == 4)
if (rv != null)
return rv;
}
return null;
}
/**
* Return first valid IP (v4 or v6) we find, any transport.
* Local and other invalid IPs will not be returned.
*
* @since 0.9.18
*/
private static byte[] getValidIP(RouterInfo ri) {
for (RouterAddress ra : ri.getAddresses()) {
byte[] rv = ra.getIP();
if (rv != null && TransportUtil.isPubliclyRoutable(rv, true))
return rv;
}
return null;
}
/** full name for a country code, or the code if we don't know the name */
@Override
public String getCountryName(String c) {