gr1ffon/quic-go
1
0
Fork 0
forked from quic-go/quic-go
Code Pull Requests Activity

qlog: rename owner to initiator (#5416)

Browse Source 
Owner was renamed to Initiator in draft-ietf-qlog-quic-events-11.
This commit is contained in:
Marten Seemann
2025-11-01 17:30:18 +01:00
committed by GitHub
parent 7646b74b22
commit d3211a4193
6 changed files with 41 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
qlog/event.go
View File

@@ -148,38 +148,38 @@ func (e ConnectionClosed) Encode(enc *jsontext.Encoder, _ time.Time) error {
)
switch {
case errors.As(e.Error, &statelessResetErr):
h.WriteToken(jsontext.String("owner"))
h.WriteToken(jsontext.String(string(OwnerRemote)))
h.WriteToken(jsontext.String("initiator"))
h.WriteToken(jsontext.String(string(InitiatorRemote)))
h.WriteToken(jsontext.String("trigger"))
h.WriteToken(jsontext.String("stateless_reset"))
case errors.As(e.Error, &handshakeTimeoutErr):
h.WriteToken(jsontext.String("owner"))
h.WriteToken(jsontext.String(string(OwnerLocal)))
h.WriteToken(jsontext.String("initiator"))
h.WriteToken(jsontext.String(string(InitiatorLocal)))
h.WriteToken(jsontext.String("trigger"))
h.WriteToken(jsontext.String("handshake_timeout"))
case errors.As(e.Error, &idleTimeoutErr):
h.WriteToken(jsontext.String("owner"))
h.WriteToken(jsontext.String(string(OwnerLocal)))
h.WriteToken(jsontext.String("initiator"))
h.WriteToken(jsontext.String(string(InitiatorLocal)))
h.WriteToken(jsontext.String("trigger"))
h.WriteToken(jsontext.String("idle_timeout"))
case errors.As(e.Error, &applicationErr):
owner := OwnerLocal
initiator := InitiatorLocal
if applicationErr.Remote {
owner = OwnerRemote
initiator = InitiatorRemote
}
h.WriteToken(jsontext.String("owner"))
h.WriteToken(jsontext.String(string(owner)))
h.WriteToken(jsontext.String("initiator"))
h.WriteToken(jsontext.String(string(initiator)))
h.WriteToken(jsontext.String("application_code"))
h.WriteToken(jsontext.Uint(uint64(applicationErr.ErrorCode)))
h.WriteToken(jsontext.String("reason"))
h.WriteToken(jsontext.String(applicationErr.ErrorMessage))
case errors.As(e.Error, &transportErr):
owner := OwnerLocal
initiator := InitiatorLocal
if transportErr.Remote {
owner = OwnerRemote
initiator = InitiatorRemote
}
h.WriteToken(jsontext.String("owner"))
h.WriteToken(jsontext.String(string(owner)))
h.WriteToken(jsontext.String("initiator"))
h.WriteToken(jsontext.String(string(initiator)))
h.WriteToken(jsontext.String("connection_code"))
h.WriteToken(jsontext.String(transportError(transportErr.ErrorCode).String()))
h.WriteToken(jsontext.String("reason"))
@@ -539,7 +539,7 @@ func (e KeyDiscarded) Encode(enc *jsontext.Encoder, _ time.Time) error {
type ParametersSet struct {
Restore bool
Owner Owner
Initiator Initiator
SentBy protocol.Perspective
OriginalDestinationConnectionID protocol.ConnectionID
InitialSourceConnectionID protocol.ConnectionID
@@ -573,8 +573,8 @@ func (e ParametersSet) Encode(enc *jsontext.Encoder, _ time.Time) error {
h := encoderHelper{enc: enc}
h.WriteToken(jsontext.BeginObject)
if !e.Restore {
h.WriteToken(jsontext.String("owner"))
h.WriteToken(jsontext.String(string(e.Owner)))
h.WriteToken(jsontext.String("initiator"))
h.WriteToken(jsontext.String(string(e.Initiator)))
if e.SentBy == protocol.PerspectiveServer {
h.WriteToken(jsontext.String("original_destination_connection_id"))
h.WriteToken(jsontext.String(e.OriginalDestinationConnectionID.String()))

34
qlog/event_test.go
View File

@@ -110,7 +110,7 @@ func TestIdleTimeouts(t *testing.T) {
require.Equal(t, "transport:connection_closed", name)
require.Len(t, ev, 2)
require.Equal(t, "local", ev["owner"])
require.Equal(t, "local", ev["initiator"])
require.Equal(t, "idle_timeout", ev["trigger"])
}
@@ -121,7 +121,7 @@ func TestHandshakeTimeouts(t *testing.T) {
require.Equal(t, "transport:connection_closed", name)
require.Len(t, ev, 2)
require.Equal(t, "local", ev["owner"])
require.Equal(t, "local", ev["initiator"])
require.Equal(t, "handshake_timeout", ev["trigger"])
}
@@ -132,7 +132,7 @@ func TestReceivedStatelessResetPacket(t *testing.T) {
require.Equal(t, "transport:connection_closed", name)
require.Len(t, ev, 2)
require.Equal(t, "remote", ev["owner"])
require.Equal(t, "remote", ev["initiator"])
require.Equal(t, "stateless_reset", ev["trigger"])
}
@@ -157,7 +157,7 @@ func TestApplicationErrors(t *testing.T) {
require.Equal(t, "transport:connection_closed", name)
require.Len(t, ev, 3)
require.Equal(t, "remote", ev["owner"])
require.Equal(t, "remote", ev["initiator"])
require.Equal(t, float64(1337), ev["application_code"])
require.Equal(t, "foobar", ev["reason"])
}
@@ -172,7 +172,7 @@ func TestTransportErrors(t *testing.T) {
require.Equal(t, "transport:connection_closed", name)
require.Len(t, ev, 3)
require.Equal(t, "local", ev["owner"])
require.Equal(t, "local", ev["initiator"])
require.Equal(t, "aead_limit_reached", ev["connection_code"])
require.Equal(t, "foobar", ev["reason"])
}
@@ -180,7 +180,7 @@ func TestTransportErrors(t *testing.T) {
func TestSentTransportParameters(t *testing.T) {
rcid := protocol.ParseConnectionID([]byte{0xde, 0xca, 0xfb, 0xad})
name, ev := testEventEncoding(t, &ParametersSet{
Owner: OwnerLocal,
Initiator: InitiatorLocal,
SentBy: protocol.PerspectiveServer,
OriginalDestinationConnectionID: protocol.ParseConnectionID([]byte{0xde, 0xad, 0xc0, 0xde}),
InitialSourceConnectionID: protocol.ParseConnectionID([]byte{0xde, 0xad, 0xbe, 0xef}),
@@ -203,7 +203,7 @@ func TestSentTransportParameters(t *testing.T) {
})
require.Equal(t, "transport:parameters_set", name)
require.Equal(t, "local", ev["owner"])
require.Equal(t, "local", ev["initiator"])
require.Equal(t, "deadc0de", ev["original_destination_connection_id"])
require.Equal(t, "deadbeef", ev["initial_source_connection_id"])
require.Equal(t, "decafbad", ev["retry_source_connection_id"])
@@ -225,7 +225,7 @@ func TestSentTransportParameters(t *testing.T) {
func TestServerTransportParametersWithoutStatelessResetToken(t *testing.T) {
name, ev := testEventEncoding(t, &ParametersSet{
Owner: OwnerLocal,
Initiator: InitiatorLocal,
SentBy: protocol.PerspectiveServer,
OriginalDestinationConnectionID: protocol.ParseConnectionID([]byte{0xde, 0xad, 0xc0, 0xde}),
ActiveConnectionIDLimit: 7,
@@ -237,13 +237,13 @@ func TestServerTransportParametersWithoutStatelessResetToken(t *testing.T) {
func TestTransportParametersWithoutRetrySourceConnectionID(t *testing.T) {
name, ev := testEventEncoding(t, &ParametersSet{
Owner: OwnerLocal,
Initiator: InitiatorLocal,
SentBy: protocol.PerspectiveServer,
StatelessResetToken: &protocol.StatelessResetToken{0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77, 0x88, 0x99, 0xaa, 0xbb, 0xcc, 0xdd, 0xee, 0xff, 0x00},
})
require.Equal(t, "transport:parameters_set", name)
require.Equal(t, "local", ev["owner"])
require.Equal(t, "local", ev["initiator"])
require.NotContains(t, ev, "retry_source_connection_id")
}
@@ -273,13 +273,13 @@ func testTransportParametersWithPreferredAddress(t *testing.T, hasIPv4, hasIPv6
preferredAddress.IPv6 = addr6
}
name, ev := testEventEncoding(t, &ParametersSet{
Owner: OwnerLocal,
Initiator: InitiatorLocal,
SentBy: protocol.PerspectiveServer,
PreferredAddress: preferredAddress,
})
require.Equal(t, "transport:parameters_set", name)
require.Equal(t, "local", ev["owner"])
require.Equal(t, "local", ev["initiator"])
require.Contains(t, ev, "preferred_address")
pa := ev["preferred_address"].(map[string]any)
if hasIPv4 {
@@ -302,7 +302,7 @@ func testTransportParametersWithPreferredAddress(t *testing.T, hasIPv4, hasIPv6
func TestTransportParametersWithDatagramExtension(t *testing.T) {
name, ev := testEventEncoding(t, &ParametersSet{
Owner: OwnerLocal,
Initiator: InitiatorLocal,
SentBy: protocol.PerspectiveServer,
MaxDatagramFrameSize: 1337,
})
@@ -313,12 +313,12 @@ func TestTransportParametersWithDatagramExtension(t *testing.T) {
func TestReceivedTransportParameters(t *testing.T) {
name, ev := testEventEncoding(t, &ParametersSet{
Owner: OwnerRemote,
SentBy: protocol.PerspectiveClient,
Initiator: InitiatorRemote,
SentBy: protocol.PerspectiveClient,
})
require.Equal(t, "transport:parameters_set", name)
require.Equal(t, "remote", ev["owner"])
require.Equal(t, "remote", ev["initiator"])
require.NotContains(t, ev, "original_destination_connection_id")
}
@@ -333,7 +333,7 @@ func TestRestoredTransportParameters(t *testing.T) {
})
require.Equal(t, "transport:parameters_restored", name)
require.NotContains(t, ev, "owner")
require.NotContains(t, ev, "initiator")
require.NotContains(t, ev, "original_destination_connection_id")
require.NotContains(t, ev, "stateless_reset_token")
require.NotContains(t, ev, "retry_source_connection_id")

6
qlog/types.go
View File

@@ -41,11 +41,11 @@ const (
ECNCE ECN = "CE"
)
type Owner string
type Initiator string
const (
OwnerLocal Owner = "local"
OwnerRemote Owner = "remote"
InitiatorLocal Initiator = "local"
InitiatorRemote Initiator = "remote"
)
type streamType protocol.StreamType