Add Connection-Type, Domain, and ISP databases methods

Author: oschwald

reader.go

@@ -5,8 +5,9 @@
 package geoip2
 
 import (
-	"github.com/oschwald/maxminddb-golang"
 	"net"
+
+	"github.com/oschwald/maxminddb-golang"
 )
 
 // The City structure corresponds to the data in the GeoIP2/GeoLite2 City
@@ -87,6 +88,25 @@ type Country struct {
 	} `maxminddb:"traits"`
 }
 
+// The ConnectionType structure corresponds to the data in the GeoIP2
+// Connection-Type database.
+type ConnectionType struct {
+	ConnectionType string `maxminddb:"connection_type"`
+}
+
+// The Domain structure corresponds to the data in the GeoIP2 Domain database.
+type Domain struct {
+	Domain string `maxminddb:"domain"`
+}
+
+// The ISP structure corresponds to the data in the GeoIP2 ISP database.
+type ISP struct {
+	AutonomousSystemNumber       uint   `maxminddb:"autonomous_system_number"`
+	AutonomousSystemOrganization string `maxminddb:"autonomous_system_organization"`
+	ISP                          string `maxminddb:"isp"`
+	Organization                 string `maxminddb:"organization"`
+}
+
 // Reader holds the maxminddb.Reader structure. It should be created
 // using the Open function.
 type Reader struct {
@@ -127,6 +147,30 @@ func (r *Reader) Country(ipAddress net.IP) (*Country, error) {
 	return &country, err
 }
 
+// ConnectionType takes an IP address as a net.IP struct and returns a
+// ConnectionType struct and/or an error
+func (r *Reader) ConnectionType(ipAddress net.IP) (*ConnectionType, error) {
+	var val ConnectionType
+	err := r.mmdbReader.Lookup(ipAddress, &val)
+	return &val, err
+}
+
+// Domain takes an IP address as a net.IP struct and returns a
+// Domain struct and/or an error
+func (r *Reader) Domain(ipAddress net.IP) (*Domain, error) {
+	var val Domain
+	err := r.mmdbReader.Lookup(ipAddress, &val)
+	return &val, err
+}
+
+// ISP takes an IP address as a net.IP struct and returns a ISP struct and/or
+// an error
+func (r *Reader) ISP(ipAddress net.IP) (*ISP, error) {
+	var val ISP
+	err := r.mmdbReader.Lookup(ipAddress, &val)
+	return &val, err
+}
+
 // Close unmaps the database file from virtual memory and returns the
 // resources to the system.
 func (r *Reader) Close() {

reader_test.go

@@ -2,11 +2,11 @@ package geoip2
 
 import (
 	"fmt"
-	. "launchpad.net/gocheck"
 	"math/rand"
 	"net"
 	"testing"
 	"time"
+	. "launchpad.net/gocheck"
 )
 
 func TestGeoIP2(t *testing.T) { TestingT(t) }
@@ -21,6 +21,7 @@ func (s *MySuite) TestReader(c *C) {
 		c.Log(err)
 		c.Fail()
 	}
+	defer reader.Close()
 
 	record, err := reader.City(net.ParseIP("81.2.69.160"))
 	if err != nil {
@@ -89,8 +90,6 @@ func (s *MySuite) TestReader(c *C) {
 		"ru":    "США",
 		"zh-CN": "美国",
 	})
-
-	reader.Close()
 }
 
 func (s *MySuite) TestMetroCode(c *C) {
@@ -99,6 +98,7 @@ func (s *MySuite) TestMetroCode(c *C) {
 		c.Log(err)
 		c.Fail()
 	}
+	defer reader.Close()
 
 	record, err := reader.City(net.ParseIP("216.160.83.56"))
 	if err != nil {
@@ -107,15 +107,70 @@ func (s *MySuite) TestMetroCode(c *C) {
 	}
 
 	c.Assert(record.Location.MetroCode, Equals, uint(819))
+}
+
+func (s *MySuite) TestConnectionType(c *C) {
+	reader, err := Open("test-data/test-data/GeoIP2-Connection-Type-Test.mmdb")
+	if err != nil {
+		c.Log(err)
+		c.Fail()
+	}
+	defer reader.Close()
+
+	record, err := reader.ConnectionType(net.ParseIP("1.0.1.0"))
+	if err != nil {
+		c.Log(err)
+		c.Fail()
+	}
+	c.Assert(record.ConnectionType, Equals, "Cable/DSL")
+
+}
+
+func (s *MySuite) TestDomain(c *C) {
+	reader, err := Open("test-data/test-data/GeoIP2-Domain-Test.mmdb")
+	if err != nil {
+		c.Log(err)
+		c.Fail()
+	}
+	defer reader.Close()
+
+	record, err := reader.Domain(net.ParseIP("1.2.0.0"))
+	if err != nil {
+		c.Log(err)
+		c.Fail()
+	}
+	c.Assert(record.Domain, Equals, "maxmind.com")
+
+}
+
+func (s *MySuite) TestISP(c *C) {
+	reader, err := Open("test-data/test-data/GeoIP2-ISP-Test.mmdb")
+	if err != nil {
+		c.Log(err)
+		c.Fail()
+	}
+	defer reader.Close()
+
+	record, err := reader.ISP(net.ParseIP("1.128.0.0"))
+	if err != nil {
+		c.Log(err)
+		c.Fail()
+	}
+
+	c.Assert(record.AutonomousSystemNumber, Equals, uint(1221))
+
+	c.Assert(record.AutonomousSystemOrganization, Equals, "Telstra Pty Ltd")
+	c.Assert(record.ISP, Equals, "Telstra Internet")
+	c.Assert(record.Organization, Equals, "Telstra Internet")
 
-	reader.Close()
 }
 
 func BenchmarkMaxMindDB(b *testing.B) {
 	db, err := Open("GeoLite2-City.mmdb")
 	if err != nil {
 		b.Fatal(err)
 	}
+	defer db.Close()
 
 	r := rand.New(rand.NewSource(time.Now().UnixNano()))
 
@@ -128,5 +183,4 @@ func BenchmarkMaxMindDB(b *testing.B) {
 			b.Fatal(err)
 		}
 	}
-	db.Close()
 }