mirror of
https://github.com/netbirdio/netbird.git
synced 2026-04-24 19:26:39 +00:00
5a89e6621b
* [client] Suppress ICE signaling and periodic offers in force-relay mode When NB_FORCE_RELAY is enabled, skip WorkerICE creation entirely, suppress ICE credentials in offer/answer messages, disable the periodic ICE candidate monitor, and fix isConnectedOnAllWay to only check relay status so the guard stops sending unnecessary offers. * [client] Dynamically suppress ICE based on remote peer's offer credentials Track whether the remote peer includes ICE credentials in its offers/answers. When remote stops sending ICE credentials, skip ICE listener dispatch, suppress ICE credentials in responses, and exclude ICE from the guard connectivity check. When remote resumes sending ICE credentials, re-enable all ICE behavior. * [client] Fix nil SessionID panic and force ICE teardown on relay-only transition Fix nil pointer dereference in signalOfferAnswer when SessionID is nil (relay-only offers). Close stale ICE agent immediately when remote peer stops sending ICE credentials to avoid traffic black-hole during the ICE disconnect timeout. * [client] Add relay-only fallback check when ICE is unavailable Ensure the relay connection is supported with the peer when ICE is disabled to prevent connectivity issues. * [client] Add tri-state connection status to guard for smarter ICE retry (#5828) * [client] Add tri-state connection status to guard for smarter ICE retry Refactor isConnectedOnAllWay to return a ConnStatus enum (Connected, Disconnected, PartiallyConnected) instead of a boolean. When relay is up but ICE is not (PartiallyConnected), limit ICE offers to 3 retries with exponential backoff then fall back to hourly attempts, reducing unnecessary signaling traffic. Fully disconnected peers continue to retry aggressively. External events (relay/ICE disconnect, signal/relay reconnect) reset retry state to give ICE a fresh chance. * [client] Clarify guard ICE retry state and trace log trigger Split iceRetryState.attempt into shouldRetry (pure predicate) and enterHourlyMode (explicit state transition) so the caller in reconnectLoopWithRetry reads top-to-bottom. Restore the original trace-log behavior in isConnectedOnAllWay so it only logs on full disconnection, not on the new PartiallyConnected state. * [client] Extract pure evalConnStatus and add unit tests Split isConnectedOnAllWay into a thin method that snapshots state and a pure evalConnStatus helper that takes a connStatusInputs struct, so the tri-state decision logic can be exercised without constructing full Worker or Handshaker objects. Add table-driven tests covering force-relay, ICE-unavailable and fully-available code paths, plus unit tests for iceRetryState budget/hourly transitions and reset. * [client] Improve grammar in logs and refactor ICE credential checks
90 lines
2.2 KiB
Go
90 lines
2.2 KiB
Go
package peer
|
|
|
|
import (
|
|
"github.com/pion/ice/v4"
|
|
log "github.com/sirupsen/logrus"
|
|
"golang.zx2c4.com/wireguard/wgctrl/wgtypes"
|
|
|
|
signal "github.com/netbirdio/netbird/shared/signal/client"
|
|
sProto "github.com/netbirdio/netbird/shared/signal/proto"
|
|
)
|
|
|
|
type Signaler struct {
|
|
signal signal.Client
|
|
wgPrivateKey wgtypes.Key
|
|
}
|
|
|
|
func NewSignaler(signal signal.Client, wgPrivateKey wgtypes.Key) *Signaler {
|
|
return &Signaler{
|
|
signal: signal,
|
|
wgPrivateKey: wgPrivateKey,
|
|
}
|
|
}
|
|
|
|
func (s *Signaler) SignalOffer(offer OfferAnswer, remoteKey string) error {
|
|
return s.signalOfferAnswer(offer, remoteKey, sProto.Body_OFFER)
|
|
}
|
|
|
|
func (s *Signaler) SignalAnswer(offer OfferAnswer, remoteKey string) error {
|
|
return s.signalOfferAnswer(offer, remoteKey, sProto.Body_ANSWER)
|
|
}
|
|
|
|
func (s *Signaler) SignalICECandidate(candidate ice.Candidate, remoteKey string) error {
|
|
return s.signal.Send(&sProto.Message{
|
|
Key: s.wgPrivateKey.PublicKey().String(),
|
|
RemoteKey: remoteKey,
|
|
Body: &sProto.Body{
|
|
Type: sProto.Body_CANDIDATE,
|
|
Payload: candidate.Marshal(),
|
|
},
|
|
})
|
|
}
|
|
|
|
func (s *Signaler) Ready() bool {
|
|
return s.signal.Ready()
|
|
}
|
|
|
|
// SignalOfferAnswer signals either an offer or an answer to remote peer
|
|
func (s *Signaler) signalOfferAnswer(offerAnswer OfferAnswer, remoteKey string, bodyType sProto.Body_Type) error {
|
|
var sessionIDBytes []byte
|
|
if offerAnswer.SessionID != nil {
|
|
var err error
|
|
sessionIDBytes, err = offerAnswer.SessionID.Bytes()
|
|
if err != nil {
|
|
log.Warnf("failed to get session ID bytes: %v", err)
|
|
}
|
|
}
|
|
msg, err := signal.MarshalCredential(
|
|
s.wgPrivateKey,
|
|
offerAnswer.WgListenPort,
|
|
remoteKey,
|
|
&signal.Credential{
|
|
UFrag: offerAnswer.IceCredentials.UFrag,
|
|
Pwd: offerAnswer.IceCredentials.Pwd,
|
|
},
|
|
bodyType,
|
|
offerAnswer.RosenpassPubKey,
|
|
offerAnswer.RosenpassAddr,
|
|
offerAnswer.RelaySrvAddress,
|
|
sessionIDBytes)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
if err = s.signal.Send(msg); err != nil {
|
|
return err
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
func (s *Signaler) SignalIdle(remoteKey string) error {
|
|
return s.signal.Send(&sProto.Message{
|
|
Key: s.wgPrivateKey.PublicKey().String(),
|
|
RemoteKey: remoteKey,
|
|
Body: &sProto.Body{
|
|
Type: sProto.Body_GO_IDLE,
|
|
},
|
|
})
|
|
}
|