d57c78bc71
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
32 lines
661 B
Go
32 lines
661 B
Go
// Package connid contains code to generate the connectionID
|
|
package connid
|
|
|
|
import (
|
|
"net"
|
|
"strconv"
|
|
"strings"
|
|
)
|
|
|
|
// Compute computes the connectionID from the local socket address. The zero
|
|
// value is conventionally returned to mean "unknown".
|
|
func Compute(network, address string) int64 {
|
|
_, portstring, err := net.SplitHostPort(address)
|
|
if err != nil {
|
|
return 0
|
|
}
|
|
portnum, err := strconv.Atoi(portstring)
|
|
if err != nil {
|
|
return 0
|
|
}
|
|
if portnum < 0 || portnum > 65535 {
|
|
return 0
|
|
}
|
|
result := int64(portnum)
|
|
if strings.Contains(network, "udp") {
|
|
result *= -1
|
|
} else if !strings.Contains(network, "tcp") {
|
|
result = 0
|
|
}
|
|
return result
|
|
}
|