security/hakurei
security/hakurei
6
3
Fork 0
Code Issues 11 Pull Requests Actions Packages Projects Releases 10 Wiki Activity

internal/pipewire: use correct types in header
All checks were successful
Test / Create distribution (push) Successful in 35s
Details
Test / Sandbox (push) Successful in 2m37s
Details
Test / Sandbox (race detector) (push) Successful in 4m41s
Details
Test / Hpkg (push) Successful in 4m54s
Details
Test / Hakurei (push) Successful in 5m6s
Details
Test / Hakurei (race detector) (push) Successful in 6m30s
Details
Test / Flake checks (push) Successful in 1m32s
Details

Browse Source 
This was written when the protocol was still barely understood, so none of the types here are correct and match the rest of the protocol. This change corrects these types.

Signed-off-by: Ophestra <cat@gensokyo.uk>
This commit is contained in:
Ophestra 2025-12-02 03:32:10 +09:00
parent 7bc73afadd
commit 39c6716fb0
Signed by: cat
SSH Key Fingerprint: SHA256:gQ67O0enBZ7UdZypgtspB2FDM1g3GVw8nX0XSdcFw8Q
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
internal/pipewire/header.go
View File

@ -22,14 +22,14 @@ var (
// A Header is the fixed-size message header described in protocol native.
type Header struct {
// The message id this is the destination resource/proxy id.
ID Word `json:"Id"`
ID Int `json:"Id"`
// The opcode on the resource/proxy interface.
Opcode byte `json:"opcode"`
// The size of the payload and optional footer of the message.
// Note: this value is only 24 bits long in the format.
Size uint32 `json:"size"`
// An increasing sequence number for each message.
Sequence Word `json:"seq"`
Sequence Int `json:"seq"`
// Number of file descriptors in this message.
FileCount Word `json:"n_fds"`
}
@ -38,9 +38,9 @@ type Header struct {
//
// Callers must perform bounds check on [Header.Size].
func (h *Header) append(data []byte) []byte {
data = binary.NativeEndian.AppendUint32(data, h.ID)
data = binary.NativeEndian.AppendUint32(data, Word(h.ID))
data = binary.NativeEndian.AppendUint32(data, Word(h.Opcode)<<24|h.Size)
data = binary.NativeEndian.AppendUint32(data, h.Sequence)
data = binary.NativeEndian.AppendUint32(data, Word(h.Sequence))
data = binary.NativeEndian.AppendUint32(data, h.FileCount)
return data
}
@ -55,11 +55,11 @@ func (h *Header) MarshalBinary() (data []byte, err error) {
// unmarshalBinary decodes the protocol native message header.
func (h *Header) unmarshalBinary(data [SizeHeader]byte) {
h.ID = binary.NativeEndian.Uint32(data[0:4])
h.ID = Int(binary.NativeEndian.Uint32(data[0:4]))
h.Size = binary.NativeEndian.Uint32(data[4:8])
h.Opcode = byte(h.Size >> 24)
h.Size &= SizeMax
h.Sequence = binary.NativeEndian.Uint32(data[8:])
h.Sequence = Int(binary.NativeEndian.Uint32(data[8:]))
h.FileCount = binary.NativeEndian.Uint32(data[12:])
}