internal/pipewire: respond to Core::Ping
All checks were successful
Test / Create distribution (push) Successful in 36s
Test / Sandbox (push) Successful in 2m39s
Test / Sandbox (race detector) (push) Successful in 4m41s
Test / Hpkg (push) Successful in 5m4s
Test / Hakurei (race detector) (push) Successful in 6m17s
Test / Hakurei (push) Successful in 4m11s
Test / Flake checks (push) Successful in 1m39s

There is currently no known message that will get the PipeWire server to emit this event. It should be handled regardless.

Signed-off-by: Ophestra <cat@gensokyo.uk>
This commit is contained in:
Ophestra 2025-12-07 14:48:42 +09:00
parent b9b9705b52
commit 15c2839a09
Signed by: cat
SSH Key Fingerprint: SHA256:gQ67O0enBZ7UdZypgtspB2FDM1g3GVw8nX0XSdcFw8Q
3 changed files with 44 additions and 0 deletions

View File

@ -6,6 +6,7 @@ import (
"maps" "maps"
"slices" "slices"
"strconv" "strconv"
"syscall"
"time" "time"
) )
@ -615,6 +616,14 @@ func (e *UnknownBoundIdError[E]) Error() string {
return "unknown bound proxy id " + strconv.Itoa(int(e.Id)) return "unknown bound proxy id " + strconv.Itoa(int(e.Id))
} }
// An InvalidPingError is a [CorePing] event targeting a proxy id that was never allocated.
type InvalidPingError CorePing
func (e *InvalidPingError) Error() string {
return "received Core::Ping seq " + strconv.Itoa(int(e.Sequence)) +
" targeting unknown proxy id " + strconv.Itoa(int(e.ID))
}
func (core *Core) consume(opcode byte, files []int, unmarshal func(v any)) error { func (core *Core) consume(opcode byte, files []int, unmarshal func(v any)) error {
closeReceivedFiles(files...) closeReceivedFiles(files...)
switch opcode { switch opcode {
@ -637,6 +646,23 @@ func (core *Core) consume(opcode byte, files []int, unmarshal func(v any)) error
// anything, and this behaviour is never mentioned in documentation // anything, and this behaviour is never mentioned in documentation
return nil return nil
case PW_CORE_EVENT_PING:
var ping CorePing
unmarshal(&ping)
if _, ok := core.ctx.proxy[ping.ID]; ok {
core.ctx.mustWriteMessage(PW_ID_CORE, (*CorePong)(&ping))
return nil
} else {
invalidPingError := InvalidPingError(ping)
core.ctx.mustWriteMessage(PW_ID_CORE, &CoreErrorMethod{CoreError{
ID: PW_ID_CORE,
Sequence: core.ctx.currentRemoteSeq(),
Result: -Int(syscall.EINVAL),
Message: invalidPingError.Error(),
}})
return &invalidPingError
}
case PW_CORE_EVENT_ERROR: case PW_CORE_EVENT_ERROR:
var coreError CoreError var coreError CoreError
unmarshal(&coreError) unmarshal(&coreError)

View File

@ -218,6 +218,14 @@ func (ctx *Context) writeMessage(Id Int, v Message) (err error) {
return return
} }
// mustWriteMessage calls writeMessage and panics if a non-nil error is returned.
// This must only be called from eventProxy.consume.
func (ctx *Context) mustWriteMessage(Id Int, v Message) {
if err := ctx.writeMessage(Id, v); err != nil {
panic(err)
}
}
// newProxyId returns a newly allocated proxy Id for the specified type. // newProxyId returns a newly allocated proxy Id for the specified type.
func (ctx *Context) newProxyId(proxy eventProxy, ack bool) Int { func (ctx *Context) newProxyId(proxy eventProxy, ack bool) Int {
newId := ctx.nextId newId := ctx.nextId
@ -620,6 +628,10 @@ func (ctx *Context) roundtrip() (err error) {
} }
} }
// currentRemoteSeq returns the current remote sequence number.
// This must only be called from eventProxy.consume.
func (ctx *Context) currentRemoteSeq() Int { return ctx.remoteSequence - 1 }
// consume receives messages from the server and processes events. // consume receives messages from the server and processes events.
func (ctx *Context) consume(receiveRemaining []byte) (remaining []byte, err error) { func (ctx *Context) consume(receiveRemaining []byte) (remaining []byte, err error) {
defer func() { defer func() {

View File

@ -845,6 +845,7 @@ func TestContextErrors(t *testing.T) {
{"RoundtripUnexpectedEOFError ErrRoundtripEOFFooter", pipewire.ErrRoundtripEOFFooter, "unexpected EOF establishing message footer bounds"}, {"RoundtripUnexpectedEOFError ErrRoundtripEOFFooter", pipewire.ErrRoundtripEOFFooter, "unexpected EOF establishing message footer bounds"},
{"RoundtripUnexpectedEOFError ErrRoundtripEOFFooterOpcode", pipewire.ErrRoundtripEOFFooterOpcode, "unexpected EOF decoding message footer opcode"}, {"RoundtripUnexpectedEOFError ErrRoundtripEOFFooterOpcode", pipewire.ErrRoundtripEOFFooterOpcode, "unexpected EOF decoding message footer opcode"},
{"RoundtripUnexpectedEOFError invalid", pipewire.RoundtripUnexpectedEOFError(0xbad), "unexpected EOF"}, {"RoundtripUnexpectedEOFError invalid", pipewire.RoundtripUnexpectedEOFError(0xbad), "unexpected EOF"},
{"InconsistentFilesError", &pipewire.InconsistentFilesError{0, 2}, "queued 0 files instead of the expected 2"},
{"UnsupportedOpcodeError", &pipewire.UnsupportedOpcodeError{ {"UnsupportedOpcodeError", &pipewire.UnsupportedOpcodeError{
Opcode: 0xff, Opcode: 0xff,
@ -855,6 +856,11 @@ func TestContextErrors(t *testing.T) {
Id: -1, Id: -1,
Data: "\x00", Data: "\x00",
}, "unknown proxy id -1"}, }, "unknown proxy id -1"},
{"InvalidPingError", &pipewire.InvalidPingError{
ID: 0xbad,
Sequence: 0xcafe,
}, "received Core::Ping seq 51966 targeting unknown proxy id 2989"},
} }
for _, tc := range testCases { for _, tc := range testCases {
t.Run(tc.name, func(t *testing.T) { t.Run(tc.name, func(t *testing.T) {