mirror of
https://github.com/cwinfo/yggdrasil-go.git
synced 2024-12-23 12:15:39 +00:00
debug admin socket
This commit is contained in:
parent
94dd231e13
commit
6ce16d8192
@ -377,7 +377,7 @@ func (a *admin) getAuthBoxPubs() string {
|
||||
|
||||
func (a *admin) addAuthBoxPub(bstr string) (err error) {
|
||||
boxBytes, err := hex.DecodeString(bstr)
|
||||
if err != nil {
|
||||
if err == nil {
|
||||
var box boxPubKey
|
||||
copy(box[:], boxBytes)
|
||||
a.core.peers.addAuthBoxPub(&box)
|
||||
@ -387,7 +387,7 @@ func (a *admin) addAuthBoxPub(bstr string) (err error) {
|
||||
|
||||
func (a *admin) removeAuthBoxPub(bstr string) (err error) {
|
||||
boxBytes, err := hex.DecodeString(bstr)
|
||||
if err != nil {
|
||||
if err == nil {
|
||||
var box boxPubKey
|
||||
copy(box[:], boxBytes)
|
||||
a.core.peers.removeAuthBoxPub(&box)
|
||||
|
@ -44,6 +44,7 @@ func (c *Core) init(bpub *boxPubKey,
|
||||
c.log = log.New(ioutil.Discard, "", 0)
|
||||
c.boxPub, c.boxPriv = *bpub, *bpriv
|
||||
c.sigPub, c.sigPriv = *spub, *spriv
|
||||
c.admin.core = c
|
||||
c.sigs.init()
|
||||
c.searches.init(c)
|
||||
c.dht.init(c)
|
||||
|
@ -397,10 +397,11 @@ func (c *Core) DEBUG_setIfceExpr(expr *regexp.Regexp) {
|
||||
c.ifceExpr = expr
|
||||
}
|
||||
|
||||
func (c *Core) DEBUG_addAuthBoxPub(boxBytes []byte) {
|
||||
var box boxPubKey
|
||||
copy(box[:], boxBytes)
|
||||
c.peers.addAuthBoxPub(&box)
|
||||
func (c *Core) DEBUG_addAuthBoxPub(boxStr string) {
|
||||
err := c.admin.addAuthBoxPub(boxStr)
|
||||
if err != nil {
|
||||
panic(err)
|
||||
}
|
||||
}
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
|
11
yggdrasil.go
11
yggdrasil.go
@ -58,13 +58,6 @@ func (n *node) init(cfg *nodeConfig, logger *log.Logger) {
|
||||
panic(err)
|
||||
}
|
||||
n.core.DEBUG_setIfceExpr(ifceExpr)
|
||||
for _, pBoxStr := range cfg.PeerBoxPubs {
|
||||
pbox, err := hex.DecodeString(pBoxStr)
|
||||
if err != nil {
|
||||
panic(err)
|
||||
}
|
||||
n.core.DEBUG_addAuthBoxPub(pbox)
|
||||
}
|
||||
|
||||
logger.Println("Starting interface...")
|
||||
n.core.DEBUG_setupAndStartGlobalTCPInterface(cfg.Listen) // Listen for peers on TCP
|
||||
@ -73,6 +66,10 @@ func (n *node) init(cfg *nodeConfig, logger *log.Logger) {
|
||||
logger.Println("Starting admin socket...")
|
||||
n.core.DEBUG_setupAndStartAdminInterface(cfg.AdminListen)
|
||||
logger.Println("Started admin socket")
|
||||
for _, pBoxStr := range cfg.PeerBoxPubs {
|
||||
n.core.DEBUG_addAuthBoxPub(pBoxStr)
|
||||
}
|
||||
|
||||
go func() {
|
||||
if len(cfg.Peers) == 0 {
|
||||
return
|
||||
|
Loading…
Reference in New Issue
Block a user