Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions fetch_stream.go
Original file line number Diff line number Diff line change
Expand Up @@ -64,11 +64,7 @@ func (f *FetchStream) WriteObject(
ExtensionHeaders: nil,
ObjectPayloadLength: uint64(len(payload)),
ObjectStatus: 0,
ObjectPayload: qlog.RawInfo{
Length: uint64(len(payload)),
PayloadLength: uint64(len(payload)),
Data: payload,
},
ObjectPayload: wire.TruncatedRawInfo(payload),
})
}
return len(payload), nil
Expand Down
12 changes: 2 additions & 10 deletions internal/wire/object_stream_parser.go
Original file line number Diff line number Diff line change
Expand Up @@ -179,11 +179,7 @@ func (p *ObjectStreamParser) parseSubgroupObject() (*ObjectMessage, error) {
ExtensionHeaders: eth,
ObjectPayloadLength: uint64(len(m.ObjectPayload)),
ObjectStatus: uint64(m.ObjectStatus),
ObjectPayload: qlog.RawInfo{
Length: uint64(len(m.ObjectPayload)),
PayloadLength: uint64(len(m.ObjectPayload)),
Data: m.ObjectPayload,
},
ObjectPayload: TruncatedRawInfo(m.ObjectPayload),
})
}
return m, nil
Expand Down Expand Up @@ -225,11 +221,7 @@ func (p *ObjectStreamParser) parseFetchObject() (*ObjectMessage, error) {
ExtensionHeaders: eth,
ObjectPayloadLength: uint64(len(m.ObjectPayload)),
ObjectStatus: uint64(m.ObjectStatus),
ObjectPayload: qlog.RawInfo{
Length: uint64(len(m.ObjectPayload)),
PayloadLength: uint64(len(m.ObjectPayload)),
Data: m.ObjectPayload,
},
ObjectPayload: TruncatedRawInfo(m.ObjectPayload),
})
}
return m, nil
Expand Down
20 changes: 20 additions & 0 deletions internal/wire/qlog_helpers.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
package wire

import "github.com/mengelbart/qlog"

const maxQlogPayloadBytes = 20

// TruncatedRawInfo creates a qlog.RawInfo with the Data field truncated to
// maxQlogPayloadBytes. The Length and PayloadLength fields reflect the original
// full length, while Data contains only the first 20 bytes (or less if shorter).
func TruncatedRawInfo(data []byte) qlog.RawInfo {
truncated := data
if len(data) > maxQlogPayloadBytes {
truncated = data[:maxQlogPayloadBytes]
}
return qlog.RawInfo{
Length: uint64(len(data)),
PayloadLength: uint64(len(data)),
Data: truncated,
}
}
6 changes: 1 addition & 5 deletions local_track.go
Original file line number Diff line number Diff line change
Expand Up @@ -110,11 +110,7 @@ func (p *localTrack) sendDatagram(o Object) error {
ExtensionHeadersLength: uint64(len(om.ObjectExtensionHeaders)),
ExtensionHeaders: eth,
ObjectStatus: uint64(om.ObjectStatus),
Payload: qlog.RawInfo{
Length: uint64(len(om.ObjectPayload)),
PayloadLength: uint64(len(om.ObjectPayload)),
Data: om.ObjectPayload,
},
Payload: wire.TruncatedRawInfo(om.ObjectPayload),
})
}
return p.conn.SendDatagram(buf)
Expand Down
6 changes: 1 addition & 5 deletions session.go
Original file line number Diff line number Diff line change
Expand Up @@ -216,11 +216,7 @@ func (s *Session) readDatagrams(ctx context.Context) error {
ExtensionHeadersLength: uint64(len(msg.ObjectExtensionHeaders)),
ExtensionHeaders: eth,
ObjectStatus: uint64(msg.ObjectStatus),
Payload: qlog.RawInfo{
Length: uint64(len(msg.ObjectPayload)),
PayloadLength: uint64(len(msg.ObjectPayload)),
Data: msg.ObjectPayload,
},
Payload: wire.TruncatedRawInfo(msg.ObjectPayload),
})
}
if err := s.receiveDatagram(msg); err != nil {
Expand Down
6 changes: 1 addition & 5 deletions subgroup.go
Original file line number Diff line number Diff line change
Expand Up @@ -73,11 +73,7 @@ func (s *Subgroup) WriteObject(objectID uint64, payload []byte) (int, error) {
ExtensionHeaders: nil,
ObjectPayloadLength: uint64(len(payload)),
ObjectStatus: 0,
ObjectPayload: qlog.RawInfo{
Length: uint64(len(payload)),
PayloadLength: uint64(len(payload)),
Data: payload,
},
ObjectPayload: wire.TruncatedRawInfo(payload),
})
}
return len(payload), nil
Expand Down