refactor: merge dnsx and errorsx into netxlite (#517)

When preparing a tutorial for netxlite, I figured it is easier
to tell people "hey, this is the package you should use for all
low-level networking stuff" rather than introducing people to
a set of packages working together where some piece of functionality
is here and some other piece is there.

Part of https://github.com/ooni/probe/issues/1591
This commit is contained in:
Simone Basso
2021-09-28 12:42:01 +02:00
committed by GitHub
parent de130d249c
commit 6d3a4f1db8
169 changed files with 575 additions and 671 deletions
+2 -2
View File
@@ -16,7 +16,7 @@ import (
"time"
"github.com/google/martian/v3/mitm"
"github.com/ooni/probe-cli/v3/internal/netxlite/iox"
"github.com/ooni/probe-cli/v3/internal/netxlite"
)
// CensoringProxy is a proxy that does not behave correctly.
@@ -57,7 +57,7 @@ func (p *CensoringProxy) serve(conn net.Conn) {
} else {
const maxread = 1 << 17
reader := io.LimitReader(conn, maxread)
iox.ReadAllContext(context.Background(), reader)
netxlite.ReadAllContext(context.Background(), reader)
}
conn.Close()
}