SVI/netbird
1
0
Fork 0
mirror of https://github.com/netbirdio/netbird.git synced 2026-07-29 01:12:36 -04:00
Code Issues 3.0k Packages Projects Releases 10 Wiki Activity

Homogeneous logs prefix

Browse Source
This commit is contained in:
riccardom
2026-07-25 13:33:11 +02:00
parent 1bccd71954
commit 4189937ac6
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
client/internal/engine.go
View File

@@ -661,11 +661,11 @@ func (e *Engine) Start(netbirdConfig *mgmProto.NetbirdConfig, mgmtURL *url.URL)
if pqkem.Enabled() {
tr, pqErr := newPQTransport(e.config.WgAddr.IP)
if pqErr != nil {
log.Errorf("ML-KEM PQ transport bind failed, PQ exchange disabled: %v", pqErr)
log.Errorf("pqkem: transport bind failed, exchange disabled: %v", pqErr)
} else {
e.pqkemManager = pqkem.NewManager(pqkem.LocalID(publicKey.String()), pqCallbackHandler{wg: e.wgInterface}, nil)
e.pqkemManager.Start(tr)
log.Infof("ML-KEM post-quantum exchange enabled (udp port %d on overlay %s)", e.pqkemManager.LocalPort(), e.config.WgAddr.IP)
log.Infof("pqkem: enabled (udp port %d on overlay %s)", e.pqkemManager.LocalPort(), e.config.WgAddr.IP)
}
}

6
client/internal/pqkem/convergence.go
View File

@@ -179,7 +179,7 @@ func (m *Manager) initiatorLoop(ctx context.Context, remoteID RemoteID, id Excha
m.mu.Unlock()
if !viaSignal {
if err := m.pushDataPath(remoteID, msg); err != nil {
m.logger.Warn("pqkem offer retransmit failed", "peer", remoteID, "err", err)
m.logger.Warn("pqkem: offer retransmit failed", "peer", remoteID, "err", err)
}
}
@@ -213,10 +213,10 @@ func (m *Manager) registerFailureLocked(remoteID RemoteID) bool {
func (m *Manager) raiseFailure(remoteID RemoteID, fail bool) {
if !fail {
m.logger.Warn("pqkem rekey attempt timed out, will retry next cycle", "peer", remoteID)
m.logger.Warn("pqkem: rekey attempt timed out, will retry next cycle", "peer", remoteID)
return
}
if err := m.cbHandler.OnRekeyFailed(remoteID); err != nil {
m.logger.Error("pqkem OnRekeyFailed handler error", "peer", remoteID, "err", err)
m.logger.Error("pqkem: OnRekeyFailed handler error", "peer", remoteID, "err", err)
}
}

6
client/internal/pqkem/manager.go
View File

@@ -267,7 +267,7 @@ func (m *Manager) onDataPathInbound(src netip.AddrPort, msg []byte) {
return
}
if err := m.OnDataPathMessage(remoteID, msg); err != nil {
m.logger.Debug("pqkem inbound", "peer", remoteID, "err", err)
m.logger.Debug("pqkem: inbound", "peer", remoteID, "err", err)
}
}
@@ -315,11 +315,11 @@ func (m *Manager) OnDataPathRekeyed(remoteID RemoteID) {
}
offer, err := m.startExchange(remoteID, false, ackID)
if err != nil {
m.logger.Error("pqkem chain offer failed to start", "peer", remoteID, "err", err)
m.logger.Error("pqkem: chain offer failed to start", "peer", remoteID, "err", err)
return
}
if err := m.pushDataPath(remoteID, offer); err != nil {
m.logger.Warn("pqkem send chain offer failed", "peer", remoteID, "err", err)
m.logger.Warn("pqkem: send chain offer failed", "peer", remoteID, "err", err)
}
}