Skip to content

Commit c60fdee

Browse files
committed
1. remove peer and add peer method merge
1 parent 83bf0f8 commit c60fdee

File tree

2 files changed

+29
-3
lines changed

2 files changed

+29
-3
lines changed

src/admin/admin.go

Lines changed: 28 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,34 @@ func (a *AdminSocket) SetupAdminHandlers() {
175175
return res, nil
176176
},
177177
)
178-
178+
_ = a.AddHandler(
179+
"addPeer", "Add a peer to the peer list", []string{"uri", "interface"},
180+
func(in json.RawMessage) (interface{}, error) {
181+
req := &AddPeerRequest{}
182+
res := &AddPeerResponse{}
183+
if err := json.Unmarshal(in, &req); err != nil {
184+
return nil, err
185+
}
186+
if err := a.addPeerHandler(req, res); err != nil {
187+
return nil, err
188+
}
189+
return res, nil
190+
},
191+
)
192+
_ = a.AddHandler(
193+
"removePeer", "Remove a peer from the peer list", []string{"uri", "interface"},
194+
func(in json.RawMessage) (interface{}, error) {
195+
req := &RemovePeerRequest{}
196+
res := &RemovePeerResponse{}
197+
if err := json.Unmarshal(in, &req); err != nil {
198+
return nil, err
199+
}
200+
if err := a.removePeerHandler(req, res); err != nil {
201+
return nil, err
202+
}
203+
return res, nil
204+
},
205+
)
179206
_ = a.AddHandler("addPeers", "Add peers to this node", []string{"uri", "[interface]"}, func(in json.RawMessage) (interface{}, error) {
180207
req := &AddPeersRequest{}
181208
res := &AddPeersResponse{}

src/core/api.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ func (c *Core) AddPeer(peer string, intf string) error {
201201
return nil
202202
}
203203

204-
func (c *Core) RemovePeer(uri string, sourceInterface string) error {
204+
func (c *Core) RemovePeer(uri string, sourceInterface string) error {
205205
var err error
206206
phony.Block(c, func() {
207207
peer := Peer{uri, sourceInterface}
@@ -231,7 +231,6 @@ func (c *Core) RemovePeers() error {
231231
return nil
232232
}
233233

234-
235234
// CallPeer calls a peer once. This should be specified in the peer URI format,
236235
// e.g.:
237236
//

0 commit comments

Comments
 (0)