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

GeoIP: Don't log error message when hitting the end

Browse Source 
of the geoipv6.dat file
This commit is contained in:
zzz
2018-06-16 17:23:57 +00:00
parent dd5c4af6fb
commit 8eb6dc0aef
1 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
router/java/src/net/i2p/router/transport/GeoIPv6.java
View File

@@ -7,6 +7,7 @@ package net.i2p.router.transport;
import java.io.BufferedInputStream; import java.io.BufferedInputStream;
import java.io.BufferedOutputStream; import java.io.BufferedOutputStream;
import java.io.BufferedReader; import java.io.BufferedReader;
import java.io.EOFException;
import java.io.IOException; import java.io.IOException;
import java.io.File; import java.io.File;
import java.io.FileInputStream; import java.io.FileInputStream;
@@ -52,7 +53,8 @@ public class GeoIPv6 {
* *
* @param search a sorted array of IPs to search * @param search a sorted array of IPs to search
* @return an array of country codes, same order as the search param, * @return an array of country codes, same order as the search param,
* or a zero-length array on failure * or a zero-length array on total failure.
* Individual array elements will be null for lookup failure of that item.
*/ */
public static String[] readGeoIPFile(I2PAppContext context, Long[] search, Map<String, String> codeCache) { public static String[] readGeoIPFile(I2PAppContext context, Long[] search, Map<String, String> codeCache) {
Log log = context.logManager().getLog(GeoIPv6.class); Log log = context.logManager().getLog(GeoIPv6.class);
@@ -72,7 +74,8 @@ public class GeoIPv6 {
* *
* @param search a sorted array of IPs to search * @param search a sorted array of IPs to search
* @return an array of country codes, same order as the search param, * @return an array of country codes, same order as the search param,
* or a zero-length array on failure * or a zero-length array on total failure.
* Individual array elements will be null for lookup failure of that item.
*/ */
private static String[] readGeoIPFile(File geoFile, Long[] search, Map<String, String> codeCache, Log log) { private static String[] readGeoIPFile(File geoFile, Long[] search, Map<String, String> codeCache, Log log) {
String[] rv = new String[search.length]; String[] rv = new String[search.length];
@@ -88,7 +91,14 @@ public class GeoIPv6 {
// skip timestamp and comments // skip timestamp and comments
DataHelper.skip(in, HEADER_LEN - MAGIC.length()); DataHelper.skip(in, HEADER_LEN - MAGIC.length());
byte[] buf = new byte[18]; byte[] buf = new byte[18];
while (DataHelper.read(in, buf) == 18 && idx < search.length) { while (idx < search.length) {
try {
DataHelper.read(in, buf);
} catch (EOFException eofe) {
// normal,
// we could hit the end before finding everything
break;
}
long ip1 = readLong(buf, 0); long ip1 = readLong(buf, 0);
long ip2 = readLong(buf, 8); long ip2 = readLong(buf, 8);
while (idx < search.length && search[idx].longValue() < ip1) { while (idx < search.length && search[idx].longValue() < ip1) {