archive-gh-me/ip2region
1
0
Fork 0
mirror of https://github.com/lionsoul2014/ip2region.git synced 2025-12-08 19:25:22 +00:00
Code Issues Projects Releases Wiki Activity

optimized the header block size & fix the may comming leak for c binding

Browse Source
This commit is contained in:
chenxin 2015-11-05 12:48:24 +08:00
parent 43cdeb8c17
commit 56c83f3895
4 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
binding/c/ip2region.c
View File

@ -36,6 +36,8 @@ IP2R_API uint_t ip2region_create(ip2region_t ip2rObj, char *dbFile)
ip2rObj->dbHandler = fopen(dbFile, "rb");
if ( ip2rObj->dbHandler == NULL )
{
IP2R_FREE(ip2rObj->HeaderSip);
IP2R_FREE(ip2rObj->HeaderPtr);
return 0;
}

2
binding/c/ip2region.h
View File

@ -44,7 +44,7 @@ typedef unsigned int uint_t;
typedef unsigned long ulong_t;
#define INDEX_BLOCK_LENGTH 12
#define TOTAL_HEADER_LENGTH 8192
#define TOTAL_HEADER_LENGTH 4096
/*
* ip2region properties struct

13
binding/java/src/org/lionsoul/ip2region/DbSearcher.java
View File

@ -91,7 +91,8 @@ public class DbSearcher
if ( HeaderSip == null )
{
raf.seek(8L); //pass the super block
byte[] b = new byte[dbConfig.getTotalHeaderSize()];
//byte[] b = new byte[dbConfig.getTotalHeaderSize()];
byte[] b = new byte[4096];
raf.readFully(b, 0, b.length);
//fill the header
@ -290,6 +291,16 @@ public class DbSearcher
{
return binarySearch(Util.ip2long(ip));
}
/**
* get the db config
*
* @return DbConfig
*/
public DbConfig getDbConfig()
{
return dbConfig;
}
/**
* close the db

2
binding/php/Ip2Region.class.php
View File

@ -7,7 +7,7 @@
*/
defined('INDEX_BLOCK_LENGTH') or define('INDEX_BLOCK_LENGTH', 12);
defined('TOTAL_HEADER_LENGTH') or define('TOTAL_HEADER_LENGTH', 8192);
defined('TOTAL_HEADER_LENGTH') or define('TOTAL_HEADER_LENGTH', 4096);
class Ip2Region
{