]> jfr.im git - irc/quakenet/newserv.git/blobdiff - geoip/libGeoIP/GeoIP.c
CHANSERV: tell user when they can't attempts to auth any more, and drop max attempts...
[irc/quakenet/newserv.git] / geoip / libGeoIP / GeoIP.c
index e3f7818472d69bc36c7cf245b315673789c751b2..77d94c4bad52fa7402b2c9ed6d8abbfbe9dc7ee6 100644 (file)
@@ -1,42 +1,51 @@
 /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 2; tab-width: 2 -*- */
 /* GeoIP.c
  *
- * Copyright (C) 2003 MaxMind LLC  All Rights Reserved.
+ * Copyright (C) 2006 MaxMind LLC
  *
  * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public
+ * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
+ * Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU General Public
+ * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
 #include "GeoIP.h"
 
+static geoipv6_t IPV6_NULL;
+
+#if !defined(WIN32) && !defined(WIN64)
 #include <netdb.h>
 #include <sys/socket.h>
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#ifndef _WIN32
-#include <netdb.h>
 #include <netinet/in.h> /* For ntohl */
 #include <arpa/inet.h>
+
+#include <sys/mman.h>
+
 #else
 #include <windows.h>
+#define snprintf _snprintf
 #endif
+#include <errno.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 #include <assert.h>
 #include <sys/types.h> /* for fstat */
 #include <sys/stat.h>  /* for fstat */
 
+#ifdef HAVE_GETTIMEOFDAY
+#include <sys/time.h> /* for gettimeofday */
+#endif
+
 #ifdef HAVE_STDINT_H
 #include <stdint.h>     /* For uint32_t */
 #endif
                } \
 }
 
