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

Upgrade to ooni/probe-engine@v0.1.1 (#60)

Browse source
This commit is contained in:
Simone Basso 2019-10-03 09:43:25 +02:00 • committed by GitHub
commit f3865d2ec0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 103 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

12
internal/database/actions.go
View file

@ -11,8 +11,8 @@ import (
"time"
"github.com/apex/log"
"github.com/ooni/probe-engine/model"
"github.com/ooni/probe-cli/utils"
"github.com/ooni/probe-cli/internal/enginex"
"github.com/ooni/probe-cli/internal/util"
"github.com/pkg/errors"
db "upper.io/db.v3"
@ -256,14 +256,14 @@ func CreateResult(sess sqlbuilder.Database, homePath string, testGroupName strin
}
// CreateNetwork will create a new network in the network table
func CreateNetwork(sess sqlbuilder.Database, location *model.LocationInfo) (*Network, error) {
func CreateNetwork(sess sqlbuilder.Database, loc enginex.LocationProvider) (*Network, error) {
network := Network{
ASN: location.ASN,
CountryCode: location.CountryCode,
NetworkName: location.NetworkName,
ASN: loc.ProbeASN(),
CountryCode: loc.ProbeCC(),
NetworkName: loc.ProbeNetworkName(),
// On desktop we consider it to always be wifi
NetworkType: "wifi",
IP: location.ProbeIP,
IP: loc.ProbeIP(),
}
newID, err := sess.Collection("networks").Insert(network)
if err != nil {