From ad43558fbb312e58614ca03f530ca0ace6185da9 Mon Sep 17 00:00:00 2001 From: Arceliar Date: Sat, 9 Feb 2019 15:30:17 -0600 Subject: [PATCH 1/5] fix bug in switch time --- src/yggdrasil/switch.go | 1 + 1 file changed, 1 insertion(+) diff --git a/src/yggdrasil/switch.go b/src/yggdrasil/switch.go index db39d010..9d1f870a 100644 --- a/src/yggdrasil/switch.go +++ b/src/yggdrasil/switch.go @@ -415,6 +415,7 @@ func (t *switchTable) unlockedHandleMsg(msg *switchMsg, fromPort switchPort, rep // Update the matrix of peer "faster" thresholds if reprocessing { sender.faster = oldSender.faster + sender.time = oldSender.time } else { sender.faster = make(map[switchPort]uint64, len(oldSender.faster)) for port, peer := range t.data.peers { From 0ca64b0abe4735a91f8440b45a9b4e7088cd8c98 Mon Sep 17 00:00:00 2001 From: Neil Alexander Date: Sun, 10 Feb 2019 12:13:49 +0000 Subject: [PATCH 2/5] Remove ReadTimeout configuration option --- cmd/yggdrasil/main.go | 5 +++-- src/config/config.go | 1 - src/yggdrasil/tcp.go | 6 ------ 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/cmd/yggdrasil/main.go b/cmd/yggdrasil/main.go index f67bbcef..aa5a7494 100644 --- a/cmd/yggdrasil/main.go +++ b/cmd/yggdrasil/main.go @@ -77,6 +77,7 @@ func readConfig(useconf *bool, useconffile *string, normaliseconf *bool) *nodeCo // names have changed recently. changes := map[string]string{ "Multicast": "", + "ReadTimeout": "", "LinkLocal": "MulticastInterfaces", "BoxPub": "EncryptionPublicKey", "BoxPriv": "EncryptionPrivateKey", @@ -89,11 +90,11 @@ func readConfig(useconf *bool, useconffile *string, normaliseconf *bool) *nodeCo if _, ok := dat[from]; ok { if to == "" { if !*normaliseconf { - log.Println("Warning: Deprecated config option", from, "- please remove") + log.Println("Warning: Config option", from, "is deprecated") } } else { if !*normaliseconf { - log.Println("Warning: Deprecated config option", from, "- please rename to", to) + log.Println("Warning: Config option", from, "has been renamed - please change to", to) } // If the configuration file doesn't already contain a line with the // new name then set it to the old value. This makes sure that we diff --git a/src/config/config.go b/src/config/config.go index 192b94e5..14b16490 100644 --- a/src/config/config.go +++ b/src/config/config.go @@ -16,7 +16,6 @@ type NodeConfig struct { AdminListen string `comment:"Listen address for admin connections. Default is to listen for local\nconnections either on TCP/9001 or a UNIX socket depending on your\nplatform. Use this value for yggdrasilctl -endpoint=X. To disable\nthe admin socket, use the value \"none\" instead."` Peers []string `comment:"List of connection strings for static peers in URI format, e.g.\ntcp://a.b.c.d:e or socks://a.b.c.d:e/f.g.h.i:j."` InterfacePeers map[string][]string `comment:"List of connection strings for static peers in URI format, arranged\nby source interface, e.g. { \"eth0\": [ tcp://a.b.c.d:e ] }. Note that\nSOCKS peerings will NOT be affected by this option and should go in\nthe \"Peers\" section instead."` - ReadTimeout int32 `comment:"Read timeout for connections, specified in milliseconds. If less\nthan 6000 and not negative, 6000 (the default) is used. If negative,\nreads won't time out."` AllowedEncryptionPublicKeys []string `comment:"List of peer encryption public keys to allow or incoming TCP\nconnections from. If left empty/undefined then all connections\nwill be allowed by default."` EncryptionPublicKey string `comment:"Your public encryption key. Your peers may ask you for this to put\ninto their AllowedEncryptionPublicKeys configuration."` EncryptionPrivateKey string `comment:"Your private encryption key. DO NOT share this with anyone!"` diff --git a/src/yggdrasil/tcp.go b/src/yggdrasil/tcp.go index 979bc81b..c65e2e66 100644 --- a/src/yggdrasil/tcp.go +++ b/src/yggdrasil/tcp.go @@ -36,7 +36,6 @@ type tcpInterface struct { reconfigure chan chan error serv net.Listener stop chan bool - timeout time.Duration addr string mutex sync.Mutex // Protecting the below calls map[string]struct{} @@ -106,13 +105,8 @@ func (iface *tcpInterface) listen() error { iface.core.configMutex.RLock() iface.addr = iface.core.config.Listen - iface.timeout = time.Duration(iface.core.config.ReadTimeout) * time.Millisecond iface.core.configMutex.RUnlock() - if iface.timeout >= 0 && iface.timeout < default_timeout { - iface.timeout = default_timeout - } - ctx := context.Background() lc := net.ListenConfig{ Control: iface.tcpContext, From 9f7609817e146088dd6dbf192b621808a48f4ef8 Mon Sep 17 00:00:00 2001 From: Neil Alexander Date: Sun, 10 Feb 2019 12:22:39 +0000 Subject: [PATCH 3/5] Remove yggdrasil-resume.service from systemd contrib and Debian package --- contrib/deb/generate.sh | 2 -- contrib/systemd/yggdrasil-resume.service | 10 ---------- contrib/systemd/yggdrasil.service | 1 - 3 files changed, 13 deletions(-) delete mode 100644 contrib/systemd/yggdrasil-resume.service diff --git a/contrib/deb/generate.sh b/contrib/deb/generate.sh index 6c8f955d..6879a2d8 100644 --- a/contrib/deb/generate.sh +++ b/contrib/deb/generate.sh @@ -110,12 +110,10 @@ EOF cp yggdrasil /tmp/$PKGNAME/usr/bin/ cp yggdrasilctl /tmp/$PKGNAME/usr/bin/ cp contrib/systemd/yggdrasil.service /tmp/$PKGNAME/etc/systemd/system/ -cp contrib/systemd/yggdrasil-resume.service /tmp/$PKGNAME/etc/systemd/system/ tar -czvf /tmp/$PKGNAME/data.tar.gz -C /tmp/$PKGNAME/ \ usr/bin/yggdrasil usr/bin/yggdrasilctl \ etc/systemd/system/yggdrasil.service \ - etc/systemd/system/yggdrasil-resume.service tar -czvf /tmp/$PKGNAME/control.tar.gz -C /tmp/$PKGNAME/debian . echo 2.0 > /tmp/$PKGNAME/debian-binary diff --git a/contrib/systemd/yggdrasil-resume.service b/contrib/systemd/yggdrasil-resume.service deleted file mode 100644 index c725127b..00000000 --- a/contrib/systemd/yggdrasil-resume.service +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=Restart yggdrasil on resume from sleep -After=sleep.target - -[Service] -Type=oneshot -ExecStart=/bin/systemctl restart yggdrasil - -[Install] -WantedBy=sleep.target diff --git a/contrib/systemd/yggdrasil.service b/contrib/systemd/yggdrasil.service index 1b6f1f07..6adf1ef5 100644 --- a/contrib/systemd/yggdrasil.service +++ b/contrib/systemd/yggdrasil.service @@ -18,4 +18,3 @@ Restart=always [Install] WantedBy=multi-user.target -Also=yggdrasil-resume.service From fe09c234bc89aa79befb42aa13dcb79c129e4c44 Mon Sep 17 00:00:00 2001 From: Neil Alexander Date: Sun, 10 Feb 2019 12:29:04 +0000 Subject: [PATCH 4/5] Fix Debian generate.sh --- contrib/deb/generate.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/deb/generate.sh b/contrib/deb/generate.sh index 6879a2d8..4433a9d9 100644 --- a/contrib/deb/generate.sh +++ b/contrib/deb/generate.sh @@ -113,7 +113,7 @@ cp contrib/systemd/yggdrasil.service /tmp/$PKGNAME/etc/systemd/system/ tar -czvf /tmp/$PKGNAME/data.tar.gz -C /tmp/$PKGNAME/ \ usr/bin/yggdrasil usr/bin/yggdrasilctl \ - etc/systemd/system/yggdrasil.service \ + etc/systemd/system/yggdrasil.service tar -czvf /tmp/$PKGNAME/control.tar.gz -C /tmp/$PKGNAME/debian . echo 2.0 > /tmp/$PKGNAME/debian-binary From 30320801d380d3e90b32adee53361106b4b3aa31 Mon Sep 17 00:00:00 2001 From: Neil Alexander Date: Sun, 10 Feb 2019 15:23:49 +0000 Subject: [PATCH 5/5] Don't build 32-bit builds for macOS --- .circleci/config.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 8725e443..82a68aad 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -48,14 +48,12 @@ jobs: command: | rm -f {yggdrasil,yggdrasilctl} GOOS=darwin GOARCH=amd64 ./build && mv yggdrasil /tmp/upload/$CINAME-$CIVERSION-darwin-amd64 && mv yggdrasilctl /tmp/upload/$CINAME-$CIVERSION-yggdrasilctl-darwin-amd64; - GOOS=darwin GOARCH=386 ./build && mv yggdrasil /tmp/upload/$CINAME-$CIVERSION-darwin-i386 && mv yggdrasilctl /tmp/upload/$CINAME-$CIVERSION-yggdrasilctl-darwin-i386; - run: name: Build for macOS (.pkg format) command: | rm -rf {yggdrasil,yggdrasilctl} GOOS=darwin GOARCH=amd64 ./build && PKGARCH=amd64 sh contrib/macos/create-pkg.sh && mv *.pkg /tmp/upload/ - GOOS=darwin GOARCH=386 ./build && PKGARCH=i386 sh contrib/macos/create-pkg.sh && mv *.pkg /tmp/upload/ - run: name: Build for OpenBSD