-const char GeoIP_country_code[247][3] = { "--","AP","EU","AD","AE","AF","AG","AI","AL","AM","AN","AO","AQ","AR","AS","AT","AU","AW","AZ","BA","BB","BD","BE","BF","BG","BH","BI","BJ","BM","BN","BO","BR","BS","BT","BV","BW","BY","BZ","CA","CC","CD","CF","CG","CH","CI","CK","CL","CM","CN","CO","CR","CU","CV","CX","CY","CZ","DE","DJ","DK","DM","DO","DZ","EC","EE","EG","EH","ER","ES","ET","FI","FJ","FK","FM","FO","FR","FX","GA","GB","GD","GE","GF","GH","GI","GL","GM","GN","GP","GQ","GR","GS","GT","GU","GW","GY","HK","HM","HN","HR","HT","HU","ID","IE","IL","IN","IO","IQ","IR","IS","IT","JM","JO","JP","KE","KG","KH","KI","KM","KN","KP","KR","KW","KY","KZ","LA","LB","LC","LI","LK","LR","LS","LT","LU","LV","LY","MA","MC","MD","MG","MH","MK","ML","MM","MN","MO","MP","MQ","MR","MS","MT","MU","MV","MW","MX","MY","MZ","NA","NC","NE","NF","NG","NI","NL","NO","NP","NR","NU","NZ","OM","PA","PE","PF","PG","PH","PK","PL","PM","PN","PR","PS","PT","PW","PY","QA","RE","RO","RU","RW","SA","SB","SC","SD","SE","SG","SH","SI","SJ","SK","SL","SM","SN","SO","SR","ST","SV","SY","SZ","TC","TD","TF","TG","TH","TJ","TK","TM","TN","TO","TP","TR","TT","TV","TW","TZ","UA","UG","UM","US","UY","UZ","VA","VC","VE","VG","VI","VN","VU","WF","WS","YE","YT","YU","ZA","ZM","ZR","ZW","A1","A2","O1"};
-
-const char GeoIP_country_code3[247][4] = { "--","AP","EU","AND","ARE","AFG","ATG","AIA","ALB","ARM","ANT","AGO","AQ","ARG","ASM","AUT","AUS","ABW","AZE","BIH","BRB","BGD","BEL","BFA","BGR","BHR","BDI","BEN","BMU","BRN","BOL","BRA","BHS","BTN","BV","BWA","BLR","BLZ","CAN","CC","COD","CAF","COG","CHE","CIV","COK","CHL","CMR","CHN","COL","CRI","CUB","CPV","CX","CYP","CZE","DEU","DJI","DNK","DMA","DOM","DZA","ECU","EST","EGY","ESH","ERI","ESP","ETH","FIN","FJI","FLK","FSM","FRO","FRA","FX","GAB","GBR","GRD","GEO","GUF","GHA","GIB","GRL","GMB","GIN","GLP","GNQ","GRC","GS","GTM","GUM","GNB","GUY","HKG","HM","HND","HRV","HTI","HUN","IDN","IRL","ISR","IND","IO","IRQ","IRN","ISL","ITA","JAM","JOR","JPN","KEN","KGZ","KHM","KIR","COM","KNA","PRK","KOR","KWT","CYM","KAZ","LAO","LBN","LCA","LIE","LKA","LBR","LSO","LTU","LUX","LVA","LBY","MAR","MCO","MDA","MDG","MHL","MKD","MLI","MMR","MNG","MAC","MNP","MTQ","MRT","MSR","MLT","MUS","MDV","MWI","MEX","MYS","MOZ","NAM","NCL","NER","NFK","NGA","NIC","NLD","NOR","NPL","NRU","NIU","NZL","OMN","PAN","PER","PYF","PNG","PHL","PAK","POL","SPM","PCN","PRI","PSE","PRT","PLW","PRY","QAT","REU","ROU","RUS","RWA","SAU","SLB","SYC","SDN","SWE","SGP","SHN","SVN","SJM","SVK","SLE","SMR","SEN","SOM","SUR","STP","SLV","SYR","SWZ","TCA","TCD","TF","TGO","THA","TJK","TKL","TLS","TKM","TUN","TON","TUR","TTO","TUV","TWN","TZA","UKR","UGA","UM","USA","URY","UZB","VAT","VCT","VEN","VGB","VIR","VNM","VUT","WLF","WSM","YEM","YT","YUG","ZAF","ZMB","ZR","ZWE","A1","A2","O1"};
-
-const char * GeoIP_country_name[247] = {"N/A","Asia/Pacific Region","Europe","Andorra","United Arab Emirates","Afghanistan","Antigua and Barbuda","Anguilla","Albania","Armenia","Netherlands Antilles","Angola","Antarctica","Argentina","American Samoa","Austria","Australia","Aruba","Azerbaijan","Bosnia and Herzegovina","Barbados","Bangladesh","Belgium","Burkina Faso","Bulgaria","Bahrain","Burundi","Benin","Bermuda","Brunei Darussalam","Bolivia","Brazil","Bahamas","Bhutan","Bouvet Island","Botswana","Belarus","Belize","Canada","Cocos (Keeling) Islands","Congo, The Democratic Republic of the","Central African Republic","Congo","Switzerland","Cote D'Ivoire","Cook Islands","Chile","Cameroon","China","Colombia","Costa Rica","Cuba","Cape Verde","Christmas Island","Cyprus","Czech Republic","Germany","Djibouti","Denmark","Dominica","Dominican Republic","Algeria","Ecuador","Estonia","Egypt","Western Sahara","Eritrea","Spain","Ethiopia","Finland","Fiji","Falkland Islands (Malvinas)","Micronesia, Federated States of","Faroe Islands","France","France, Metropolitan","Gabon","United Kingdom","Grenada","Georgia","French Guiana","Ghana","Gibraltar","Greenland","Gambia","Guinea","Guadeloupe","Equatorial Guinea","Greece","South Georgia and the South Sandwich Islands","Guatemala","Guam","Guinea-Bissau","Guyana","Hong Kong","Heard Island and McDonald Islands","Honduras","Croatia","Haiti","Hungary","Indonesia","Ireland","Israel","India","British Indian Ocean Territory","Iraq","Iran, Islamic Republic of","Iceland","Italy","Jamaica","Jordan","Japan","Kenya","Kyrgyzstan","Cambodia","Kiribati","Comoros","Saint Kitts and Nevis",
-"Korea, Democratic People's Republic of","Korea, Republic of","Kuwait","Cayman Islands","Kazakhstan","Lao People's Democratic Republic","Lebanon","Saint Lucia","Liechtenstein","Sri Lanka","Liberia","Lesotho","Lithuania","Luxembourg","Latvia","Libyan Arab Jamahiriya","Morocco","Monaco","Moldova, Republic of","Madagascar","Marshall Islands","Macedonia","Mali","Myanmar","Mongolia","Macau","Northern Mariana Islands","Martinique","Mauritania","Montserrat","Malta","Mauritius","Maldives","Malawi","Mexico","Malaysia","Mozambique","Namibia","New Caledonia","Niger","Norfolk Island","Nigeria","Nicaragua","Netherlands","Norway","Nepal","Nauru","Niue","New Zealand","Oman","Panama","Peru","French Polynesia","Papua New Guinea","Philippines","Pakistan","Poland","Saint Pierre and Miquelon","Pitcairn Islands","Puerto Rico","Palestinian Territory, Occupied","Portugal","Palau","Paraguay","Qatar","Reunion","Romania","Russian Federation","Rwanda","Saudi Arabia","Solomon Islands","Seychelles","Sudan","Sweden","Singapore","Saint Helena","Slovenia","Svalbard and Jan Mayen","Slovakia","Sierra Leone","San Marino","Senegal","Somalia","Suriname","Sao Tome and Principe","El Salvador","Syrian Arab Republic","Swaziland","Turks and Caicos Islands","Chad","French Southern Territories","Togo","Thailand","Tajikistan","Tokelau","Turkmenistan","Tunisia","Tonga","East Timor","Turkey","Trinidad and Tobago","Tuvalu","Taiwan","Tanzania, United Republic of","Ukraine","Uganda","United States Minor Outlying Islands","United States","Uruguay","Uzbekistan","Holy See (Vatican City State)","Saint Vincent and the Grenadines","Venezuela","Virgin Islands, British","Virgin Islands, U.S.","Vietnam","Vanuatu","Wallis and Futuna","Samoa","Yemen","Mayotte","Yugoslavia","South Africa","Zambia","Zaire","Zimbabwe",
-"Anonymous Proxy","Satellite Provider","Other"};
+const char GeoIP_country_code[253][3] = { "--","AP","EU","AD","AE","AF","AG","AI","AL","AM","AN",
+       "AO","AQ","AR","AS","AT","AU","AW","AZ","BA","BB",
+       "BD","BE","BF","BG","BH","BI","BJ","BM","BN","BO",
+       "BR","BS","BT","BV","BW","BY","BZ","CA","CC","CD",
+       "CF","CG","CH","CI","CK","CL","CM","CN","CO","CR",
+       "CU","CV","CX","CY","CZ","DE","DJ","DK","DM","DO",
+       "DZ","EC","EE","EG","EH","ER","ES","ET","FI","FJ",
+       "FK","FM","FO","FR","FX","GA","GB","GD","GE","GF",
+       "GH","GI","GL","GM","GN","GP","GQ","GR","GS","GT",
+       "GU","GW","GY","HK","HM","HN","HR","HT","HU","ID",
+       "IE","IL","IN","IO","IQ","IR","IS","IT","JM","JO",
+       "JP","KE","KG","KH","KI","KM","KN","KP","KR","KW",
+       "KY","KZ","LA","LB","LC","LI","LK","LR","LS","LT",
+       "LU","LV","LY","MA","MC","MD","MG","MH","MK","ML",
+       "MM","MN","MO","MP","MQ","MR","MS","MT","MU","MV",
+       "MW","MX","MY","MZ","NA","NC","NE","NF","NG","NI",
+       "NL","NO","NP","NR","NU","NZ","OM","PA","PE","PF",
+       "PG","PH","PK","PL","PM","PN","PR","PS","PT","PW",
+       "PY","QA","RE","RO","RU","RW","SA","SB","SC","SD",
+       "SE","SG","SH","SI","SJ","SK","SL","SM","SN","SO",
+       "SR","ST","SV","SY","SZ","TC","TD","TF","TG","TH",
+       "TJ","TK","TM","TN","TO","TL","TR","TT","TV","TW",
+       "TZ","UA","UG","UM","US","UY","UZ","VA","VC","VE",
+       "VG","VI","VN","VU","WF","WS","YE","YT","RS","ZA",
+       "ZM","ME","ZW","A1","A2","O1","AX","GG","IM","JE",
+  "BL","MF"};
+
+static const unsigned num_GeoIP_countries = (unsigned)(sizeof(GeoIP_country_code)/sizeof(GeoIP_country_code[0]));
+
+const char GeoIP_country_code3[253][4] = { "--","AP","EU","AND","ARE","AFG","ATG","AIA","ALB","ARM","ANT",
+       "AGO","AQ","ARG","ASM","AUT","AUS","ABW","AZE","BIH","BRB",
+       "BGD","BEL","BFA","BGR","BHR","BDI","BEN","BMU","BRN","BOL",
+       "BRA","BHS","BTN","BV","BWA","BLR","BLZ","CAN","CC","COD",
+       "CAF","COG","CHE","CIV","COK","CHL","CMR","CHN","COL","CRI",
+       "CUB","CPV","CX","CYP","CZE","DEU","DJI","DNK","DMA","DOM",
+       "DZA","ECU","EST","EGY","ESH","ERI","ESP","ETH","FIN","FJI",
+       "FLK","FSM","FRO","FRA","FX","GAB","GBR","GRD","GEO","GUF",
+       "GHA","GIB","GRL","GMB","GIN","GLP","GNQ","GRC","GS","GTM",
+       "GUM","GNB","GUY","HKG","HM","HND","HRV","HTI","HUN","IDN",
+       "IRL","ISR","IND","IO","IRQ","IRN","ISL","ITA","JAM","JOR",
+       "JPN","KEN","KGZ","KHM","KIR","COM","KNA","PRK","KOR","KWT",
+       "CYM","KAZ","LAO","LBN","LCA","LIE","LKA","LBR","LSO","LTU",
+       "LUX","LVA","LBY","MAR","MCO","MDA","MDG","MHL","MKD","MLI",
+       "MMR","MNG","MAC","MNP","MTQ","MRT","MSR","MLT","MUS","MDV",
+       "MWI","MEX","MYS","MOZ","NAM","NCL","NER","NFK","NGA","NIC",
+       "NLD","NOR","NPL","NRU","NIU","NZL","OMN","PAN","PER","PYF",
+       "PNG","PHL","PAK","POL","SPM","PCN","PRI","PSE","PRT","PLW",
+       "PRY","QAT","REU","ROU","RUS","RWA","SAU","SLB","SYC","SDN",
+       "SWE","SGP","SHN","SVN","SJM","SVK","SLE","SMR","SEN","SOM",
+       "SUR","STP","SLV","SYR","SWZ","TCA","TCD","TF","TGO","THA",
+       "TJK","TKL","TKM","TUN","TON","TLS","TUR","TTO","TUV","TWN",
+       "TZA","UKR","UGA","UM","USA","URY","UZB","VAT","VCT","VEN",
+       "VGB","VIR","VNM","VUT","WLF","WSM","YEM","YT","SRB","ZAF",
+       "ZMB","MNE","ZWE","A1","A2","O1","ALA","GGY","IMN","JEY",
+  "BLM","MAF"};
+
+const char * GeoIP_country_name[253] = {"N/A","Asia/Pacific Region","Europe","Andorra","United Arab Emirates","Afghanistan","Antigua and Barbuda","Anguilla","Albania","Armenia","Netherlands Antilles",
+       "Angola","Antarctica","Argentina","American Samoa","Austria","Australia","Aruba","Azerbaijan","Bosnia and Herzegovina","Barbados",
+       "Bangladesh","Belgium","Burkina Faso","Bulgaria","Bahrain","Burundi","Benin","Bermuda","Brunei Darussalam","Bolivia",
+       "Brazil","Bahamas","Bhutan","Bouvet Island","Botswana","Belarus","Belize","Canada","Cocos (Keeling) Islands","Congo, The Democratic Republic of the",
+       "Central African Republic","Congo","Switzerland","Cote D'Ivoire","Cook Islands","Chile","Cameroon","China","Colombia","Costa Rica",
+       "Cuba","Cape Verde","Christmas Island","Cyprus","Czech Republic","Germany","Djibouti","Denmark","Dominica","Dominican Republic",
+       "Algeria","Ecuador","Estonia","Egypt","Western Sahara","Eritrea","Spain","Ethiopia","Finland","Fiji",
+       "Falkland Islands (Malvinas)","Micronesia, Federated States of","Faroe Islands","France","France, Metropolitan","Gabon","United Kingdom","Grenada","Georgia","French Guiana",
+       "Ghana","Gibraltar","Greenland","Gambia","Guinea","Guadeloupe","Equatorial Guinea","Greece","South Georgia and the South Sandwich Islands","Guatemala",
+       "Guam","Guinea-Bissau","Guyana","Hong Kong","Heard Island and McDonald Islands","Honduras","Croatia","Haiti","Hungary","Indonesia",
+       "Ireland","Israel","India","British Indian Ocean Territory","Iraq","Iran, Islamic Republic of","Iceland","Italy","Jamaica","Jordan",
+       "Japan","Kenya","Kyrgyzstan","Cambodia","Kiribati","Comoros","Saint Kitts and Nevis","Korea, Democratic People's Republic of","Korea, Republic of","Kuwait",
+       "Cayman Islands","Kazakhstan","Lao People's Democratic Republic","Lebanon","Saint Lucia","Liechtenstein","Sri Lanka","Liberia","Lesotho","Lithuania",
+       "Luxembourg","Latvia","Libyan Arab Jamahiriya","Morocco","Monaco","Moldova, Republic of","Madagascar","Marshall Islands","Macedonia","Mali",
+       "Myanmar","Mongolia","Macau","Northern Mariana Islands","Martinique","Mauritania","Montserrat","Malta","Mauritius","Maldives",
+       "Malawi","Mexico","Malaysia","Mozambique","Namibia","New Caledonia","Niger","Norfolk Island","Nigeria","Nicaragua",
+       "Netherlands","Norway","Nepal","Nauru","Niue","New Zealand","Oman","Panama","Peru","French Polynesia",
+       "Papua New Guinea","Philippines","Pakistan","Poland","Saint Pierre and Miquelon","Pitcairn Islands","Puerto Rico","Palestinian Territory","Portugal","Palau",
+       "Paraguay","Qatar","Reunion","Romania","Russian Federation","Rwanda","Saudi Arabia","Solomon Islands","Seychelles","Sudan",
+       "Sweden","Singapore","Saint Helena","Slovenia","Svalbard and Jan Mayen","Slovakia","Sierra Leone","San Marino","Senegal","Somalia","Suriname",
+       "Sao Tome and Principe","El Salvador","Syrian Arab Republic","Swaziland","Turks and Caicos Islands","Chad","French Southern Territories","Togo","Thailand",
+       "Tajikistan","Tokelau","Turkmenistan","Tunisia","Tonga","Timor-Leste","Turkey","Trinidad and Tobago","Tuvalu","Taiwan",
+       "Tanzania, United Republic of","Ukraine","Uganda","United States Minor Outlying Islands","United States","Uruguay","Uzbekistan","Holy See (Vatican City State)","Saint Vincent and the Grenadines","Venezuela",
+       "Virgin Islands, British","Virgin Islands, U.S.","Vietnam","Vanuatu","Wallis and Futuna","Samoa","Yemen","Mayotte","Serbia","South Africa",
+       "Zambia","Montenegro","Zimbabwe","Anonymous Proxy","Satellite Provider","Other","Aland Islands","Guernsey","Isle of Man","Jersey",
+  "Saint Barthelemy","Saint Martin"};
+
+/* Possible continent codes are AF, AS, EU, NA, OC, SA for Africa, Asia, Europe, North America, Oceania
+and South America. */
+
+const char GeoIP_country_continent[253][3] = {"--","AS","EU","EU","AS","AS","SA","SA","EU","AS","SA",
+       "AF","AN","SA","OC","EU","OC","SA","AS","EU","SA",
+       "AS","EU","AF","EU","AS","AF","AF","SA","AS","SA",
+       "SA","SA","AS","AF","AF","EU","SA","NA","AS","AF",
+       "AF","AF","EU","AF","OC","SA","AF","AS","SA","SA",
+       "SA","AF","AS","AS","EU","EU","AF","EU","SA","SA",
+       "AF","SA","EU","AF","AF","AF","EU","AF","EU","OC",
+       "SA","OC","EU","EU","EU","AF","EU","SA","AS","SA",
+       "AF","EU","SA","AF","AF","SA","AF","EU","SA","SA",
+       "OC","AF","SA","AS","AF","SA","EU","SA","EU","AS",
+       "EU","AS","AS","AS","AS","AS","EU","EU","SA","AS",
+       "AS","AF","AS","AS","OC","AF","SA","AS","AS","AS",
+       "SA","AS","AS","AS","SA","EU","AS","AF","AF","EU",
+       "EU","EU","AF","AF","EU","EU","AF","OC","EU","AF",
+       "AS","AS","AS","OC","SA","AF","SA","EU","AF","AS",
+       "AF","NA","AS","AF","AF","OC","AF","OC","AF","SA",
+       "EU","EU","AS","OC","OC","OC","AS","SA","SA","OC",
+       "OC","AS","AS","EU","SA","OC","SA","AS","EU","OC",
+       "SA","AS","AF","EU","AS","AF","AS","OC","AF","AF",
+       "EU","AS","AF","EU","EU","EU","AF","EU","AF","AF",
+       "SA","AF","SA","AS","AF","SA","AF","AF","AF","AS",
+       "AS","OC","AS","AF","OC","AS","AS","SA","OC","AS",
+       "AF","EU","AF","OC","NA","SA","AS","EU","SA","SA",
+       "SA","SA","AS","OC","OC","OC","AS","AF","EU","AF",
+       "AF","EU","AF","--","--","--","EU","EU","EU","EU",
+  "SA","SA"};
+
+geoipv6_t _GeoIP_lookupaddress_v6 (const char *host);
+
+int __GEOIP_V6_IS_NULL(geoipv6_t v6) {
+        int i; 
+        for (i=0;i<16;i++) {
+                if (v6.s6_addr[i])
+                        return 0;
+        }
+        return 1;
+}
 
