c/ooni-probe-cli
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: completely remove support for h3-29 (#453)

Browse Source 
The quic-go library does not support it anymore. So, let us be consistent
and remove any reference to h3-29 from our codebase.

Closes https://github.com/ooni/probe/issues/1740.
This commit is contained in:
Simone Basso 2021-09-05 12:57:48 +02:00 committed by GitHub
parent f0927ea00c
commit ae799c4942
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
internal/cmd/oohelperd/internal/websteps/explore.go
View File

@ -56,7 +56,7 @@ func (e *DefaultExplorer) Explore(URL *url.URL, headers map[string][]string) ([]
} }
// rearrange takes in input the final response of an HTTP transaction and an optional h3URL // rearrange takes in input the final response of an HTTP transaction and an optional h3URL
// (which is needed to derive the type of h3 protocol, i.e. h3 or h3-29), // (which is needed to derive the type of h3 protocol, typically h3),
// and produces in output a list of round trips sorted // and produces in output a list of round trips sorted
// such that the first round trip is the first element in the out array. // such that the first round trip is the first element in the out array.
func (e *DefaultExplorer) rearrange(resp *http.Response, h3URL *h3URL) (out []*RoundTrip) { func (e *DefaultExplorer) rearrange(resp *http.Response, h3URL *h3URL) (out []*RoundTrip) {

6
internal/engine/experiment/websteps/model.go
View File

@ -46,7 +46,7 @@ type URLMeasurement struct {
// _inside_ the test helper to describe the discovery phase where // _inside_ the test helper to describe the discovery phase where
// we gather all the URLs that can derive from a given URL. // we gather all the URLs that can derive from a given URL.
type RoundTripInfo struct { type RoundTripInfo struct {
// Proto is the protocol used, it can be "h2", "http/1.1", "h3", "h3-29". // Proto is the protocol used, it can be "h2", "http/1.1", "h3".
Proto string Proto string
// Request is the original HTTP request. Headers also include cookies. // Request is the original HTTP request. Headers also include cookies.
@ -83,7 +83,7 @@ type EndpointMeasurement struct {
// Endpoint is the endpoint we're measuring. // Endpoint is the endpoint we're measuring.
Endpoint string `json:"endpoint"` Endpoint string `json:"endpoint"`
// Protocol is one of "http", "https", "h3", and "h3-29". // Protocol is one of "http", "https", and "h3".
Protocol string `json:"protocol"` Protocol string `json:"protocol"`
// TCPConnect is the TCP connect measurement. This field // TCPConnect is the TCP connect measurement. This field
@ -91,7 +91,7 @@ type EndpointMeasurement struct {
TCPConnect *TCPConnectMeasurement `json:"tcp_connect"` TCPConnect *TCPConnectMeasurement `json:"tcp_connect"`
// QUICHandshake is the QUIC handshake measurement. This field // QUICHandshake is the QUIC handshake measurement. This field
// is only meaningful when the protocol is one of "h3" and "h3-29". // is only meaningful when the protocol is "h3".
QUICHandshake *QUICHandshakeMeasurement `json:"quic_handshake"` QUICHandshake *QUICHandshakeMeasurement `json:"quic_handshake"`
// TLSHandshake is the TLS handshake measurement. This field // TLSHandshake is the TLS handshake measurement. This field

1
internal/engine/experiment/websteps/websteps.go
View File

@ -67,7 +67,6 @@ func (m Measurer) ExperimentVersion() string {
// SupportedQUICVersions are the H3 over QUIC versions we currently support // SupportedQUICVersions are the H3 over QUIC versions we currently support
var SupportedQUICVersions = map[string]bool{ var SupportedQUICVersions = map[string]bool{
"h3": true, "h3": true,
"h3-29": true,
} }
var ( var (