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

Merge branch 'develop' into multilink

Browse source
This commit is contained in:
Neil Alexander 2019-03-05 22:07:20 +00:00
commit 19267beb9e
No known key found for this signature in database
GPG key ID: A02A2019A2BB0944
1 changed files with 21 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/yggdrasil/admin.go
View file

@ -173,9 +173,10 @@ func (a *admin) init(c *Core) {
}) })
a.addHandler("getTunTap", []string{}, func(in admin_info) (r admin_info, e error) { a.addHandler("getTunTap", []string{}, func(in admin_info) (r admin_info, e error) {
defer func() { defer func() {
recover() if err := recover(); err != nil {
r = admin_info{"none": admin_info{}} r = admin_info{"none": admin_info{}}
e = nil e = nil
}
}() }()
return admin_info{ return admin_info{
@ -251,6 +252,23 @@ func (a *admin) init(c *Core) {
}, errors.New("Failed to remove allowed key") }, errors.New("Failed to remove allowed key")
} }
}) })
a.addHandler("getTunnelRouting", []string{}, func(in admin_info) (admin_info, error) {
enabled := false
a.core.router.doAdmin(func() {
enabled = a.core.router.cryptokey.isEnabled()
})
return admin_info{"enabled": enabled}, nil
})
a.addHandler("setTunnelRouting", []string{"enabled"}, func(in admin_info) (admin_info, error) {
enabled := false
if e, ok := in["enabled"].(bool); ok {
enabled = e
}
a.core.router.doAdmin(func() {
a.core.router.cryptokey.setEnabled(enabled)
})
return admin_info{"enabled": enabled}, nil
})
a.addHandler("addSourceSubnet", []string{"subnet"}, func(in admin_info) (admin_info, error) { a.addHandler("addSourceSubnet", []string{"subnet"}, func(in admin_info) (admin_info, error) {
var err error var err error
a.core.router.doAdmin(func() { a.core.router.doAdmin(func() {