mirror of
https://github.com/netbirdio/netbird.git
synced 2024-10-05 09:42:09 +02:00
0c039274a4
This update adds new relay integration for NetBird clients. The new relay is based on web sockets and listens on a single port. - Adds new relay implementation with websocket with single port relaying mechanism - refactor peer connection logic, allowing upgrade and downgrade from/to P2P connection - peer connections are faster since it connects first to relay and then upgrades to P2P - maintains compatibility with old clients by not using the new relay - updates infrastructure scripts with new relay service
92 lines
1.8 KiB
Go
92 lines
1.8 KiB
Go
//go:build linux || darwin
|
|
|
|
package main
|
|
|
|
import (
|
|
"bytes"
|
|
"encoding/json"
|
|
"net/http"
|
|
|
|
log "github.com/sirupsen/logrus"
|
|
)
|
|
|
|
type PeerAddr struct {
|
|
Address []string
|
|
}
|
|
|
|
type ClientPeerAddr struct {
|
|
Address map[string]string
|
|
}
|
|
|
|
type Signal struct {
|
|
AddressesChan chan []string
|
|
ClientAddressChan chan map[string]string
|
|
}
|
|
|
|
func NewSignalService() *Signal {
|
|
return &Signal{
|
|
AddressesChan: make(chan []string),
|
|
ClientAddressChan: make(chan map[string]string),
|
|
}
|
|
}
|
|
|
|
func (rs *Signal) Listen(listenAddr string) error {
|
|
http.HandleFunc("/", rs.onNewAddresses)
|
|
return http.ListenAndServe(listenAddr, nil)
|
|
}
|
|
|
|
func (rs *Signal) onNewAddresses(w http.ResponseWriter, r *http.Request) {
|
|
var msg PeerAddr
|
|
err := json.NewDecoder(r.Body).Decode(&msg)
|
|
if err != nil {
|
|
log.Errorf("Error decoding message: %v", err)
|
|
}
|
|
|
|
log.Infof("received addresses: %d", len(msg.Address))
|
|
rs.AddressesChan <- msg.Address
|
|
clientAddresses := <-rs.ClientAddressChan
|
|
|
|
respMsg := ClientPeerAddr{
|
|
Address: clientAddresses,
|
|
}
|
|
data, err := json.Marshal(respMsg)
|
|
if err != nil {
|
|
log.Errorf("Error marshalling message: %v", err)
|
|
return
|
|
}
|
|
|
|
_, err = w.Write(data)
|
|
if err != nil {
|
|
log.Errorf("Error writing response: %v", err)
|
|
}
|
|
}
|
|
|
|
type SignalClient struct {
|
|
SignalURL string
|
|
}
|
|
|
|
func (ss SignalClient) SendAddress(addresses []string) (*ClientPeerAddr, error) {
|
|
msg := PeerAddr{
|
|
Address: addresses,
|
|
}
|
|
data, err := json.Marshal(msg)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
response, err := http.Post(ss.SignalURL, "application/json", bytes.NewBuffer(data))
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
defer response.Body.Close()
|
|
|
|
log.Debugf("wait for signal response")
|
|
var respPeerAddress ClientPeerAddr
|
|
err = json.NewDecoder(response.Body).Decode(&respPeerAddress)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
return &respPeerAddress, nil
|
|
}
|