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

Fix pointer logging

Browse Source
This commit is contained in:
Zoltan Papp
2025-08-05 09:47:01 +02:00
parent fa04b2ca77
commit d0ed9bb59d
2 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/internal/peer/handshaker.go
+2 -7
View File
@@ -4,7 +4,6 @@ import (
"context" "context"
"errors" "errors"
"sync" "sync"
"time"
log "github.com/sirupsen/logrus" log "github.com/sirupsen/logrus"
@@ -42,9 +41,6 @@ type OfferAnswer struct {
RelaySrvAddress string RelaySrvAddress string
// SessionID is the unique identifier of the session, used to discard old messages // SessionID is the unique identifier of the session, used to discard old messages
SessionID *int64 SessionID *int64
// for debugging purposes
When time.Time
} }
type Handshaker struct { type Handshaker struct {
@@ -140,14 +136,14 @@ func (h *Handshaker) sendOffer() error {
} }
offer := h.buildOfferAnswer() offer := h.buildOfferAnswer()
h.log.Infof("sending offer: %s, %d", offer.When, offer.SessionID) h.log.Infof("sending offer with serial: %d", *offer.SessionID)
return h.signaler.SignalOffer(offer, h.config.Key) return h.signaler.SignalOffer(offer, h.config.Key)
} }
func (h *Handshaker) sendAnswer() error { func (h *Handshaker) sendAnswer() error {
answer := h.buildOfferAnswer() answer := h.buildOfferAnswer()
h.log.Infof("sending answer: %s, serial: %d", answer.When, answer.SessionID) h.log.Infof("sending answer with serial: %d", *answer.SessionID)
return h.signaler.SignalAnswer(answer, h.config.Key) return h.signaler.SignalAnswer(answer, h.config.Key)
} }
@@ -161,7 +157,6 @@ func (h *Handshaker) buildOfferAnswer() OfferAnswer {
Version: version.NetbirdVersion(), Version: version.NetbirdVersion(),
RosenpassPubKey: h.config.RosenpassConfig.PubKey, RosenpassPubKey: h.config.RosenpassConfig.PubKey,
RosenpassAddr: h.config.RosenpassConfig.Addr, RosenpassAddr: h.config.RosenpassConfig.Addr,
When: time.Now(),
SessionID: &sid, SessionID: &sid,
} }
client/internal/peer/worker_ice.go
+1 -1
View File
@@ -90,7 +90,7 @@ func NewWorkerICE(ctx context.Context, log *log.Entry, config ConnConfig, conn *
} }
func (w *WorkerICE) OnNewOffer(remoteOfferAnswer *OfferAnswer) { func (w *WorkerICE) OnNewOffer(remoteOfferAnswer *OfferAnswer) {
w.log.Debugf("OnNewOffer for ICE: %s, %s, serial: %d", time.Since(remoteOfferAnswer.When), remoteOfferAnswer.When, remoteOfferAnswer.SessionID) w.log.Debugf("OnNewOffer for ICE, serial: %d", *remoteOfferAnswer.SessionID)
w.muxAgent.Lock() w.muxAgent.Lock()
if w.agentConnecting { if w.agentConnecting {