Merge pull request abh#9 from dgryski/mutex-for-region-by-addr

Protect calls to GeoIP calls with our mutex

Author: abh

geoip.go

@@ -24,6 +24,12 @@ import (
 
 type GeoIP struct {
 	db *C.GeoIP
+
+	// We don't use GeoIP's thread-safe API calls, which means there is a
+	// single global netmask variable that gets clobbered in the main
+	// lookup routine.  Any calls which have _GeoIP_seek_record_gl need to
+	// be wrapped in this mutex.
+
 	mu sync.Mutex
 }
 
@@ -178,7 +184,11 @@ func (gi *GeoIP) GetRecord(ip string) *GeoIPRecord {
 
 	cip := C.CString(ip)
 	defer C.free(unsafe.Pointer(cip))
+
+	gi.mu.Lock()
 	record := C.GeoIP_record_by_addr(gi.db, cip)
+	gi.mu.Unlock()
+
 	if record == nil {
 		return nil
 	}
@@ -209,7 +219,11 @@ func (gi *GeoIP) GetRegion(ip string) (string, string) {
 
 	cip := C.CString(ip)
 	defer C.free(unsafe.Pointer(cip))
+
+	gi.mu.Lock()
 	region := C.GeoIP_region_by_addr(gi.db, cip)
+	gi.mu.Unlock()
+
 	if region == nil {
 		return "", ""
 	}
@@ -270,7 +284,7 @@ func (gi *GeoIP) GetCountry(ip string) (cc string, netmask int) {
 		return
 	}
 
-	gi.mu.Lock() // Lock to make sure we get the right result from GeoIP_last_netmask
+	gi.mu.Lock()
 	defer gi.mu.Unlock()
 
 	cip := C.CString(ip)