sendnrw/netbird
2
0
Fork 0
mirror of https://github.com/netbirdio/netbird.git synced 2026-10-27 14:59:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

[relay] Negotiate the protocol version on the server side (#8231)

Browse Source
This commit is contained in:
Zoltan Papp
2026-10-21 12:27:44 +02:00
committed by GitHub
parent aa0f569677
commit 1e63b68c4d
10 changed files with 1128 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files
relay/server/peer.go
+21 -13
View File
@@ -27,6 +27,8 @@ type Peer struct {
metrics *metrics.Metrics
log *log.Entry
id messages.PeerID
version messages.ProtocolVersion
enc messages.Encoder
conn listener.Conn
connMu sync.RWMutex
store *store.Store
@@ -42,12 +44,14 @@ type Peer struct {
}
// NewPeer creates a new Peer instance and prepare custom logging
func NewPeer(metrics *metrics.Metrics, id messages.PeerID, conn listener.Conn, store *store.Store, notifier *store.PeerNotifier) *Peer {
func NewPeer(metrics *metrics.Metrics, id messages.PeerID, version messages.ProtocolVersion, conn listener.Conn, store *store.Store, notifier *store.PeerNotifier) *Peer {
ctx, cancel := context.WithCancel(context.Background())
p := &Peer{
metrics: metrics,
log: log.WithField("peer_id", id.String()),
id: id,
version: version,
enc: messages.NewEncoder(version),
conn: conn,
store: store,
notifier: notifier,
@@ -95,16 +99,15 @@ func (p *Peer) Work() {
msg := buf[:n]
_, err = messages.ValidateVersion(msg)
if err != nil {
p.log.Warnf("failed to validate protocol version: %s", err)
return
if err := messages.ValidateConnectionVersion(msg, p.version); err != nil {
p.log.Tracef("drop message: %s", err)
continue
}
msgType, err := messages.DetermineClientMessageType(msg)
if err != nil {
p.log.Errorf("failed to determine message type: %s", err)
return
p.log.Tracef("drop message: %s", err)
continue
}
p.handleMsgType(ctx, msgType, hc, n, msg)
@@ -115,6 +118,11 @@ func (p *Peer) ID() messages.PeerID {
return p.id
}
// Version returns the protocol version selected for this connection
func (p *Peer) Version() messages.ProtocolVersion {
return p.version
}
func (p *Peer) handleMsgType(ctx context.Context, msgType messages.MsgType, hc *healthcheck.Sender, n int, msg []byte) {
switch msgType {
case messages.MsgTypeHealthCheck:
@@ -133,7 +141,7 @@ func (p *Peer) handleMsgType(ctx context.Context, msgType messages.MsgType, hc *
case messages.MsgTypeUnsubscribePeerState:
p.handleUnsubscribePeerState(msg)
default:
p.log.Warnf("received unexpected message type: %s", msgType)
p.log.Tracef("drop %s message: not allowed after authentication", msgType)
}
}
@@ -149,7 +157,7 @@ func (p *Peer) Write(ctx context.Context, b []byte) (int, error) {
func (p *Peer) CloseGracefully(ctx context.Context) {
p.connMu.Lock()
defer p.connMu.Unlock()
err := p.writeWithTimeout(ctx, messages.MarshalCloseMsg())
err := p.writeWithTimeout(ctx, p.enc.CloseMsg())
if err != nil {
p.log.Errorf("failed to send close message to peer: %s", p.String())
}
@@ -187,7 +195,7 @@ func (p *Peer) handleHealthcheckEvents(ctx context.Context, hc *healthcheck.Send
for {
select {
case <-hc.HealthCheck:
_, err := p.Write(ctx, messages.MarshalHealthcheck())
_, err := p.Write(ctx, p.enc.Healthcheck())
if err != nil {
p.log.Errorf("failed to send healthcheck message: %s", err)
return
@@ -220,7 +228,7 @@ func (p *Peer) handleTransportMsg(msg []byte) {
}
dp := item.(*Peer)
err = messages.UpdateTransportMsg(msg, p.id)
err = messages.UpdateTransportMsg(msg, dp.version, p.id)
if err != nil {
p.log.Errorf("failed to update transport message: %s", err)
return
@@ -267,7 +275,7 @@ func (p *Peer) handleUnsubscribePeerState(msg []byte) {
}
func (p *Peer) sendPeersOnline(peers []messages.PeerID) {
msgs, err := messages.MarshalPeersOnline(peers)
msgs, err := p.enc.PeersOnline(peers)
if err != nil {
p.log.Errorf("failed to marshal peer location message: %s", err)
return
@@ -284,7 +292,7 @@ func (p *Peer) sendPeersWentOffline(peers []messages.PeerID) {
p.notificationMutex.Lock()
defer p.notificationMutex.Unlock()
msgs, err := messages.MarshalPeersWentOffline(peers)
msgs, err := p.enc.PeersWentOffline(peers)
if err != nil {
p.log.Errorf("failed to marshal peer location message: %s", err)
return