sendnrw/netbird
2
0
Fork 0
mirror of https://github.com/netbirdio/netbird.git synced 2026-10-20 12:29:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add exposed address

Browse Source
This commit is contained in:
Zoltan Papp
2024-07-02 11:57:17 +02:00
parent d3785dc1fa
commit 15a7b7629b
15 changed files with 154 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/internal/peer/conn.go
+2 -2
View File
@@ -606,9 +606,9 @@ func (conn *Conn) doHandshake() error {
err error
)
ha.IceUFrag, ha.IcePwd = conn.workerICE.GetLocalUserCredentials()
addr, err := conn.workerRelay.RelayAddress()
addr, err := conn.workerRelay.RelayInstanceAddress()
if err == nil {
ha.RelayAddr = addr.String()
ha.RelayAddr = addr
}
conn.log.Tracef("send new offer: %#v", ha)
return conn.handshaker.SendOffer(ha)
client/internal/peer/worker_relay.go
+4 -4
View File
@@ -46,13 +46,13 @@ func (w *WorkerRelay) OnNewOffer(remoteOfferAnswer *OfferAnswer) {
}
// the relayManager will return with error in case if the connection has lost with relay server
currentRelayAddress, err := w.relayManager.RelayAddress()
currentRelayAddress, err := w.relayManager.RelayInstanceAddress()
if err != nil {
w.log.Infof("local Relay connection is lost, skipping connection attempt")
return
}
srv := w.preferredRelayServer(currentRelayAddress.String(), remoteOfferAnswer.RelaySrvAddress)
srv := w.preferredRelayServer(currentRelayAddress, remoteOfferAnswer.RelaySrvAddress)
relayedConn, err := w.relayManager.OpenConn(srv, w.config.Key, w.conn.OnDisconnected)
if err != nil {
@@ -73,8 +73,8 @@ func (w *WorkerRelay) OnNewOffer(remoteOfferAnswer *OfferAnswer) {
})
}
func (w *WorkerRelay) RelayAddress() (net.Addr, error) {
return w.relayManager.RelayAddress()
func (w *WorkerRelay) RelayInstanceAddress() (string, error) {
return w.relayManager.RelayInstanceAddress()
}
func (w *WorkerRelay) IsController() bool {