extern/netbird
1
0
Fork 0
mirror of https://github.com/netbirdio/netbird.git synced 2024-12-14 02:41:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix circle import

Browse Source
This commit is contained in:
Zoltán Papp 2024-06-17 18:02:52 +02:00
parent e407fe02c5
commit deb8203f06
5 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/internal/engine.go
View File

@ -97,7 +97,7 @@ type EngineConfig struct {
type Engine struct { type Engine struct {
// signal is a Signal Service client // signal is a Signal Service client
signal signal.Client signal signal.Client
signaler *Signaler signaler *peer.Signaler
// mgmClient is a Management Service client // mgmClient is a Management Service client
mgmClient mgm.Client mgmClient mgm.Client
// peerConns is a map that holds all the peers that are known to this peer // peerConns is a map that holds all the peers that are known to this peer

5
client/internal/peer/conn.go
View File

@ -12,7 +12,6 @@ import (
log "github.com/sirupsen/logrus" log "github.com/sirupsen/logrus"
"golang.zx2c4.com/wireguard/wgctrl/wgtypes" "golang.zx2c4.com/wireguard/wgctrl/wgtypes"
"github.com/netbirdio/netbird/client/internal"
"github.com/netbirdio/netbird/client/internal/stdnet" "github.com/netbirdio/netbird/client/internal/stdnet"
"github.com/netbirdio/netbird/client/internal/wgproxy" "github.com/netbirdio/netbird/client/internal/wgproxy"
"github.com/netbirdio/netbird/iface" "github.com/netbirdio/netbird/iface"
@ -73,7 +72,7 @@ type Conn struct {
statusRecorder *Status statusRecorder *Status
wgProxyFactory *wgproxy.Factory wgProxyFactory *wgproxy.Factory
wgProxy wgproxy.Proxy wgProxy wgproxy.Proxy
signaler *internal.Signaler signaler *Signaler
allowedIPsIP string allowedIPsIP string
handshaker *Handshaker handshaker *Handshaker
closeCh chan struct{} closeCh chan struct{}
@ -95,7 +94,7 @@ type Conn struct {
// NewConn creates a new not opened Conn to the remote peer. // NewConn creates a new not opened Conn to the remote peer.
// To establish a connection run Conn.Open // To establish a connection run Conn.Open
func NewConn(engineCtx context.Context, config ConnConfig, statusRecorder *Status, wgProxyFactory *wgproxy.Factory, signaler *internal.Signaler, iFaceDiscover stdnet.ExternalIFaceDiscover, relayManager *relayClient.Manager) (*Conn, error) { func NewConn(engineCtx context.Context, config ConnConfig, statusRecorder *Status, wgProxyFactory *wgproxy.Factory, signaler *Signaler, iFaceDiscover stdnet.ExternalIFaceDiscover, relayManager *relayClient.Manager) (*Conn, error) {
_, allowedIPsIP, err := net.ParseCIDR(config.WgConfig.AllowedIps) _, allowedIPsIP, err := net.ParseCIDR(config.WgConfig.AllowedIps)
if err != nil { if err != nil {
log.Errorf("failed to parse allowedIPS: %v", err) log.Errorf("failed to parse allowedIPS: %v", err)

5
client/internal/peer/conn_ice.go
View File

@ -15,7 +15,6 @@ import (
"github.com/pion/stun/v2" "github.com/pion/stun/v2"
log "github.com/sirupsen/logrus" log "github.com/sirupsen/logrus"
"github.com/netbirdio/netbird/client/internal"
"github.com/netbirdio/netbird/client/internal/stdnet" "github.com/netbirdio/netbird/client/internal/stdnet"
"github.com/netbirdio/netbird/iface" "github.com/netbirdio/netbird/iface"
"github.com/netbirdio/netbird/iface/bind" "github.com/netbirdio/netbird/iface/bind"
@ -64,7 +63,7 @@ type ConnectorICE struct {
log *log.Entry log *log.Entry
config ConnConfig config ConnConfig
configICE ICEConfig configICE ICEConfig
signaler *internal.Signaler signaler *Signaler
iFaceDiscover stdnet.ExternalIFaceDiscover iFaceDiscover stdnet.ExternalIFaceDiscover
statusRecorder *Status statusRecorder *Status
onICEConnReady OnICEConnReadyCallback onICEConnReady OnICEConnReadyCallback
@ -79,7 +78,7 @@ type ConnectorICE struct {
sentExtraSrflx bool sentExtraSrflx bool
} }
func NewConnectorICE(ctx context.Context, log *log.Entry, config ConnConfig, configICE ICEConfig, signaler *internal.Signaler, ifaceDiscover stdnet.ExternalIFaceDiscover, statusRecorder *Status, onICEConnReady OnICEConnReadyCallback, doHandshakeFn DoHandshake) *ConnectorICE { func NewConnectorICE(ctx context.Context, log *log.Entry, config ConnConfig, configICE ICEConfig, signaler *Signaler, ifaceDiscover stdnet.ExternalIFaceDiscover, statusRecorder *Status, onICEConnReady OnICEConnReadyCallback, doHandshakeFn DoHandshake) *ConnectorICE {
cice := &ConnectorICE{ cice := &ConnectorICE{
ctx: ctx, ctx: ctx,
log: log, log: log,

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

@ -9,7 +9,6 @@ import (
log "github.com/sirupsen/logrus" log "github.com/sirupsen/logrus"
"golang.zx2c4.com/wireguard/conn" "golang.zx2c4.com/wireguard/conn"
"github.com/netbirdio/netbird/client/internal"
"github.com/netbirdio/netbird/version" "github.com/netbirdio/netbird/version"
) )
@ -60,7 +59,7 @@ type Handshaker struct {
mu sync.Mutex mu sync.Mutex
ctx context.Context ctx context.Context
config ConnConfig config ConnConfig
signaler *internal.Signaler signaler *Signaler
// remoteOffersCh is a channel used to wait for remote credentials to proceed with the connection // remoteOffersCh is a channel used to wait for remote credentials to proceed with the connection
remoteOffersCh chan OfferAnswer remoteOffersCh chan OfferAnswer
@ -71,7 +70,7 @@ type Handshaker struct {
remoteOfferAnswerCreated time.Time remoteOfferAnswerCreated time.Time
} }
func NewHandshaker(ctx context.Context, config ConnConfig, signaler *internal.Signaler) *Handshaker { func NewHandshaker(ctx context.Context, config ConnConfig, signaler *Signaler) *Handshaker {
return &Handshaker{ return &Handshaker{
ctx: ctx, ctx: ctx,
config: config, config: config,

9
client/internal/signaler.go → client/internal/peer/signaler.go
View File

@ -1,10 +1,9 @@
package internal package peer
import ( import (
"github.com/pion/ice/v3" "github.com/pion/ice/v3"
"golang.zx2c4.com/wireguard/wgctrl/wgtypes" "golang.zx2c4.com/wireguard/wgctrl/wgtypes"
"github.com/netbirdio/netbird/client/internal/peer"
signal "github.com/netbirdio/netbird/signal/client" signal "github.com/netbirdio/netbird/signal/client"
sProto "github.com/netbirdio/netbird/signal/proto" sProto "github.com/netbirdio/netbird/signal/proto"
) )
@ -21,11 +20,11 @@ func NewSignaler(signal signal.Client, wgPrivateKey wgtypes.Key) *Signaler {
} }
} }
func (s *Signaler) SignalOffer(offer peer.OfferAnswer, remoteKey string) error { func (s *Signaler) SignalOffer(offer OfferAnswer, remoteKey string) error {
return s.signalOfferAnswer(offer, remoteKey, sProto.Body_OFFER) return s.signalOfferAnswer(offer, remoteKey, sProto.Body_OFFER)
} }
func (s *Signaler) SignalAnswer(offer peer.OfferAnswer, remoteKey string) error { func (s *Signaler) SignalAnswer(offer OfferAnswer, remoteKey string) error {
return s.signalOfferAnswer(offer, remoteKey, sProto.Body_ANSWER) return s.signalOfferAnswer(offer, remoteKey, sProto.Body_ANSWER)
} }
@ -45,7 +44,7 @@ func (s *Signaler) Ready() bool {
} }
// SignalOfferAnswer signals either an offer or an answer to remote peer // SignalOfferAnswer signals either an offer or an answer to remote peer
func (s *Signaler) signalOfferAnswer(offerAnswer peer.OfferAnswer, remoteKey string, bodyType sProto.Body_Type) error { func (s *Signaler) signalOfferAnswer(offerAnswer OfferAnswer, remoteKey string, bodyType sProto.Body_Type) error {
msg, err := signal.MarshalCredential( msg, err := signal.MarshalCredential(
s.wgPrivateKey, s.wgPrivateKey,
offerAnswer.WgListenPort, offerAnswer.WgListenPort,