c/ooni-probe-cli
Watch
1
0
Fork
You've already forked ooni-probe-cli
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

refactor: spin geoipx off geolocate (#893)

Browse source 
A bunch of packages (including oohelperd) just need the ability to
use MaxMind-like databases. They don't need the additional functionality
implemented by the geolocate package. Such a package, in fact, is
mostly (if not only) needed by the engine package.

Therefore, move code to query MaxMind-like databases to a separate
package, and avoid depending on geolocate in all the packages for
which it's sufficient to use geoipx.

Part of https://github.com/ooni/probe/issues/2240
This commit is contained in:
Simone Basso 2022-08-28 20:00:25 +02:00 • committed by GitHub
commit 110a11828b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
23 changed files with 224 additions and 211 deletions
Download patch file Download diff file Expand all files Collapse all files

14
internal/engine/session.go
View file

@ -466,7 +466,7 @@ func (s *Session) ProbeASNString() string {
func (s *Session) ProbeASN() uint {
defer s.mu.Unlock()
s.mu.Lock()
asn := geolocate.DefaultProbeASN
asn := model.DefaultProbeASN
if s.location != nil {
asn = s.location.ASN
}
@ -477,7 +477,7 @@ func (s *Session) ProbeASN() uint {
func (s *Session) ProbeCC() string {
defer s.mu.Unlock()
s.mu.Lock()
cc := geolocate.DefaultProbeCC
cc := model.DefaultProbeCC
if s.location != nil {
cc = s.location.CountryCode
}
@ -488,7 +488,7 @@ func (s *Session) ProbeCC() string {
func (s *Session) ProbeNetworkName() string {
defer s.mu.Unlock()
s.mu.Lock()
nn := geolocate.DefaultProbeNetworkName
nn := model.DefaultProbeNetworkName
if s.location != nil {
nn = s.location.NetworkName
}
@ -499,7 +499,7 @@ func (s *Session) ProbeNetworkName() string {
func (s *Session) ProbeIP() string {
defer s.mu.Unlock()
s.mu.Lock()
ip := geolocate.DefaultProbeIP
ip := model.DefaultProbeIP
if s.location != nil {
ip = s.location.ProbeIP
}
@ -520,7 +520,7 @@ func (s *Session) ResolverASNString() string {
func (s *Session) ResolverASN() uint {
defer s.mu.Unlock()
s.mu.Lock()
asn := geolocate.DefaultResolverASN
asn := model.DefaultResolverASN
if s.location != nil {
asn = s.location.ResolverASN
}
@ -531,7 +531,7 @@ func (s *Session) ResolverASN() uint {
func (s *Session) ResolverIP() string {
defer s.mu.Unlock()
s.mu.Lock()
ip := geolocate.DefaultResolverIP
ip := model.DefaultResolverIP
if s.location != nil {
ip = s.location.ResolverIP
}
@ -542,7 +542,7 @@ func (s *Session) ResolverIP() string {
func (s *Session) ResolverNetworkName() string {
defer s.mu.Unlock()
s.mu.Lock()
nn := geolocate.DefaultResolverNetworkName
nn := model.DefaultResolverNetworkName
if s.location != nil {
nn = s.location.ResolverNetworkName
}