Fix ssl configuration

This commit is contained in:
Zoltán Papp
2024-07-01 11:50:18 +02:00
parent ed82ef7fe4
commit d3785dc1fa
7 changed files with 164 additions and 89 deletions
+13 -3
View File
@@ -2,6 +2,7 @@ package server
import (
"context"
"crypto/tls"
"errors"
"sync"
"time"
@@ -13,6 +14,11 @@ import (
"github.com/netbirdio/netbird/relay/server/listener/ws"
)
type Config struct {
Address string
TLSConfig *tls.Config
}
type Server struct {
relay *Relay
uDPListener listener.Listener
@@ -25,11 +31,15 @@ func NewServer() *Server {
}
}
func (r *Server) Listen(address string) error {
func (r *Server) Listen(cfg Config) error {
wg := sync.WaitGroup{}
wg.Add(2)
r.wSListener = ws.NewListener(address)
r.wSListener = &ws.Listener{
Address: cfg.Address,
TLSConfig: cfg.TLSConfig,
}
var wslErr error
go func() {
defer wg.Done()
@@ -39,7 +49,7 @@ func (r *Server) Listen(address string) error {
}
}()
r.uDPListener = udp.NewListener(address)
r.uDPListener = udp.NewListener(cfg.Address)
var udpLErr error
go func() {
defer wg.Done()