sendnrw/netbird
2
0
Fork 0
mirror of https://github.com/netbirdio/netbird.git synced 2026-10-26 06:19:08 +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/relay.go
+12 -8
View File
@@ -150,8 +150,17 @@ func (r *Relay) Accept(conn listener.Conn) {
return
}
peer := NewPeer(r.metrics, *peerID, conn, r.store, r.notifier)
peer.log.Infof("peer connected from: %s", conn.RemoteAddr())
if err := h.handshakeResponse(hsCtx); err != nil {
log.Errorf("failed to send handshake response, close connection: %s", err)
if cErr := conn.Close(); cErr != nil {
log.Errorf("failed to close connection, %s: %s", conn.RemoteAddr(), cErr)
}
return
}
r.metrics.RecordAuthenticationTime(time.Since(acceptTime))
peer := NewPeer(r.metrics, *peerID, h.selectedVersion, conn, r.store, r.notifier)
peer.log.Infof("peer connected from: %s, advertised protocol version: %d, selected: %d", conn.RemoteAddr(), h.advertisedVersion, h.selectedVersion)
storeTime := time.Now()
if isReconnection := r.store.AddPeer(peer); isReconnection {
r.metrics.RecordPeerReconnection()
@@ -161,6 +170,7 @@ func (r *Relay) Accept(conn listener.Conn) {
transport := conn.Protocol()
r.metrics.RecordPeerStoreTime(time.Since(storeTime))
r.metrics.PeerConnected(peer.String(), transport)
r.metrics.RecordProtocolVersion(h.advertisedVersion, h.selectedVersion)
go func() {
peer.Work()
if deleted := r.store.DeletePeer(peer); deleted {
@@ -169,12 +179,6 @@ func (r *Relay) Accept(conn listener.Conn) {
peer.log.Debugf("relay connection closed")
r.metrics.PeerDisconnected(peer.String(), transport)
}()
if err := h.handshakeResponse(hsCtx); err != nil {
log.Errorf("failed to send handshake response, close peer: %s", err)
peer.Close()
}
r.metrics.RecordAuthenticationTime(time.Since(acceptTime))
}
// Shutdown closes the relay server