Compare commits

..

No commits in common. "a011b57ce24c8c78c1ccbc3137d2a0d5e814c1ba" and "872f2d7c59645e5ce0ddfb703a46bed50f16705b" have entirely different histories.

2 changed files with 6 additions and 5 deletions

@ -1 +1 @@
Subproject commit aacf1b1d47824de2c924874e3d6cdad1d8b5ba2b Subproject commit 75fc6f1c374796f9e794297c3893089009b8772f

View File

@ -75,12 +75,12 @@ func relayMakeReceiver(ctx context.Context, conn net.Conn) <-chan []byte {
go func() { go func() {
defer close(p) defer close(p)
for { for {
b := relayReadFrame(r) j := relayReadFrame(r)
if b == nil { if j == nil {
return return
} }
select { select {
case p <- b: case p <- j:
case <-ctx.Done(): case <-ctx.Done():
return return
} }
@ -145,7 +145,8 @@ func clientWriteError(ctx context.Context, ws *websocket.Conn, err error) bool {
b, ok := (&RelayEventMessage{ b, ok := (&RelayEventMessage{
EventSeq: 0, EventSeq: 0,
Data: RelayEventData{ Data: RelayEventData{
Variant: &RelayEventDataError{ Interface: RelayEventDataError{
Event: RelayEventError,
CommandSeq: 0, CommandSeq: 0,
Error: err.Error(), Error: err.Error(),
}, },