Friendly formats for getDHT, getSessions, setTunTap etc

This commit is contained in:
Neil Alexander 2018-05-21 14:14:57 +01:00
parent 201701ae4a
commit ca3e541d3b
No known key found for this signature in database
GPG key ID: A02A2019A2BB0944
2 changed files with 25 additions and 17 deletions

View file

@ -46,7 +46,7 @@ func (a *admin) init(c *Core, listenaddr string) {
a.addHandler("help", nil, func(in admin_info) (admin_info, error) {
handlers := make(map[string]interface{})
for _, handler := range a.handlers {
handlers[handler.name] = admin_info{ "fields": handler.args }
handlers[handler.name] = admin_info{"fields": handler.args}
}
return admin_info{"help": handlers}, nil
})
@ -57,7 +57,7 @@ func (a *admin) init(c *Core, listenaddr string) {
self := a.getData_getSelf().asMap()
ip := fmt.Sprint(self["ip"])
delete(self, "ip")
return admin_info{"self": admin_info{ ip: self }}, nil
return admin_info{"self": admin_info{ip: self}}, nil
})
a.addHandler("getPeers", []string{}, func(in admin_info) (admin_info, error) {
sort := "ip"
@ -136,7 +136,7 @@ func (a *admin) init(c *Core, listenaddr string) {
a.addHandler("getTunTap", []string{}, func(in admin_info) (r admin_info, e error) {
defer func() {
recover()
r = admin_info{ "tuntap": admin_info{ "none": admin_info{ } } }
r = admin_info{"none": admin_info{}}
e = nil
}()
@ -278,7 +278,7 @@ func (a *admin) handleRequest(conn net.Conn) {
if _, ok := recv[arg]; !ok {
send = admin_info{
"status": "error",
"error": "Expected field missing",
"error": "Expected field missing: " + arg,
"expecting": arg,
}
break handlers