octoleo/syncthing
1
0
Fork 0
mirror of https://github.com/octoleo/syncthing.git synced 2024-12-21 10:29:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(discovery): properly unmarshal local discovery (#9880)

Browse Source 
Damage from recent protobuf refactoring
This commit is contained in:
Jakob Borg 2024-12-19 21:16:44 +01:00 committed by GitHub
parent 371ba69447
commit 4355dc69ea
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/discover/local.go
View File

@ -11,6 +11,7 @@ import (
"context"
"encoding/binary"
"encoding/hex"
"errors"
"fmt"
"io"
"net"
@ -198,9 +199,9 @@ func (c *localClient) recvAnnouncements(ctx context.Context) error {
}
var pkt discoproto.Announce
err := proto.Unmarshal(buf[:4], &pkt)
if err != nil && err != io.EOF {
l.Debugf("discover: Failed to unmarshal local announcement from %s:\n%s", addr, hex.Dump(buf))
err := proto.Unmarshal(buf[4:], &pkt)
if err != nil && !errors.Is(err, io.EOF) {
l.Debugf("discover: Failed to unmarshal local announcement from %s (%s):\n%s", addr, err, hex.Dump(buf[4:]))
continue
}