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

Resolve merge conflict with platformdefaults

Browse source
This commit is contained in:
Neil Alexander 2018-07-07 20:08:23 +01:00
commit b24c7ffa6b
No known key found for this signature in database
GPG key ID: A02A2019A2BB0944
21 changed files with 170 additions and 106 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/yggdrasil/admin.go
View file

@ -13,6 +13,8 @@ import (
"strings"
"sync/atomic"
"time"
"yggdrasil/defaults"
)
// TODO: Add authentication
@ -156,15 +158,15 @@ func (a *admin) init(c *Core, listenaddr string) {
})
a.addHandler("setTunTap", []string{"name", "[tap_mode]", "[mtu]"}, func(in admin_info) (admin_info, error) {
// Set sane defaults
iftapmode := getDefaults().defaultIfTAPMode
ifmtu := getDefaults().defaultIfMTU
iftapmode := defaults.GetDefaults().DefaultIfTAPMode
ifmtu := defaults.GetDefaults().DefaultIfMTU
// Has TAP mode been specified?
if tap, ok := in["tap_mode"]; ok {
iftapmode = tap.(bool)
}
// Check we have enough params for MTU
if mtu, ok := in["mtu"]; ok {
if mtu.(float64) >= 1280 && ifmtu <= getDefaults().maximumIfMTU {
if mtu.(float64) >= 1280 && ifmtu <= defaults.GetDefaults().MaximumIfMTU {
ifmtu = int(in["mtu"].(float64))
}
}