refactor: spin geoipx off geolocate (#893)
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:
parent
1e7384d1cc
commit
110a11828b
23 changed files with 224 additions and 211 deletions
|
|
@ -14,7 +14,6 @@ import (
|
|||
"time"
|
||||
|
||||
"github.com/ooni/probe-cli/v3/internal/bytecounter"
|
||||
"github.com/ooni/probe-cli/v3/internal/engine/geolocate"
|
||||
"github.com/ooni/probe-cli/v3/internal/engine/probeservices"
|
||||
"github.com/ooni/probe-cli/v3/internal/model"
|
||||
"github.com/ooni/probe-cli/v3/internal/version"
|
||||
|
|
@ -199,7 +198,7 @@ func (e *experiment) newMeasurement(input string) *model.Measurement {
|
|||
Input: model.MeasurementTarget(input),
|
||||
MeasurementStartTime: utctimenow.Format(dateFormat),
|
||||
MeasurementStartTimeSaved: utctimenow,
|
||||
ProbeIP: geolocate.DefaultProbeIP,
|
||||
ProbeIP: model.DefaultProbeIP,
|
||||
ProbeASN: e.session.ProbeASNString(),
|
||||
ProbeCC: e.session.ProbeCC(),
|
||||
ProbeNetworkName: e.session.ProbeNetworkName(),
|
||||
|
|
|
|||
Loading…
Reference in a new issue