From 5f3bddec0877c456ecfadb44e2c77d8c82c913f1 Mon Sep 17 00:00:00 2001 From: lionsoul Date: Sat, 21 Oct 2017 12:47:24 +0800 Subject: [PATCH] Bug fixed: Adjust the super header length to 8192 for all client implementation --- binding/c/ip2region.h | 4 +++- binding/c_mmap/ip2region.h | 2 +- binding/golang/ip2Region.go | 4 ++-- binding/java/src/org/lionsoul/ip2region/DbConfig.java | 4 ++-- binding/nodejs/ip2region.js | 2 +- binding/php/Ip2Region.class.php | 2 +- binding/python/ip2Region.py | 2 +- binding/python3/ip2Region.py | 2 +- 8 files changed, 12 insertions(+), 10 deletions(-) diff --git a/binding/c/ip2region.h b/binding/c/ip2region.h index 33820b3..5c807b3 100644 --- a/binding/c/ip2region.h +++ b/binding/c/ip2region.h @@ -43,7 +43,9 @@ typedef unsigned int uint_t; typedef unsigned long ulong_t; #define INDEX_BLOCK_LENGTH 12 -#define TOTAL_HEADER_LENGTH 4096 + +//thats 8 * 1024 +#define TOTAL_HEADER_LENGTH 8192 /* * ip2region properties struct diff --git a/binding/c_mmap/ip2region.h b/binding/c_mmap/ip2region.h index 8f81dbe..acd06ee 100644 --- a/binding/c_mmap/ip2region.h +++ b/binding/c_mmap/ip2region.h @@ -44,7 +44,7 @@ typedef unsigned int uint_t; typedef unsigned long ulong_t; #define INDEX_BLOCK_LENGTH 12 -#define TOTAL_HEADER_LENGTH 4096 +#define TOTAL_HEADER_LENGTH 8192 /* * ip2region properties struct diff --git a/binding/golang/ip2Region.go b/binding/golang/ip2Region.go index 3e06e72..adaf382 100644 --- a/binding/golang/ip2Region.go +++ b/binding/golang/ip2Region.go @@ -9,8 +9,8 @@ import ( ) const ( - INDEX_BLOCK_LENGTH = 12 - TOTAL_HEADER_LENGTH = 4096 + INDEX_BLOCK_LENGTH = 12 + TOTAL_HEADER_LENGTH = 8192 ) var err error diff --git a/binding/java/src/org/lionsoul/ip2region/DbConfig.java b/binding/java/src/org/lionsoul/ip2region/DbConfig.java index 1aa473f..365b870 100644 --- a/binding/java/src/org/lionsoul/ip2region/DbConfig.java +++ b/binding/java/src/org/lionsoul/ip2region/DbConfig.java @@ -32,12 +32,12 @@ public class DbConfig } this.totalHeaderSize = totalHeaderSize; - this.indexBlockSize = 4096; //4 * 1024 + this.indexBlockSize = 8192; //4 * 2048 } public DbConfig() throws DbMakerConfigException { - this(8192); + this(8 * 2048); } public int getTotalHeaderSize() diff --git a/binding/nodejs/ip2region.js b/binding/nodejs/ip2region.js index 3bfbac9..70bd0c7 100644 --- a/binding/nodejs/ip2region.js +++ b/binding/nodejs/ip2region.js @@ -18,7 +18,7 @@ var lastIndexPtr = 0; var superBlock = new Buffer(8); var indexBlockLength = 12; -var totalHeaderLength = 4096; +var totalHeaderLength = 8192; /** diff --git a/binding/php/Ip2Region.class.php b/binding/php/Ip2Region.class.php index 3c26879..f58a07d 100644 --- a/binding/php/Ip2Region.class.php +++ b/binding/php/Ip2Region.class.php @@ -7,7 +7,7 @@ */ defined('INDEX_BLOCK_LENGTH') or define('INDEX_BLOCK_LENGTH', 12); -defined('TOTAL_HEADER_LENGTH') or define('TOTAL_HEADER_LENGTH', 4096); +defined('TOTAL_HEADER_LENGTH') or define('TOTAL_HEADER_LENGTH', 8192); class Ip2Region { diff --git a/binding/python/ip2Region.py b/binding/python/ip2Region.py index 100566c..f30dc4b 100644 --- a/binding/python/ip2Region.py +++ b/binding/python/ip2Region.py @@ -110,7 +110,7 @@ class Ip2Region(object): #pass the super block self.__f.seek(8) #read the header block - b = self.__f.read(4086) + b = self.__f.read(8192) #parse the header block sip = None ptr = None diff --git a/binding/python3/ip2Region.py b/binding/python3/ip2Region.py index f2e638b..1636434 100644 --- a/binding/python3/ip2Region.py +++ b/binding/python3/ip2Region.py @@ -110,7 +110,7 @@ class Ip2Region(object): #pass the super block self.__f.seek(8) #read the header block - b = self.__f.read(4086) + b = self.__f.read(8192) #parse the header block sip = None ptr = None