-const char GeoIP_country_continent[247][3] = {"--","AS","EU","EU","AS","AS","SA","SA","EU","AS","SA","AF","AN","SA","OC","EU","OC","SA","AS","EU","SA","AS","EU","AF","EU","AS","AF","AF","SA","AS","SA","SA","SA","AS","AF","AF","EU","SA","NA","AS","AF","AF","AF","EU","AF","OC","SA","AF","AS","SA","SA","SA","AF","AS","AS","EU","EU","AF","EU","SA","SA","AF","SA","EU","AF","AF","AF","EU","AF","EU","OC","SA","OC","EU","EU","EU","AF","EU","SA","AS","SA","AF","EU","SA","AF","AF","SA","AF","EU","SA","SA","OC","AF","SA","AS","AF","SA","EU","SA","EU","AS","EU","AS","AS","AS","AS","AS","EU","EU","SA","AS","AS","AF","AS","AS","OC","AF","SA","AS","AS","AS","SA","AS","AS","AS","SA","EU","AS","AF","AF","EU","EU","EU","AF","AF","EU","EU","AF","OC","EU","AF","AS","AS","AS","OC","SA","AF","SA","EU","AF","AS","AF","NA","AS","AF","AF","OC","AF","OC","AF","SA","EU","EU","AS","OC","OC","OC","AS","SA","SA","OC","OC","AS","AS","EU","SA","OC","SA","AS","EU","OC","SA","AS","AF","EU","AS","AF","AS","OC","AF","AF","EU","AS","AF","EU","EU","EU","AF","EU","AF","AF","SA","AF","SA","AS","AF","SA","AF","AF","AF","AS","AS","OC","AS","AF","OC","AS","AS","SA","OC","AS","AF","EU","AF","OC","NA","SA","AS","EU","SA","SA","SA","SA","AS","OC","OC","OC","AS","AF","EU","AF","AF","AF","AF"};
+const char * GeoIPDBDescription[NUM_DB_TYPES] = {NULL, "GeoIP Country Edition", "GeoIP City Edition, Rev 1", "GeoIP Region Edition, Rev 1", "GeoIP ISP Edition", "GeoIP Organization Edition", "GeoIP City Edition, Rev 0", "GeoIP Region Edition, Rev 0","GeoIP Proxy Edition","GeoIP ASNum Edition","GeoIP Netspeed Edition","GeoIP Domain Name Edition", "GeoIP Country V6 Edition"};
 
-const char * GeoIPDBDescription[NUM_DB_TYPES] = {NULL, "GeoIP Country Edition", "GeoIP City Edition, Rev 1", "GeoIP Region Edition, Rev 1", "GeoIP ISP Edition", "GeoIP Organization Edition", "GeoIP City Edition, Rev 0", "GeoIP Region Edition, Rev 0","GeoIP Proxy Edition","GeoIP ASNum Edition","GeoIP Netspeed Edition"};
+char * custom_directory = NULL;
 
-#define GEOIPDATADIR "/"
+void GeoIP_setup_custom_directory (char * dir) {
+       custom_directory = dir;
+}
 
