Add OpenType function

Author: abh

const.go

@@ -0,0 +1,35 @@
+package geoip
+
+const (
+	GEOIP_COUNTRY_EDITION            = 1
+	GEOIP_REGION_EDITION_REV0        = 7
+	GEOIP_CITY_EDITION_REV0          = 6
+	GEOIP_ORG_EDITION                = 5
+	GEOIP_ISP_EDITION                = 4
+	GEOIP_CITY_EDITION_REV1          = 2
+	GEOIP_REGION_EDITION_REV1        = 3
+	GEOIP_PROXY_EDITION              = 8
+	GEOIP_ASNUM_EDITION              = 9
+	GEOIP_NETSPEED_EDITION           = 10
+	GEOIP_DOMAIN_EDITION             = 11
+	GEOIP_COUNTRY_EDITION_V6         = 12
+	GEOIP_LOCATIONA_EDITION          = 13
+	GEOIP_ACCURACYRADIUS_EDITION     = 14
+	GEOIP_CITYCONFIDENCE_EDITION     = 15
+	GEOIP_CITYCONFIDENCEDIST_EDITION = 16
+	GEOIP_LARGE_COUNTRY_EDITION      = 17
+	GEOIP_LARGE_COUNTRY_EDITION_V6   = 18
+	GEOIP_ASNUM_EDITION_V6           = 21
+	GEOIP_ISP_EDITION_V6             = 22
+	GEOIP_ORG_EDITION_V6             = 23
+	GEOIP_DOMAIN_EDITION_V6          = 24
+	GEOIP_LOCATIONA_EDITION_V6       = 25
+	GEOIP_REGISTRAR_EDITION          = 26
+	GEOIP_REGISTRAR_EDITION_V6       = 27
+	GEOIP_USERTYPE_EDITION           = 28
+	GEOIP_USERTYPE_EDITION_V6        = 29
+	GEOIP_CITY_EDITION_REV1_V6       = 30
+	GEOIP_CITY_EDITION_REV0_V6       = 31
+	GEOIP_NETSPEED_EDITION_REV1      = 32
+	GEOIP_NETSPEED_EDITION_REV1_V6   = 33
+)

geoip.go

@@ -40,8 +40,8 @@ func (gi *GeoIP) free() {
 	return
 }
 
-// Opens a GeoIP database, all formats supported by libgeoip are supported though
-// there are only functions to access some of the databases in this API.
+// Opens a GeoIP database by filename, all formats supported by libgeoip are
+// supported though there are only functions to access some of the databases in this API.
 // The database is opened in MEMORY_CACHE mode, if you need to optimize for memory
 // instead of performance you should change this.
 // If you don't pass a filename, it will try opening the database from
@@ -92,6 +92,26 @@ func Open(files ...string) (*GeoIP, error) {
 	return g, nil
 }
 
+// OpenType opens a specified GeoIP database type in the default location. Constants
+// are defined for each database type (for example GEOIP_COUNTRY_EDITION).
+func OpenType(dbType int) (*GeoIP, error) {
+	g := &GeoIP{}
+	runtime.SetFinalizer(g, (*GeoIP).free)
+
+	var err error
+
+	g.db, err = C.GeoIP_open_type(C.int(dbType), C.GEOIP_MEMORY_CACHE)
+	if err != nil {
+		return nil, fmt.Errorf("Error opening GeoIP database (%d): %s", dbType, err)
+	}
+
+	if g.db == nil {
+		return nil, fmt.Errorf("Didn't open GeoIP database (%d)", dbType)
+	}
+
+	return g, nil
+}
+
 // Takes an IPv4 address string and returns the organization name for that IP.
 // Requires the GeoIP organization database.
 func (gi *GeoIP) GetOrg(ip string) string {

geoip_test.go

@@ -32,6 +32,15 @@ func (s *GeoIPSuite) Testv4(c *C) {
 	c.Check(netmask, Equals, 13)
 }
 
+func (s *GeoIPSuite) TestOpenType(c *C) {
+	// Open Country database
+	gi, err := OpenType(GEOIP_COUNTRY_EDITION)
+	c.Check(err, IsNil)
+	c.Assert(gi, NotNil)
+	country, _ := gi.GetCountry("207.171.7.51")
+	c.Check(country, Equals, "US")
+}
+
 func (s *GeoIPSuite) Benchmark_GetCountry(c *C) {
 	gi, err := Open()
 	if gi == nil || err != nil {