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

enable IPv6 geoip lookup

Browse Source
This commit is contained in:
zzz
2013-05-24 14:11:35 +00:00
parent 3daf287de8
commit 6c62c1f362
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -280,15 +280,15 @@ public class CommSystemFacadeImpl extends CommSystemFacade {
/**
* Uses the transport IP first because that lookup is fast,
* then the SSU IP from the netDb.
* then the IP from the netDb.
*
* @return two-letter lower-case country code or null
*/
@Override
public String getCountry(Hash peer) {
byte[] ip = TransportImpl.getIP(peer);
// Assume IPv6 doesn't have geoIP for now
if (ip != null && ip.length == 4)
//if (ip != null && ip.length == 4)
if (ip != null)
return _geoIP.get(ip);
RouterInfo ri = _context.netDb().lookupRouterInfoLocally(peer);
if (ri == null)
@ -300,11 +300,12 @@ public class CommSystemFacadeImpl extends CommSystemFacade {
}
private static byte[] getIP(RouterInfo ri) {
// Return first IPv4 we find, any transport
// 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 && rv.length == 4)
if (rv != null)
return rv;
}
return null;