-char *_full_path_to(const char *file_name) {
+char *_GeoIP_full_path_to(const char *file_name) {
+       int len;
        char *path = malloc(sizeof(char) * 1024);
 
-#ifndef _WIN32
-       memset(path, 0, sizeof(char) * 1024);
-       snprintf(path, sizeof(char) * 1024 - 1, "%s/%s", GEOIPDATADIR, file_name);
+       if (custom_directory == NULL){
+#if !defined(WIN32) && !defined(WIN64)
+               memset(path, 0, sizeof(char) * 1024);
+               snprintf(path, sizeof(char) * 1024 - 1, "%s/%s", GEOIPDATADIR, file_name);
 #else
-       char buf[MAX_PATH], *p, *q = NULL;
-       int len;
-       memset(buf, 0, sizeof(buf));
-       len = GetModuleFileName(GetModuleHandle(NULL), buf, sizeof(buf) - 1);
-       for (p = buf + len; p > buf; p--)
-               if (*p == '\\')
-               {
-                       if (!q)
-                               q = p;
-                       else
-                               *p = '/';
-               }
-       *q = 0;
-       memset(path, 0, sizeof(char) * 1024);
-       snprintf(path, sizeof(char) * 1024 - 1, "%s/%s", buf, file_name);
+               char buf[MAX_PATH], *p, *q = NULL;
+               memset(buf, 0, sizeof(buf));
+               len = GetModuleFileName(GetModuleHandle(NULL), buf, sizeof(buf) - 1);
+               for (p = buf + len; p > buf; p--)
+                       if (*p == '\\')
+                               {
+                                       if (!q)
+                                               q = p;
+                                       else
+                                               *p = '/';
+                               }
+               *q = 0;
+               memset(path, 0, sizeof(char) * 1024);
+               snprintf(path, sizeof(char) * 1024 - 1, "%s/%s", buf, file_name);
 #endif
-
+       } else {
+               len = strlen(custom_directory);
+               if (custom_directory[len-1] != '/') {
+                       snprintf(path, sizeof(char) * 1024 - 1, "%s/%s",custom_directory, file_name);
+               } else {
+                       snprintf(path, sizeof(char) * 1024 - 1, "%s%s", custom_directory, file_name);
+               }
+       }
        return path;
 }
 
 char ** GeoIPDBFileName = NULL;
 
-void _setup_dbfilename() {
+void _GeoIP_setup_dbfilename() {
        if (NULL == GeoIPDBFileName) {
                GeoIPDBFileName = malloc(sizeof(char *) * NUM_DB_TYPES);
                memset(GeoIPDBFileName, 0, sizeof(char *) * NUM_DB_TYPES);
 
-               GeoIPDBFileName[GEOIP_COUNTRY_EDITION]          = _full_path_to("GeoIP.dat");
-               GeoIPDBFileName[GEOIP_REGION_EDITION_REV0]      = _full_path_to("GeoIPRegion.dat");
-               GeoIPDBFileName[GEOIP_REGION_EDITION_REV1]      = _full_path_to("GeoIPRegion.dat");
-               GeoIPDBFileName[GEOIP_CITY_EDITION_REV0]        = _full_path_to("GeoIPCity.dat");
-               GeoIPDBFileName[GEOIP_CITY_EDITION_REV1]        = _full_path_to("GeoIPCity.dat");
-               GeoIPDBFileName[GEOIP_ISP_EDITION]              = _full_path_to("GeoIPISP.dat");
-               GeoIPDBFileName[GEOIP_ORG_EDITION]              = _full_path_to("GeoIPOrg.dat");
-               GeoIPDBFileName[GEOIP_PROXY_EDITION]            = _full_path_to("GeoIPProxy.dat");
-               GeoIPDBFileName[GEOIP_ASNUM_EDITION]            = _full_path_to("GeoIPASNum.dat");
-               GeoIPDBFileName[GEOIP_NETSPEED_EDITION]         = _full_path_to("GeoIPNetSpeed.dat");
+               GeoIPDBFileName[GEOIP_COUNTRY_EDITION]          = _GeoIP_full_path_to("GeoIP.dat");
+               GeoIPDBFileName[GEOIP_REGION_EDITION_REV0]      = _GeoIP_full_path_to("GeoIPRegion.dat");
+               GeoIPDBFileName[GEOIP_REGION_EDITION_REV1]      = _GeoIP_full_path_to("GeoIPRegion.dat");
+               GeoIPDBFileName[GEOIP_CITY_EDITION_REV0]        = _GeoIP_full_path_to("GeoIPCity.dat");
+               GeoIPDBFileName[GEOIP_CITY_EDITION_REV1]        = _GeoIP_full_path_to("GeoIPCity.dat");
+               GeoIPDBFileName[GEOIP_ISP_EDITION]              = _GeoIP_full_path_to("GeoIPISP.dat");
+               GeoIPDBFileName[GEOIP_ORG_EDITION]              = _GeoIP_full_path_to("GeoIPOrg.dat");
+               GeoIPDBFileName[GEOIP_PROXY_EDITION]            = _GeoIP_full_path_to("GeoIPProxy.dat");
+               GeoIPDBFileName[GEOIP_ASNUM_EDITION]            = _GeoIP_full_path_to("GeoIPASNum.dat");
+               GeoIPDBFileName[GEOIP_NETSPEED_EDITION]         = _GeoIP_full_path_to("GeoIPNetSpeed.dat");
+               GeoIPDBFileName[GEOIP_DOMAIN_EDITION]           = _GeoIP_full_path_to("GeoIPDomain.dat");
+                GeoIPDBFileName[GEOIP_COUNTRY_EDITION_V6]       = _GeoIP_full_path_to("GeoIPv6.dat");
        }
 }
 
+static
 int _file_exists(const char *file_name) {
-       FILE *f;
-       f = fopen(file_name, "r");
-       if(!f)
-               return 0;
-        fclose(f);
-       return 1;
+       struct stat file_stat;
+       return( (stat(file_name, &file_stat) == 0) ? 1:0);
 }
 
 int GeoIP_db_avail(int type) {
@@ -138,6 +272,7 @@ int GeoIP_db_avail(int type) {
        if (type < 0 || type >= NUM_DB_TYPES) {
                return 0;
        }
+       _GeoIP_setup_dbfilename();
        filePath = GeoIPDBFileName[type];
        if (NULL == filePath) {
                return 0;
@@ -145,11 +280,14 @@ int GeoIP_db_avail(int type) {
        return _file_exists(filePath);
 }
 
+static
 void _setup_segments(GeoIP * gi) {
        int i, j;
        unsigned char delim[3];
        unsigned char buf[SEGMENT_RECORD_LENGTH];
 
+       gi->databaseSegments = NULL;
+
        /* default to GeoIP Country Edition */
        gi->databaseType = GEOIP_COUNTRY_EDITION;
        gi->record_length = STANDARD_RECORD_LENGTH;
@@ -194,13 +332,187 @@ void _setup_segments(GeoIP * gi) {
        }
        if (gi->databaseType == GEOIP_COUNTRY_EDITION ||
                        gi->databaseType == GEOIP_PROXY_EDITION ||
-                       gi->databaseType == GEOIP_NETSPEED_EDITION) {
+                       gi->databaseType == GEOIP_NETSPEED_EDITION ||
+                       gi->databaseType == GEOIP_COUNTRY_EDITION_V6 ) {
                gi->databaseSegments = malloc(sizeof(int));
                gi->databaseSegments[0] = COUNTRY_BEGIN;
        }
 }
 
-unsigned int _seek_record (GeoIP *gi, unsigned long ipnum) {
+static
+int _check_mtime(GeoIP *gi) {
+       struct stat buf;
+  struct timeval t;
+               
+       /* stat only has second granularity, so don't
+          call it more than once a second */
+       gettimeofday(&t, NULL);
+       if (t.tv_sec == gi->last_mtime_check){
+               return 0;
+       }
+       gi->last_mtime_check = t.tv_sec;
+
+  if (gi->flags & GEOIP_CHECK_CACHE) {
+               if (stat(gi->file_path, &buf) != -1) {
+                       if (buf.st_mtime != gi->mtime) {
+                               /* GeoIP Database file updated */
+                               if (gi->flags & (GEOIP_MEMORY_CACHE | GEOIP_MMAP_CACHE)) {
+                                   if ( gi->flags & GEOIP_MMAP_CACHE) {
+#if !defined(WIN32) && !defined(WIN64)
+                                                       /* MMAP is only avail on UNIX */
+                                       munmap(gi->cache, gi->size);
+                                       gi->cache = NULL;
+#endif
+                                   } else {
+                                       /* reload database into memory cache */
+                                       if ((gi->cache = (unsigned char*) realloc(gi->cache, buf.st_size)) == NULL) {
+                                               fprintf(stderr,"Out of memory when reloading %s\n",gi->file_path);
+                                               return -1;
+                                       }
+                                   }
+                               }
+                               /* refresh filehandle */
+                               fclose(gi->GeoIPDatabase);
+                               gi->GeoIPDatabase = fopen(gi->file_path,"rb");
+                               if (gi->GeoIPDatabase == NULL) {
+                                       fprintf(stderr,"Error Opening file %s when reloading\n",gi->file_path);
+                                       return -1;
+                               }
+                               gi->mtime = buf.st_mtime;
+                               gi->size = buf.st_size;
+
+                               if ( gi->flags & GEOIP_MMAP_CACHE) {
+#if defined(WIN32) || defined(WIN64)
+                                       fprintf(stderr, "GEOIP_MMAP_CACHE is not supported on WIN32\n");
+                                       gi->cache = 0;
+                                       return -1;
+#else
+                                   gi->cache = mmap(NULL, buf.st_size, PROT_READ, MAP_PRIVATE, fileno(gi->GeoIPDatabase), 0);
+                                   if ( gi->cache == MAP_FAILED ) {
+
+                                           fprintf(stderr,"Error remapping file %s when reloading\n",gi->file_path);
+
+                                           gi->cache = 0;
+                                           return -1;
+                                   }
+#endif
+                               } else if ( gi->flags & GEOIP_MEMORY_CACHE ) {
+                                   if (fread(gi->cache, sizeof(unsigned char), buf.st_size, gi->GeoIPDatabase) != (size_t) buf.st_size) {
+                                           fprintf(stderr,"Error reading file %s when reloading\n",gi->file_path);
+                                           return -1;
+                                       }
+                               }
+
+                               if (gi->databaseSegments != NULL) {
+                                       free(gi->databaseSegments);
+                                       gi->databaseSegments = NULL;
+                               }
+                               _setup_segments(gi);
+                               if (gi->databaseSegments == NULL) {
+                                       fprintf(stderr, "Error reading file %s -- corrupt\n", gi->file_path);
+                                       return -1;
+                               }
+                               if (gi->flags & GEOIP_INDEX_CACHE) {                        
+                                       gi->index_cache = (unsigned char *) realloc(gi->index_cache, sizeof(unsigned char) * ((gi->databaseSegments[0] * (long)gi->record_length * 2)));
+                                       if (gi->index_cache != NULL) {
+                                               fseek(gi->GeoIPDatabase, 0, SEEK_SET);
+                                               if (fread(gi->index_cache, sizeof(unsigned char), gi->databaseSegments[0] * (long)gi->record_length * 2, gi->GeoIPDatabase) != (size_t) (gi->databaseSegments[0]*(long)gi->record_length * 2)) {
+                                                       fprintf(stderr,"Error reading file %s where reloading\n",gi->file_path);
+                                                       return -1;
+                                               }
+                                       }
+                               }
+                       }
+               }
+       }
+       return 0;
+}
+
+unsigned int _GeoIP_seek_record_v6 (GeoIP *gi, geoipv6_t ipnum) {
+       int depth;
+       char paddr[8 * 4 + 7 + 1];
+       unsigned int x;
+       unsigned char stack_buffer[2 * MAX_RECORD_LENGTH];
+       const unsigned char *buf = (gi->cache == NULL) ? stack_buffer : NULL;
+       unsigned int offset = 0;
+
+       const unsigned char * p;
+       int j;
+
+       _check_mtime(gi);
+       for (depth = 127; depth >= 0; depth--) {
+               if (gi->cache == NULL && gi->index_cache == NULL) {
+                       /* read from disk */
+                       fseek(gi->GeoIPDatabase, (long)gi->record_length * 2 * offset, SEEK_SET);
+                       fread(stack_buffer,gi->record_length,2,gi->GeoIPDatabase);
+               } else if (gi->index_cache == NULL) {
+                       /* simply point to record in memory */
+                       buf = gi->cache + (long)gi->record_length * 2 *offset;
+               } else {
+                       buf = gi->index_cache + (long)gi->record_length * 2 * offset;
+               }
+
+               if (GEOIP_CHKBIT_V6(depth, ipnum.s6_addr )) {
+                       /* Take the right-hand branch */
+                       if ( gi->record_length == 3 ) {
+                               /* Most common case is completely unrolled and uses constants. */
+                               x =   (buf[3*1 + 0] << (0*8))
+                                       + (buf[3*1 + 1] << (1*8))
+                                       + (buf[3*1 + 2] << (2*8));
+
+                       } else {
+                               /* General case */
+                               j = gi->record_length;
+                               p = &buf[2*j];
+                               x = 0;
+                               do {
+                                       x <<= 8;
+                                       x += *(--p);
+                               } while ( --j );
+                       }
+
+               } else {
+                       /* Take the left-hand branch */
+                       if ( gi->record_length == 3 ) {
+                               /* Most common case is completely unrolled and uses constants. */
+                               x =   (buf[3*0 + 0] << (0*8))
+                                       + (buf[3*0 + 1] << (1*8))
+                                       + (buf[3*0 + 2] << (2*8));
+                       } else {
+                               /* General case */
+                               j = gi->record_length;
+                               p = &buf[1*j];
+                               x = 0;
+                               do {
+                                       x <<= 8;
+                                       x += *(--p);
+                               } while ( --j );
+                       }
+               }
+
+               if (x >= gi->databaseSegments[0]) {
+                       gi->netmask = 128 - depth;
+                       return x;
+               }
+               offset = x;
+       }
+
+       /* shouldn't reach here */
+        inet_pton(AF_INET6, &ipnum.s6_addr[0], paddr );        
+       fprintf(stderr,"Error Traversing Database for ipnum = %s - Perhaps database is corrupt?\n", paddr);
+       return 0;
+}
+
+geoipv6_t
+_GeoIP_addr_to_num_v6(const char *addr)
+{
+       geoipv6_t       ipnum;
+        if ( 1 == inet_pton(AF_INET6, addr, &ipnum.s6_addr[0] ) )
+          return ipnum;
+       return IPV6_NULL;
+}
+
+unsigned int _GeoIP_seek_record (GeoIP *gi, unsigned long ipnum) {
        int depth;
        unsigned int x;
        unsigned char stack_buffer[2 * MAX_RECORD_LENGTH];
@@ -210,6 +522,7 @@ unsigned int _seek_record (GeoIP *gi, unsigned long ipnum) {
        const unsigned char * p;
        int j;
 
+       _check_mtime(gi);
        for (depth = 31; depth >= 0; depth--) {
                if (gi->cache == NULL && gi->index_cache == NULL) {
                        /* read from disk */
@@ -261,6 +574,7 @@ unsigned int _seek_record (GeoIP *gi, unsigned long ipnum) {
                }
 
                if (x >= gi->databaseSegments[0]) {
+                       gi->netmask = 32 - depth;
                        return x;
                }
                offset = x;
@@ -271,39 +585,37 @@ unsigned int _seek_record (GeoIP *gi, unsigned long ipnum) {
        return 0;
 }
 
-unsigned long _addr_to_num (const char *addr) {
-       int i;
-       char tok[4];
-       int octet;
-       int j = 0, k = 0;
-       unsigned long ipnum = 0;
-       char c = 0;
-
-       for (i=0; i<4; i++) {
-               for (;;) {
-                       c = addr[k++];
-                       if (c == '.' || c == '\0') {
-                               tok[j] = '\0';
-                               octet = atoi(tok);
-                               if (octet > 255)
-                                       return 0;
-                               ipnum += (octet << ((3-i)*8));
-                               j = 0;
-                               break;
-                       } else if (c >= '0' && c<= '9') {
-                               if (j > 2) {
-                                       return 0;
-                               }
-                               tok[j++] = c;
-                       } else {
+unsigned long
+_GeoIP_addr_to_num(const char *addr)
+{
+       unsigned int    c, octet, t;
+       unsigned long   ipnum;
+       int             i = 3;
+
+       octet = ipnum = 0;
+       while ((c = *addr++)) {
+               if (c == '.') {
+                       if (octet > 255)
                                return 0;
-                       }
-               }
-               if(c == '\0' && i<3) {
-                       return 0;
+                       ipnum <<= 8;
+                       ipnum += octet;
+                       i--;
+                       octet = 0;
+               } else {
+                       t = octet;
+                       octet <<= 3;
+                       octet += t;
+                       octet += t;
+                       c -= '0';
+                       if (c > 9)
+                               return 0;
+                       octet += c;
                }
        }
-       return ipnum;
+       if ((octet > 255) || (i != 0))
+               return 0;
+       ipnum <<= 8;
+       return ipnum + octet;
 }
 
 GeoIP* GeoIP_open_type (int type, int flags) {
@@ -313,7 +625,7 @@ GeoIP* GeoIP_open_type (int type, int flags) {
                printf("Invalid database type %d\n", type);
                return NULL;
        }
-       _setup_dbfilename();
+       _GeoIP_setup_dbfilename();
        filePath = GeoIPDBFileName[type];
        if (filePath == NULL) {
                printf("Invalid database type %d\n", type);
@@ -323,26 +635,34 @@ GeoIP* GeoIP_open_type (int type, int flags) {
        return gi;
 }
 
-GeoIP* GeoIP_new (int flags, char *filename) {
+GeoIP* GeoIP_new (int flags) {
        GeoIP * gi;
-       gi = GeoIP_open (filename, flags);
+       _GeoIP_setup_dbfilename();
+       gi = GeoIP_open (GeoIPDBFileName[GEOIP_COUNTRY_EDITION], flags);
        return gi;
 }
 
 GeoIP* GeoIP_open (const char * filename, int flags) {
-#ifdef _WIN32
+       struct stat buf;
+       GeoIP * gi;
+       size_t len;
+
+#if defined(WIN32) || defined(WIN64)
        WSADATA wsa;
        if (WSAStartup(MAKEWORD(1, 1), &wsa) != 0)
                return NULL;
 #endif
 
-       GeoIP *gi = (GeoIP *)malloc(sizeof(GeoIP));
+       gi = (GeoIP *)malloc(sizeof(GeoIP));
        if (gi == NULL)
                return NULL;
-       gi->file_path = malloc(sizeof(char) * (strlen(filename)+1));
-       if (gi->file_path == NULL)
+       len = sizeof(char) * (strlen(filename)+1);
+       gi->file_path = malloc(len);
+       if (gi->file_path == NULL) {
+               free(gi);
                return NULL;
-       strcpy(gi->file_path, filename);
+       }
+       strncpy(gi->file_path, filename, len);
        gi->GeoIPDatabase = fopen(filename,"rb");
        if (gi->GeoIPDatabase == NULL) {
                fprintf(stderr,"Error Opening file %s\n",filename);
@@ -350,36 +670,68 @@ GeoIP* GeoIP_open (const char * filename, int flags) {
                free(gi);
                return NULL;
        } else {
-               long st_size;
-               fseek(gi->GeoIPDatabase, 0, SEEK_END);
-               st_size = ftell(gi->GeoIPDatabase);
-               fseek(gi->GeoIPDatabase, 0, SEEK_SET);
-               if (flags & GEOIP_MEMORY_CACHE) {
-                       gi->cache = (unsigned char *) malloc(sizeof(unsigned char) * st_size);
-                       if (gi->cache != NULL) {
-                               if (fread(gi->cache, sizeof(unsigned char), st_size, gi->GeoIPDatabase) != st_size) {
+               if (flags & (GEOIP_MEMORY_CACHE | GEOIP_MMAP_CACHE) ) {
+                       if (fstat(fileno(gi->GeoIPDatabase), &buf) == -1) {
+                               fprintf(stderr,"Error stating file %s\n",filename);
+                               free(gi->file_path);
+                               free(gi);
+                               return NULL;
+                       }
+                       gi->mtime = buf.st_mtime;
+                       gi->size = buf.st_size;
+
+                       /* MMAP added my Peter Shipley */
+                       if ( flags & GEOIP_MMAP_CACHE ) {
+#if !defined(WIN32) && !defined(WIN64)
+                           gi->cache = mmap(NULL, buf.st_size, PROT_READ, MAP_PRIVATE, fileno(gi->GeoIPDatabase), 0);
+                           if ( gi->cache == MAP_FAILED ) {
+                               fprintf(stderr,"Error mmaping file %s\n",filename);
+                               free(gi->file_path);
+                               free(gi);
+                               return NULL;
+                           }
+#endif
+                       } else {
+                           gi->cache = (unsigned char *) malloc(sizeof(unsigned char) * buf.st_size);
+
+                           if (gi->cache != NULL) {
+                               if (fread(gi->cache, sizeof(unsigned char), buf.st_size, gi->GeoIPDatabase) != (size_t) buf.st_size) {
                                        fprintf(stderr,"Error reading file %s\n",filename);
                                        free(gi->cache);
+                                       free(gi->file_path);
                                        free(gi);
                                        return NULL;
                                }
+                           }
                        }
                } else {
+                       if (flags & GEOIP_CHECK_CACHE) {
+                               if (fstat(fileno(gi->GeoIPDatabase), &buf) == -1) {
+                                       fprintf(stderr,"Error stating file %s\n",filename);
+                                       free(gi->file_path);
+                                       free(gi);
+                                       return NULL;
+                               }
+                               gi->mtime = buf.st_mtime;
+                       }
                        gi->cache = NULL;
                }
                gi->flags = flags;
+               gi->charset = GEOIP_CHARSET_ISO_8859_1;
+
                _setup_segments(gi);
-               if (flags & GEOIP_INDEX_CACHE) {
-                        gi->index_cache = (unsigned char *) malloc(sizeof(unsigned char) * gi->databaseSegments[0]);
-                        if (gi->index_cache != NULL) {
-                               fseek(gi->GeoIPDatabase, 0, SEEK_SET);
-                                if (fread(gi->index_cache, sizeof(unsigned char), gi->databaseSegments[0], gi->GeoIPDatabase) != (size_t) gi->databaseSegments[0]) {
-                                        fprintf(stderr,"Error reading file %s\n",filename);
-                                        free(gi->index_cache);
-                                        free(gi);
-                                        return NULL;
-                                }
-                        }
+               if (flags & GEOIP_INDEX_CACHE) {                        
+                       gi->index_cache = (unsigned char *) malloc(sizeof(unsigned char) * ((gi->databaseSegments[0] * (long)gi->record_length * 2)));
+                       if (gi->index_cache != NULL) {
+                               fseek(gi->GeoIPDatabase, 0, SEEK_SET);
+                               if (fread(gi->index_cache, sizeof(unsigned char), gi->databaseSegments[0] * (long)gi->record_length * 2, gi->GeoIPDatabase) != (size_t) (gi->databaseSegments[0]*(long)gi->record_length * 2)) {
+                                       fprintf(stderr,"Error reading file %s\n",filename);
+                                       free(gi->databaseSegments);
+                                       free(gi->index_cache);
+                                       free(gi);
+                                       return NULL;
+                               }
+                       }
                } else {
                        gi->index_cache = NULL;
                }
@@ -388,10 +740,20 @@ GeoIP* GeoIP_open (const char * filename, int flags) {
 }
 
 void GeoIP_delete (GeoIP *gi) {
+       if (gi == NULL )
+               return;
        if (gi->GeoIPDatabase != NULL)
                fclose(gi->GeoIPDatabase);
-       if (gi->cache != NULL)
+       if (gi->cache != NULL) {
+           if ( gi->flags & GEOIP_MMAP_CACHE ) {
+#if !defined(WIN32) && !defined(WIN64)
+               munmap(gi->cache, gi->size);
+#endif
+           } else {
                free(gi->cache);
+           }
+           gi->cache = NULL;
+       }
        if (gi->index_cache != NULL)
                free(gi->index_cache);
        if (gi->file_path != NULL)
@@ -419,16 +781,17 @@ const char *GeoIP_country_name_by_name (GeoIP* gi, const char *name) {
        return (country_id > 0) ? GeoIP_country_name[country_id] : NULL;
 }
 
-unsigned long lookupaddress (const char *host) {
+unsigned long _GeoIP_lookupaddress (const char *host) {
        unsigned long addr = inet_addr(host);
        struct hostent phe2;
        struct hostent * phe = &phe2;
        char *buf = NULL;
-       int result = 0;
-
 #ifdef HAVE_GETHOSTBYNAME_R
-       int herr = 0;
        int buflength = 16384;
+       int herr = 0;
+#endif
+       int result = 0;
+#ifdef HAVE_GETHOSTBYNAME_R
        buf = malloc(buflength);
 #endif
        if (addr == INADDR_NONE) {
@@ -465,6 +828,29 @@ unsigned long lookupaddress (const char *host) {
        return ntohl(addr);
 }
 
+geoipv6_t 
+_GeoIP_lookupaddress_v6(const char *host)
+{
+  geoipv6_t       ipnum;
+  int             gaierr;
+  struct addrinfo hints, *aifirst;
+
+  memset(&hints, 0, sizeof(hints));
+  hints.ai_family = AF_INET6;
+  /* hints.ai_flags = AI_V4MAPPED; */
+  hints.ai_socktype = SOCK_STREAM;
+
+  if ((gaierr = getaddrinfo(host, NULL, &hints, &aifirst)) != 0) {
+          /* fprintf(stderr, "Err: %s (%d %s)\n", host, gaierr, gai_strerror(gaierr)); */
+    return IPV6_NULL;
+  }
+  memcpy(ipnum.s6_addr, ((struct sockaddr_in6 *) aifirst->ai_addr)->sin6_addr.s6_addr, sizeof(geoipv6_t));
+  freeaddrinfo(aifirst);
+  /* inet_pton(AF_INET6, host, ipnum.s6_addr); */
+  
+  return ipnum;
+}
+
 int GeoIP_id_by_name (GeoIP* gi, const char *name) {
        unsigned long ipnum;
        int ret;
@@ -475,13 +861,30 @@ int GeoIP_id_by_name (GeoIP* gi, const char *name) {
                printf("Invalid database type %s, expected %s\n", GeoIPDBDescription[(int)gi->databaseType], GeoIPDBDescription[GEOIP_COUNTRY_EDITION]);
                return 0;
        }
-       if (!(ipnum = lookupaddress(name)))
+       if (!(ipnum = _GeoIP_lookupaddress(name)))
                return 0;
-       ret = _seek_record(gi, ipnum) - COUNTRY_BEGIN;
+       ret = _GeoIP_seek_record(gi, ipnum) - COUNTRY_BEGIN;
        return ret;
 
 }
 
+int GeoIP_id_by_name_v6 (GeoIP* gi, const char *name) {
+       geoipv6_t ipnum;
+       int ret;
+       if (name == NULL) {
+               return 0;
+       }
+       if (gi->databaseType != GEOIP_COUNTRY_EDITION_V6 && gi->databaseType != GEOIP_PROXY_EDITION && gi->databaseType != GEOIP_NETSPEED_EDITION) {
+               printf("Invalid database type %s, expected %s\n", GeoIPDBDescription[(int)gi->databaseType], GeoIPDBDescription[GEOIP_COUNTRY_EDITION_V6]);
+               return 0;
+       }
+        ipnum = _GeoIP_lookupaddress_v6(name);
+       if (__GEOIP_V6_IS_NULL(ipnum))
+               return 0;
+       ret = _GeoIP_seek_record_v6(gi, ipnum) - COUNTRY_BEGIN;
+       return ret;
+}
+
 const char *GeoIP_country_code_by_addr (GeoIP* gi, const char *addr) {
        int country_id;
        country_id = GeoIP_id_by_addr(gi, addr);
@@ -492,14 +895,24 @@ const char *GeoIP_country_code3_by_addr (GeoIP* gi, const char *addr) {
        int country_id;
        country_id = GeoIP_id_by_addr(gi, addr);
        return (country_id > 0) ? GeoIP_country_code3[country_id] : NULL;
-       return GeoIP_country_code3[country_id];
 }
 
 const char *GeoIP_country_name_by_addr (GeoIP* gi, const char *addr) {
        int country_id;
        country_id = GeoIP_id_by_addr(gi, addr);
        return (country_id > 0) ? GeoIP_country_name[country_id] : NULL;
-       return GeoIP_country_name[country_id];
+}
+
+const char *GeoIP_country_name_by_ipnum (GeoIP* gi, unsigned long ipnum) {
+       int country_id;
+       country_id = GeoIP_id_by_ipnum(gi, ipnum);
+       return (country_id > 0) ? GeoIP_country_name[country_id] : NULL;
+} 
+
+const char *GeoIP_country_name_by_ipnum_v6 (GeoIP* gi, geoipv6_t ipnum) {
+       int country_id;
+       country_id = GeoIP_id_by_ipnum_v6(gi, ipnum);
+       return (country_id > 0) ? GeoIP_country_name[country_id] : NULL;
 }
 
 const char *GeoIP_country_code_by_ipnum (GeoIP* gi, unsigned long ipnum) {
@@ -508,14 +921,22 @@ const char *GeoIP_country_code_by_ipnum (GeoIP* gi, unsigned long ipnum) {
        return (country_id > 0) ? GeoIP_country_code[country_id] : NULL;
 }
 
-int GeoIP_country_info_by_id(int id, char **two, char **three, char **full) {
-  if(id < 0)
-    return 0;
-  *two = (char *)GeoIP_country_code[id];
-  *three = (char *)GeoIP_country_code3[id];
-  *full = (char *)GeoIP_country_name[id];
+const char *GeoIP_country_code_by_ipnum_v6 (GeoIP* gi, geoipv6_t ipnum) {
+       int country_id;
+       country_id = GeoIP_id_by_ipnum_v6(gi, ipnum);
+       return (country_id > 0) ? GeoIP_country_code[country_id] : NULL;
+}
+
+const char *GeoIP_country_code3_by_ipnum (GeoIP* gi, unsigned long ipnum) {
+       int country_id;
+       country_id = GeoIP_id_by_ipnum(gi, ipnum);
+       return (country_id > 0) ? GeoIP_country_code3[country_id] : NULL;
+}
 
-  return 1;
+const char *GeoIP_country_code3_by_ipnum_v6 (GeoIP* gi, geoipv6_t ipnum) {
+       int country_id;
+       country_id = GeoIP_id_by_ipnum_v6(gi, ipnum);
+       return (country_id > 0) ? GeoIP_country_code3[country_id] : NULL;
 }
 
 int GeoIP_country_id_by_addr (GeoIP* gi, const char *addr) {
@@ -526,6 +947,25 @@ int GeoIP_country_id_by_name (GeoIP* gi, const char *host) {
        return GeoIP_id_by_name(gi, host);
 }
 
+int GeoIP_id_by_addr_v6 (GeoIP* gi, const char *addr) {
+       geoipv6_t ipnum;
+       int ret;
+       if (addr == NULL) {
+               return 0;
+       }
+       if (gi->databaseType != GEOIP_COUNTRY_EDITION_V6 &&
+                       gi->databaseType != GEOIP_PROXY_EDITION &&
+                       gi->databaseType != GEOIP_NETSPEED_EDITION) {
+               printf("Invalid database type %s, expected %s\n",
+                                        GeoIPDBDescription[(int)gi->databaseType],
+                                        GeoIPDBDescription[GEOIP_COUNTRY_EDITION_V6]);
+               return 0;
+       }
+       ipnum = _GeoIP_addr_to_num_v6(addr);
+       ret = _GeoIP_seek_record_v6(gi, ipnum) - COUNTRY_BEGIN;
+       return ret;
+}
+
 int GeoIP_id_by_addr (GeoIP* gi, const char *addr) {
        unsigned long ipnum;
        int ret;
@@ -540,15 +980,46 @@ int GeoIP_id_by_addr (GeoIP* gi, const char *addr) {
                                         GeoIPDBDescription[GEOIP_COUNTRY_EDITION]);
                return 0;
        }
-       ipnum = _addr_to_num(addr);
-       ret = _seek_record(gi, ipnum) - COUNTRY_BEGIN;
+       ipnum = _GeoIP_addr_to_num(addr);
+       ret = _GeoIP_seek_record(gi, ipnum) - COUNTRY_BEGIN;
        return ret;
 }
 
+int GeoIP_id_by_ipnum_v6 (GeoIP* gi, geoipv6_t ipnum) {
+       int ret;
+/*     if (ipnum == 0) {
+               return 0;
+       }
+*/     
+       if (gi->databaseType != GEOIP_COUNTRY_EDITION_V6 && 
+                       gi->databaseType != GEOIP_PROXY_EDITION &&
+                       gi->databaseType != GEOIP_NETSPEED_EDITION) {
+               printf("Invalid database type %s, expected %s\n",
+                                        GeoIPDBDescription[(int)gi->databaseType],
+                                        GeoIPDBDescription[GEOIP_COUNTRY_EDITION_V6]);
+               return 0;
+       }
+       ret = _GeoIP_seek_record_v6(gi, ipnum) - COUNTRY_BEGIN;
+       return ret;
+}
+
+
+
 int GeoIP_id_by_ipnum (GeoIP* gi, unsigned long ipnum) {
-       if (ipnum == 0)
+       int ret;
+       if (ipnum == 0) {
+               return 0;
+       }
+       if (gi->databaseType != GEOIP_COUNTRY_EDITION && 
+                       gi->databaseType != GEOIP_PROXY_EDITION &&
+                       gi->databaseType != GEOIP_NETSPEED_EDITION) {
+               printf("Invalid database type %s, expected %s\n",
+                                        GeoIPDBDescription[(int)gi->databaseType],
+                                        GeoIPDBDescription[GEOIP_COUNTRY_EDITION]);
                return 0;
-       return _seek_record(gi, ipnum) - COUNTRY_BEGIN;
+       }
+       ret = _GeoIP_seek_record(gi, ipnum) - COUNTRY_BEGIN;
+       return ret;
 }
 
 char *GeoIP_database_info (GeoIP* gi) {
@@ -560,6 +1031,7 @@ char *GeoIP_database_info (GeoIP* gi) {
        if(gi == NULL)
                return NULL;
 
+       _check_mtime(gi);
        fseek(gi->GeoIPDatabase, -3l, SEEK_END);
 
        /* first get past the database structure information */
@@ -572,7 +1044,7 @@ char *GeoIP_database_info (GeoIP* gi) {
                fseek(gi->GeoIPDatabase, -4l, SEEK_CUR);
        }
        if (hasStructureInfo == 1) {
-               fseek(gi->GeoIPDatabase, -3l, SEEK_CUR);
+               fseek(gi->GeoIPDatabase, -6l, SEEK_CUR);
        } else {
                /* no structure info, must be pre Sep 2002 database, go back to end */
                fseek(gi->GeoIPDatabase, -3l, SEEK_END);
@@ -603,7 +1075,7 @@ void GeoIP_assign_region_by_inetaddr(GeoIP* gi, unsigned long inetaddr, GeoIPReg
         * keep them) and clear any fields that are not set. */
        memset(region, 0, sizeof(GeoIPRegion));
 
-       seek_region = _seek_record(gi, ntohl(inetaddr));
+       seek_region = _GeoIP_seek_record(gi, ntohl(inetaddr));
 
        if (gi->databaseType == GEOIP_REGION_EDITION_REV0) {
                /* Region Edition, pre June 2003 */
@@ -641,6 +1113,52 @@ void GeoIP_assign_region_by_inetaddr(GeoIP* gi, unsigned long inetaddr, GeoIPReg
        }
 }
 
+void GeoIP_assign_region_by_inetaddr_v6(GeoIP* gi, geoipv6_t inetaddr, GeoIPRegion *region) {
+       unsigned int seek_region;
+
+       /* This also writes in the terminating NULs (if you decide to
+        * keep them) and clear any fields that are not set. */
+       memset(region, 0, sizeof(GeoIPRegion));
+
+       seek_region = _GeoIP_seek_record_v6(gi, inetaddr);
+
+       if (gi->databaseType == GEOIP_REGION_EDITION_REV0) {
+               /* Region Edition, pre June 2003 */
+               seek_region -= STATE_BEGIN_REV0;
+               if (seek_region >= 1000) {
+                       region->country_code[0] = 'U';
+                       region->country_code[1] = 'S';
+                       region->region[0] = (char) ((seek_region - 1000)/26 + 65);
+                       region->region[1] = (char) ((seek_region - 1000)%26 + 65);
+               } else {
+                       memcpy(region->country_code, GeoIP_country_code[seek_region], 2);
+               }
+       } else if (gi->databaseType == GEOIP_REGION_EDITION_REV1) {
+               /* Region Edition, post June 2003 */
+               seek_region -= STATE_BEGIN_REV1;
+               if (seek_region < US_OFFSET) {
+                       /* Unknown */
+                       /* we don't need to do anything here b/c we memset region to 0 */
+               } else if (seek_region < CANADA_OFFSET) {
+                       /* USA State */
+                       region->country_code[0] = 'U';
+                       region->country_code[1] = 'S';
+                       region->region[0] = (char) ((seek_region - US_OFFSET)/26 + 65);
+                       region->region[1] = (char) ((seek_region - US_OFFSET)%26 + 65);
+               } else if (seek_region < WORLD_OFFSET) {
+                       /* Canada Province */
+                       region->country_code[0] = 'C';
+                       region->country_code[1] = 'A';
+                       region->region[0] = (char) ((seek_region - CANADA_OFFSET)/26 + 65);
+                       region->region[1] = (char) ((seek_region - CANADA_OFFSET)%26 + 65);
+               } else {
+                       /* Not US or Canada */
+                       memcpy(region->country_code, GeoIP_country_code[(seek_region - WORLD_OFFSET) / FIPS_RANGE], 2);
+               }
+       }
+}
+
+static
 GeoIPRegion * _get_region(GeoIP* gi, unsigned long ipnum) {
        GeoIPRegion * region;
  
@@ -651,6 +1169,17 @@ GeoIPRegion * _get_region(GeoIP* gi, unsigned long ipnum) {
        return region;
 }
 
+static
+GeoIPRegion * _get_region_v6(GeoIP* gi, geoipv6_t ipnum) {
+       GeoIPRegion * region;
+       region = malloc(sizeof(GeoIPRegion));
+       if (region) {
+               GeoIP_assign_region_by_inetaddr_v6(gi, ipnum, region);
+       }
+       return region;
+}
+
 GeoIPRegion * GeoIP_region_by_addr (GeoIP* gi, const char *addr) {
        unsigned long ipnum;
        if (addr == NULL) {
@@ -661,10 +1190,24 @@ GeoIPRegion * GeoIP_region_by_addr (GeoIP* gi, const char *addr) {
                printf("Invalid database type %s, expected %s\n", GeoIPDBDescription[(int)gi->databaseType], GeoIPDBDescription[GEOIP_REGION_EDITION_REV1]);
                return 0;
        }
-       ipnum = _addr_to_num(addr);
+       ipnum = _GeoIP_addr_to_num(addr);
        return _get_region(gi, ipnum);
 }
 
+GeoIPRegion * GeoIP_region_by_addr_v6 (GeoIP* gi, const char *addr) {
+       geoipv6_t ipnum;
+       if (addr == NULL) {
+               return 0;
+       }
+       if (gi->databaseType != GEOIP_REGION_EDITION_REV0 &&
+                       gi->databaseType != GEOIP_REGION_EDITION_REV1) {
+               printf("Invalid database type %s, expected %s\n", GeoIPDBDescription[(int)gi->databaseType], GeoIPDBDescription[GEOIP_REGION_EDITION_REV1]);
+               return 0;
+       }
+       ipnum = _GeoIP_addr_to_num_v6(addr);
+       return _get_region_v6(gi, ipnum);
+}
+
 GeoIPRegion * GeoIP_region_by_name (GeoIP* gi, const char *name) {
        unsigned long ipnum;
        if (name == NULL) {
@@ -675,30 +1218,67 @@ GeoIPRegion * GeoIP_region_by_name (GeoIP* gi, const char *name) {
                printf("Invalid database type %s, expected %s\n", GeoIPDBDescription[(int)gi->databaseType], GeoIPDBDescription[GEOIP_REGION_EDITION_REV1]);
                return 0;
        }
-       if (!(ipnum = lookupaddress(name)))
+       if (!(ipnum = _GeoIP_lookupaddress(name)))
                return 0;
        return _get_region(gi, ipnum);
 }
 
+GeoIPRegion * GeoIP_region_by_name_v6 (GeoIP* gi, const char *name) {
+       geoipv6_t ipnum;
+       if (name == NULL) {
+               return 0;
+       }
+       if (gi->databaseType != GEOIP_REGION_EDITION_REV0 &&
+                       gi->databaseType != GEOIP_REGION_EDITION_REV1) {
+               printf("Invalid database type %s, expected %s\n", GeoIPDBDescription[(int)gi->databaseType], GeoIPDBDescription[GEOIP_REGION_EDITION_REV1]);
+               return 0;
+       }
+        
+        ipnum = _GeoIP_lookupaddress_v6(name);
+       if (__GEOIP_V6_IS_NULL(ipnum))
+               return 0;
+       return _get_region_v6(gi, ipnum);
+}
+
+GeoIPRegion * GeoIP_region_by_ipnum (GeoIP* gi, unsigned long ipnum) {
+       if (gi->databaseType != GEOIP_REGION_EDITION_REV0 &&
+                       gi->databaseType != GEOIP_REGION_EDITION_REV1) {
+               printf("Invalid database type %s, expected %s\n", GeoIPDBDescription[(int)gi->databaseType], GeoIPDBDescription[GEOIP_REGION_EDITION_REV1]);
+               return 0;
+       }
+       return _get_region(gi, ipnum);
+}
+
+GeoIPRegion * GeoIP_region_by_ipnum_v6 (GeoIP* gi, geoipv6_t ipnum) {
+       if (gi->databaseType != GEOIP_REGION_EDITION_REV0 &&
+                       gi->databaseType != GEOIP_REGION_EDITION_REV1) {
+               printf("Invalid database type %s, expected %s\n", GeoIPDBDescription[(int)gi->databaseType], GeoIPDBDescription[GEOIP_REGION_EDITION_REV1]);
+               return 0;
+       }
+       return _get_region_v6(gi, ipnum);
+}
+
 void GeoIPRegion_delete (GeoIPRegion *gir) {
        free(gir);
 }
 
 /* GeoIP Organization, ISP and AS Number Edition private method */
+static
 char *_get_name (GeoIP* gi, unsigned long ipnum) {
        int seek_org;
        char buf[MAX_ORG_RECORD_LENGTH];
        char * org_buf, * buf_pointer;
        int record_pointer;
+       size_t len;
 
        if (gi->databaseType != GEOIP_ORG_EDITION &&
                        gi->databaseType != GEOIP_ISP_EDITION &&
                        gi->databaseType != GEOIP_ASNUM_EDITION) {
                printf("Invalid database type %s, expected %s\n", GeoIPDBDescription[(int)gi->databaseType], GeoIPDBDescription[GEOIP_ORG_EDITION]);
-               return 0;
+               return NULL;
        }
 
-       seek_org = _seek_record(gi, ipnum);
+       seek_org = _GeoIP_seek_record(gi, ipnum);
        if (seek_org == gi->databaseSegments[0])                
                return NULL;
 
@@ -707,43 +1287,278 @@ char *_get_name (GeoIP* gi, unsigned long ipnum) {
        if (gi->cache == NULL) {
                fseek(gi->GeoIPDatabase, record_pointer, SEEK_SET);
                fread(buf, sizeof(char), MAX_ORG_RECORD_LENGTH, gi->GeoIPDatabase);
-               org_buf = malloc(sizeof(char) * (strlen(buf)+1));
-               strcpy(org_buf, buf);
+               len = sizeof(char) * (strlen(buf)+1);
+               org_buf = malloc(len);
+               strncpy(org_buf, buf, len);
        } else {
-               buf_pointer = (char *)gi->cache + (long)record_pointer;
-               org_buf = malloc(sizeof(char) * (strlen(buf_pointer)+1));
-               strcpy(org_buf, buf_pointer);
+               buf_pointer = gi->cache + (long)record_pointer;
+               len = sizeof(char) * (strlen(buf_pointer)+1);
+               org_buf = malloc(len);
+               strncpy(org_buf, buf_pointer, len);
        }
        return org_buf;
 }
 
+char *_get_name_v6 (GeoIP* gi, geoipv6_t ipnum) {
+  int seek_org;
+  char buf[MAX_ORG_RECORD_LENGTH];
+  char * org_buf, * buf_pointer;
+  int record_pointer;
+  size_t len;
+
+  if (gi->databaseType != GEOIP_ORG_EDITION &&
+      gi->databaseType != GEOIP_ISP_EDITION &&
+      gi->databaseType != GEOIP_ASNUM_EDITION) {
+    printf("Invalid database type %s, expected %s\n", GeoIPDBDescription[(int)gi->databaseType], GeoIPDBDescription[GEOIP_ORG_EDITION]);
+    return NULL;
+  }
+
+  seek_org = _GeoIP_seek_record_v6(gi, ipnum);
+  if (seek_org == gi->databaseSegments[0])
+    return NULL;
+
+  record_pointer = seek_org + (2 * gi->record_length - 1) * gi->databaseSegments[0];
+
+  if (gi->cache == NULL) {
+    fseek(gi->GeoIPDatabase, record_pointer, SEEK_SET);
+    fread(buf, sizeof(char), MAX_ORG_RECORD_LENGTH, gi->GeoIPDatabase);
+    len = sizeof(char) * (strlen(buf)+1);
+    org_buf = malloc(len);
+    strncpy(org_buf, buf, len);
+  } else {
+    buf_pointer = gi->cache + (long)record_pointer;
+    len = sizeof(char) * (strlen(buf_pointer)+1);
+    org_buf = malloc(len);
+    strncpy(org_buf, buf_pointer, len);
+  }
+  return org_buf;
+}
+
+char *_GeoIP_num_to_addr (GeoIP* gi, unsigned long ipnum) {
+       char *ret_str;
+       char *cur_str;
+       int octet[4];
+       int num_chars_written, i;
+
+       ret_str = malloc(sizeof(char) * 16);
+       cur_str = ret_str;
+
+       for (i = 0; i<4; i++) {
+               octet[3 - i] = ipnum % 256;
+               ipnum >>= 8;
+       }
+
+       for (i = 0; i<4; i++) {
+               num_chars_written = sprintf(cur_str, "%d", octet[i]);
+               cur_str += num_chars_written;
+
+               if (i < 3) {
+                       cur_str[0] = '.';
+                       cur_str++;
+               }
+       }
+
+       return ret_str;
+}
+
+char **GeoIP_range_by_ip (GeoIP* gi, const char *addr) {
+       unsigned long ipnum;
+       unsigned long left_seek;
+       unsigned long right_seek;
+       unsigned long mask;
+       int orig_netmask;
+       int target_value;
+       char **ret;
+       
+       if (addr == NULL) {
+               return 0;
+       }
+
+       ret = malloc(sizeof(char *) * 2);
+
+       ipnum = _GeoIP_addr_to_num(addr);
+       target_value = _GeoIP_seek_record(gi, ipnum);
+       orig_netmask = GeoIP_last_netmask(gi);
+       mask = 0xffffffff << ( 32 - orig_netmask );     
+       left_seek = ipnum & mask;
+       right_seek = left_seek + ( 0xffffffff & ~mask );
+
+       while (left_seek != 0 
+         && target_value == _GeoIP_seek_record(gi, left_seek - 1) ) {
+               
+               /* Go to beginning of netblock defined by netmask */
+               mask = 0xffffffff << ( 32 - GeoIP_last_netmask(gi) );
+               left_seek = --left_seek & mask;
+       }
+       ret[0] = _GeoIP_num_to_addr(gi, left_seek);
+
+       while (right_seek != 0xffffffff
+         && target_value == _GeoIP_seek_record(gi, right_seek + 1) ) {
+               
+               /* Go to end of netblock defined by netmask */
+               mask = 0xffffffff << ( 32 - GeoIP_last_netmask(gi) );
+               right_seek = ++right_seek & mask;
+               right_seek += 0xffffffff & ~mask;
+       }
+       ret[1] = _GeoIP_num_to_addr(gi, right_seek);
+
+       gi->netmask = orig_netmask;
+
+       return ret;
+}
+
+void GeoIP_range_by_ip_delete( char ** ptr ){
+       if ( ptr ){
+               if ( ptr[0] )
+                       free(ptr[0]);
+               if ( ptr[1] )
+                       free(ptr[1]);
+               free(ptr);
+       }
+}
+
+char *GeoIP_name_by_ipnum (GeoIP* gi, unsigned long ipnum) {
+       return _get_name(gi,ipnum);  
+}
+
+char *GeoIP_name_by_ipnum_v6 (GeoIP* gi, geoipv6_t ipnum) {
+       return _get_name_v6(gi,ipnum);  
+}
+
 char *GeoIP_name_by_addr (GeoIP* gi, const char *addr) {
        unsigned long ipnum;
        if (addr == NULL) {
                return 0;
        }
-       ipnum = _addr_to_num(addr);
+       ipnum = _GeoIP_addr_to_num(addr);
        return _get_name(gi, ipnum);
 }
 
+char *GeoIP_name_by_addr_v6 (GeoIP* gi, const char *addr) {
+  geoipv6_t ipnum;
+  if (addr == NULL) {
+    return 0;
+  }
+  ipnum = _GeoIP_addr_to_num_v6(addr);
+  return _get_name_v6(gi, ipnum);
+}
+
 char *GeoIP_name_by_name (GeoIP* gi, const char *name) {
        unsigned long ipnum;
        if (name == NULL) {
                return 0;
        }
-       if (!(ipnum = lookupaddress(name)))
+       if (!(ipnum = _GeoIP_lookupaddress(name)))
                return 0;
        return _get_name(gi, ipnum);
 }
 
+char *GeoIP_name_by_name_v6 (GeoIP* gi, const char *name) {
+  geoipv6_t ipnum;
+  if (name == NULL) {
+    return 0;
+  }
+        ipnum = _GeoIP_lookupaddress_v6(name);
+  if (__GEOIP_V6_IS_NULL(ipnum))
+    return 0;
+  return _get_name_v6(gi, ipnum);
+}
+
+char *GeoIP_org_by_ipnum (GeoIP* gi, unsigned long ipnum) {
+       return GeoIP_name_by_ipnum(gi, ipnum);
+}
+
+char *GeoIP_org_by_ipnum_v6 (GeoIP* gi, geoipv6_t ipnum) {
+  return GeoIP_name_by_ipnum_v6(gi, ipnum);
+}
+
 char *GeoIP_org_by_addr (GeoIP* gi, const char *addr) {
        return GeoIP_name_by_addr(gi, addr);
 }
 
+char *GeoIP_org_by_addr_v6 (GeoIP* gi, const char *addr) {
+  return GeoIP_name_by_addr_v6(gi, addr);
+}
+
 char *GeoIP_org_by_name (GeoIP* gi, const char *name) {
        return GeoIP_name_by_name(gi, name);
 }
 
+char *GeoIP_org_by_name_v6 (GeoIP* gi, const char *name) {
+  return GeoIP_name_by_name_v6(gi, name);
+}
+
 unsigned char GeoIP_database_edition (GeoIP* gi) {
        return gi->databaseType;
 }
+
+int GeoIP_charset( GeoIP* gi){
+  return gi->charset;
+}
+
+int GeoIP_set_charset(  GeoIP* gi, int charset ){
+  int old_charset = gi->charset;
+  gi->charset = charset;
+  return old_charset;
+}
+
+int GeoIP_last_netmask (GeoIP* gi) {
+  return gi->netmask;
+}
+
+
+/** return two letter country code */
+const char* GeoIP_code_by_id(int id)
+{
+       if (id < 0 || id >= num_GeoIP_countries)
+               return NULL;
+
+       return GeoIP_country_code[id];
+}
+
+/** return three letter country code */
+const char* GeoIP_code3_by_id(int id)
+{
+       if (id < 0 || id >= num_GeoIP_countries)
+               return NULL;
+
+       return GeoIP_country_code3[id];
+}
+
+
+/** return full name of country */
+const char* GeoIP_name_by_id(int id)
+{
+       if (id < 0 || id >= num_GeoIP_countries)
+               return NULL;
+
+       return GeoIP_country_name[id];
+}
+
+/** return continent of country */
+const char* GeoIP_continent_by_id(int id)
+{
+       if (id < 0 || id >= num_GeoIP_countries)
+               return NULL;
+
+       return GeoIP_country_continent[id];
+}
+
+/** return id by country code **/
+int GeoIP_id_by_code(const char *country)
+{
+       unsigned i;
+
+       for ( i = 0; i < num_GeoIP_countries; ++i)
+       {
+               if (strcmp(country, GeoIP_country_code[i]) == 0)
+                       return i;
+       }
+
+       return 0;
+}
+
+unsigned GeoIP_num_countries(void)
+{
+       return num_GeoIP_countries;
+}