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

Merge branch 'develop' into master

Browse source
This commit is contained in:
Neil Alexander 2020-09-27 13:29:23 +01:00 • committed by GitHub
commit 91c82c83c0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
15 changed files with 247 additions and 94 deletions
Download patch file Download diff file Expand all files Collapse all files

31
src/admin/admin.go
View file

@ -188,17 +188,44 @@ func (a *AdminSocket) SetupAdminHandlers(na *AdminSocket) {
},
}, errors.New("Failed to add peer")
})
a.AddHandler("removePeer", []string{"port"}, func(in Info) (Info, error) {
a.AddHandler("disconnectPeer", []string{"port"}, func(in Info) (Info, error) {
port, err := strconv.ParseInt(fmt.Sprint(in["port"]), 10, 64)
if err != nil {
return Info{}, err
}
if a.core.DisconnectPeer(uint64(port)) == nil {
return Info{
"removed": []string{
"disconnected": []string{
fmt.Sprint(port),
},
}, nil
} else {
return Info{
"not_disconnected": []string{
fmt.Sprint(port),
},
}, errors.New("Failed to disconnect peer")
}
})
a.AddHandler("removePeer", []string{"uri", "[interface]"}, func(in Info) (Info, error) {
// Set sane defaults
intf := ""
// Has interface been specified?
if itf, ok := in["interface"]; ok {
intf = itf.(string)
}
if a.core.RemovePeer(in["uri"].(string), intf) == nil {
return Info{
"removed": []string{
in["uri"].(string),
},
}, nil
} else {
return Info{
"not_removed": []string{
in["uri"].(string),
},
}, errors.New("Failed to remove peer")
}
return Info{
"not_removed": []string{