yggdrasil-network/yggdrasil-go
1
0
Fork 0
mirror of https://github.com/yggdrasil-network/yggdrasil-go.git synced 2025-04-28 22:25:07 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

remove metric stuff, there's already enough new stuff to test, maybe revisit this in a future release

Browse source
This commit is contained in:
Arceliar 2021-05-24 18:53:54 -05:00
parent c60dd42baa
commit 8a60c605f6
6 changed files with 8 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/core/tcp.go
View file

@ -20,7 +20,6 @@ import (
"math/rand"
"net"
"net/url"
"strconv"
"strings"
"sync"
"time"
@ -172,11 +171,6 @@ func (t *tcp) reconfigure() {
}
func (t *tcp) listenURL(u *url.URL, sintf string) (*TcpListener, error) {
var metric uint8
if ms := u.Query()["metric"]; len(ms) == 1 {
m64, _ := strconv.ParseUint(ms[0], 10, 8)
metric = uint8(m64)
}
var listener *TcpListener
var err error
hostport := u.Host // Used for tcp and tls
@ -188,16 +182,16 @@ func (t *tcp) listenURL(u *url.URL, sintf string) (*TcpListener, error) {
}
switch u.Scheme {
case "tcp":
listener, err = t.listen(hostport, nil, metric)
listener, err = t.listen(hostport, nil)
case "tls":
listener, err = t.listen(hostport, t.tls.forListener, metric)
listener, err = t.listen(hostport, t.tls.forListener)
default:
t.links.core.log.Errorln("Failed to add listener: listener", u.String(), "is not correctly formatted, ignoring")
}
return listener, err
}
func (t *tcp) listen(listenaddr string, upgrade *TcpUpgrade, metric uint8) (*TcpListener, error) {
func (t *tcp) listen(listenaddr string, upgrade *TcpUpgrade) (*TcpListener, error) {
var err error
ctx := context.Background()
@ -211,7 +205,6 @@ func (t *tcp) listen(listenaddr string, upgrade *TcpUpgrade, metric uint8) (*Tcp
opts: tcpOptions{upgrade: upgrade},
stop: make(chan struct{}),
}
l.opts.metric = metric
t.waitgroup.Add(1)
go t.listener(&l, listenaddr)
return &l, nil