5
0
mirror of https://github.com/cwinfo/yggdrasil-go.git synced 2024-11-10 05:10:26 +00:00

Add getTunTap to JSON admin socket

This commit is contained in:
Neil Alexander 2018-05-20 19:42:37 +01:00
parent c3ca5c64b1
commit 4ecc7ce860
No known key found for this signature in database
GPG Key ID: A02A2019A2BB0944

View File

@ -2,8 +2,6 @@ package yggdrasil
import "net"
import "os"
// import "bytes"
import "encoding/hex"
import "encoding/json"
import "errors"
@ -15,7 +13,6 @@ import "strconv"
import "sync/atomic"
import "time"
// TODO? Make all of this JSON
// TODO: Add authentication
type admin struct {
@ -133,25 +130,20 @@ func (a *admin) init(c *Core, listenaddr string) {
}, errors.New("Failed to remove peer")
}
})
/*
a.addHandler("getTunTap", nil, func(out *[]byte, _ ...string) {
var info admin_nodeInfo
defer func() {
if r := recover(); r != nil {
info = admin_nodeInfo{
{"Interface name", "none"},
}
*out = []byte(a.printInfos([]admin_nodeInfo{info}))
}
}()
a.addHandler("getTunTap", nil, func(in admin_info) (r admin_info, e error) {
defer func() {
recover()
r = admin_info{"name": "none"}
e = nil
}()
info = admin_nodeInfo{
{"Interface name", a.core.tun.iface.Name()},
{"TAP mode", strconv.FormatBool(a.core.tun.iface.IsTAP())},
{"mtu", strconv.Itoa(a.core.tun.mtu)},
}
*out = []byte(a.printInfos([]admin_nodeInfo{info}))
})
return admin_info{
"name": a.core.tun.iface.Name(),
"tap_mode": a.core.tun.iface.IsTAP(),
"mtu": a.core.tun.mtu,
}, nil
})
/*
a.addHandler("setTunTap", []string{"<ifname|auto|none>", "[<tun|tap>]", "[<mtu>]"}, func(out *[]byte, ifparams ...string) {
// Set sane defaults
iftapmode := false
@ -184,6 +176,8 @@ func (a *admin) init(c *Core, listenaddr string) {
*out = []byte(a.printInfos([]admin_nodeInfo{info}))
}
})
*/
/*
a.addHandler("getAllowedBoxPubs", nil, func(out *[]byte, _ ...string) {
*out = []byte(a.getAllowedBoxPubs())
})