mirror of
https://github.com/cwinfo/yggdrasil-go.git
synced 2024-11-22 10:40:27 +00:00
use TLS for multicast peers, fix TLS listener type in log output
This commit is contained in:
parent
5564de94ba
commit
b7f57c0617
@ -185,17 +185,21 @@ func (t *tcp) listener(l *TcpListener, listenaddr string) {
|
|||||||
l.Listener.Close()
|
l.Listener.Close()
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
callproto := "TCP"
|
||||||
|
if l.opts.upgrade != nil {
|
||||||
|
callproto = strings.ToUpper(l.opts.upgrade.name)
|
||||||
|
}
|
||||||
t.listeners[listenaddr] = l
|
t.listeners[listenaddr] = l
|
||||||
t.mutex.Unlock()
|
t.mutex.Unlock()
|
||||||
// And here we go!
|
// And here we go!
|
||||||
defer func() {
|
defer func() {
|
||||||
t.links.core.log.Infoln("Stopping TCP listener on:", l.Listener.Addr().String())
|
t.links.core.log.Infoln("Stopping", callproto, "listener on:", l.Listener.Addr().String())
|
||||||
l.Listener.Close()
|
l.Listener.Close()
|
||||||
t.mutex.Lock()
|
t.mutex.Lock()
|
||||||
delete(t.listeners, listenaddr)
|
delete(t.listeners, listenaddr)
|
||||||
t.mutex.Unlock()
|
t.mutex.Unlock()
|
||||||
}()
|
}()
|
||||||
t.links.core.log.Infoln("Listening for TCP on:", l.Listener.Addr().String())
|
t.links.core.log.Infoln("Listening for", callproto, "on:", l.Listener.Addr().String())
|
||||||
go func() {
|
go func() {
|
||||||
<-l.stop
|
<-l.stop
|
||||||
l.Listener.Close()
|
l.Listener.Close()
|
||||||
|
@ -277,7 +277,7 @@ func (m *Multicast) _announce() {
|
|||||||
var info *listenerInfo
|
var info *listenerInfo
|
||||||
if nfo, ok := m.listeners[iface.Name]; !ok || nfo.listener.Listener == nil {
|
if nfo, ok := m.listeners[iface.Name]; !ok || nfo.listener.Listener == nil {
|
||||||
// No listener was found - let's create one
|
// No listener was found - let's create one
|
||||||
urlString := fmt.Sprintf("tcp://[%s]:%d", addrIP, m.listenPort)
|
urlString := fmt.Sprintf("tls://[%s]:%d", addrIP, m.listenPort)
|
||||||
u, err := url.Parse(urlString)
|
u, err := url.Parse(urlString)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
panic(err)
|
panic(err)
|
||||||
@ -370,7 +370,7 @@ func (m *Multicast) listen() {
|
|||||||
if _, ok := interfaces[from.Zone]; ok {
|
if _, ok := interfaces[from.Zone]; ok {
|
||||||
addr.Zone = ""
|
addr.Zone = ""
|
||||||
pin := fmt.Sprintf("/?key=%s", hex.EncodeToString(key))
|
pin := fmt.Sprintf("/?key=%s", hex.EncodeToString(key))
|
||||||
u, err := url.Parse("tcp://" + addr.String() + pin)
|
u, err := url.Parse("tls://" + addr.String() + pin)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
m.log.Debugln("Call from multicast failed, parse error:", addr.String(), err)
|
m.log.Debugln("Call from multicast failed, parse error:", addr.String(), err)
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user