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

chore: merge probe-engine into probe-cli (#201)

Browse source 
This is how I did it:

1. `git clone https://github.com/ooni/probe-engine internal/engine`

2. ```
(cd internal/engine && git describe --tags)
v0.23.0
```

3. `nvim go.mod` (merging `go.mod` with `internal/engine/go.mod`

4. `rm -rf internal/.git internal/engine/go.{mod,sum}`

5. `git add internal/engine`

6. `find . -type f -name \*.go -exec sed -i 's@/ooni/probe-engine@/ooni/probe-cli/v3/internal/engine@g' {} \;`

7. `go build ./...` (passes)

8. `go test -race ./...` (temporary failure on RiseupVPN)

9. `go mod tidy`

10. this commit message

Once this piece of work is done, we can build a new version of `ooniprobe` that
is using `internal/engine` directly. We need to do more work to ensure all the
other functionality in `probe-engine` (e.g. making mobile packages) are still WAI.

Part of https://github.com/ooni/probe/issues/1335
This commit is contained in:
Simone Basso 2021-02-02 12:05:47 +01:00 • committed by GitHub
commit d57c78bc71
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
535 changed files with 66182 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

47
internal/engine/experiment/dash/model.go Normal file
View file

@ -0,0 +1,47 @@
package dash
// clientResults contains the results measured by the client. This data
// structure is sent to the server in the collection phase.
//
// All the fields listed here are part of the original specification
// of DASH, except ServerURL, added in MK v0.10.6.
type clientResults struct {
ConnectTime float64 `json:"connect_time"`
DeltaSysTime float64 `json:"delta_sys_time"`
DeltaUserTime float64 `json:"delta_user_time"`
Elapsed float64 `json:"elapsed"`
ElapsedTarget int64 `json:"elapsed_target"`
InternalAddress string `json:"internal_address"`
Iteration int64 `json:"iteration"`
Platform string `json:"platform"`
Rate int64 `json:"rate"`
RealAddress string `json:"real_address"`
Received int64 `json:"received"`
RemoteAddress string `json:"remote_address"`
RequestTicks float64 `json:"request_ticks"`
ServerURL string `json:"server_url"`
Timestamp int64 `json:"timestamp"`
UUID string `json:"uuid"`
Version string `json:"version"`
}
// serverResults contains the server results. This data structure is sent
// to the client during the collection phase of DASH.
type serverResults struct {
Iteration int64 `json:"iteration"`
Ticks float64 `json:"ticks"`
Timestamp int64 `json:"timestamp"`
}
// negotiateRequest contains the request of negotiation
type negotiateRequest struct {
DASHRates []int64 `json:"dash_rates"`
}
// negotiateResponse contains the response of negotiation
type negotiateResponse struct {
Authorization string `json:"authorization"`
QueuePos int64 `json:"queue_pos"`
RealAddress string `json:"real_address"`
Unchoked int `json:"unchoked"`
}