sendnrw/netbird
2
0
Fork 0
mirror of https://github.com/netbirdio/netbird.git synced 2026-07-20 15:31:30 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add SessionIDString method to OfferAnswer to avoid nil pointer exceptions

Browse Source
This commit is contained in:
Zoltán Papp
2025-08-05 10:08:18 +02:00
parent a57cb82f82
commit 5194ba1580
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
client/internal/peer/handshaker.go
View File

@@ -3,6 +3,7 @@ package peer
import (
"context"
"errors"
"strconv"
"sync"
log "github.com/sirupsen/logrus"
@@ -43,6 +44,13 @@ type OfferAnswer struct {
SessionID *int64
}
func (oa *OfferAnswer) SessionIDString() string {
if oa.SessionID == nil {
return "unknown"
}
return strconv.FormatInt(*oa.SessionID, 10)
}
type Handshaker struct {
mu sync.Mutex
log *log.Entry

4
client/internal/peer/worker_ice.go
View File

@@ -90,7 +90,7 @@ func NewWorkerICE(ctx context.Context, log *log.Entry, config ConnConfig, conn *
}
func (w *WorkerICE) OnNewOffer(remoteOfferAnswer *OfferAnswer) {
w.log.Debugf("OnNewOffer for ICE, serial: %d", *remoteOfferAnswer.SessionID)
w.log.Debugf("OnNewOffer for ICE, serial: %d", remoteOfferAnswer.SessionIDString())
w.muxAgent.Lock()
if w.agentConnecting {
@@ -261,7 +261,7 @@ func (w *WorkerICE) connect(ctx context.Context, agent *ice.Agent, remoteOfferAn
}
w.log.Debugf("on ICE conn is ready to use")
w.log.Infof("connection succeeded with offer session: %d", *remoteOfferAnswer.SessionID)
w.log.Infof("connection succeeded with offer session: %d", remoteOfferAnswer.SessionIDString())
w.muxAgent.Lock()
w.agentConnecting = false
w.lastSuccess = time.Now()