dynamic P2P external_address added
This commit is contained in:
parent
dae1cd484e
commit
bf5371ea8b
2 changed files with 12 additions and 4 deletions
|
|
@ -24,6 +24,7 @@ func openBadger(path string) (*badger.DB, error) {
|
||||||
|
|
||||||
func newTendermint(app abci.Application, config *cfg.Config, laddrReturner chan string) (*nm.Node, error) {
|
func newTendermint(app abci.Application, config *cfg.Config, laddrReturner chan string) (*nm.Node, error) {
|
||||||
config.P2P.ListenAddress = "tcp://" + <-laddrReturner
|
config.P2P.ListenAddress = "tcp://" + <-laddrReturner
|
||||||
|
config.P2P.ExternalAddress = <-laddrReturner
|
||||||
config.P2P.PersistentPeers = <-laddrReturner
|
config.P2P.PersistentPeers = <-laddrReturner
|
||||||
|
|
||||||
var pv tmTypes.PrivValidator
|
var pv tmTypes.PrivValidator
|
||||||
|
|
|
||||||
|
|
@ -62,7 +62,7 @@ func Yggdrasil(config *viper.Viper, ch chan string) {
|
||||||
parsed, err := ParseEntries(peers)
|
parsed, err := ParseEntries(peers)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
parsed = []ParsedEntry{}
|
parsed = []ParsedEntry{}
|
||||||
ch <- ""
|
// ch <- ""
|
||||||
log.Warnln("Warning: persistent peers has an error")
|
log.Warnln("Warning: persistent peers has an error")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -141,11 +141,18 @@ func Yggdrasil(config *viper.Viper, ch chan string) {
|
||||||
panic(err)
|
panic(err)
|
||||||
}
|
}
|
||||||
address, subnet := n.core.Address(), n.core.Subnet()
|
address, subnet := n.core.Address(), n.core.Subnet()
|
||||||
publicstr := hex.EncodeToString(n.core.PublicKey())
|
yggPort := 26656
|
||||||
logger.Printf("Your public key is %s", publicstr)
|
if len(remoteTcp) > 0 && remoteTcp[0].Listen.Port != 0 {
|
||||||
|
yggPort = remoteTcp[0].Listen.Port
|
||||||
|
}
|
||||||
|
ipStr := address.String() // ожидается чистый IPv6 без /префикса
|
||||||
|
yggExternal := fmt.Sprintf("[%s]:%d", ipStr, yggPort)
|
||||||
|
ch <- yggExternal
|
||||||
|
|
||||||
|
//logger.Printf("Your public key is %s", publicstr)
|
||||||
logger.Printf("Your IPv6 address is %s", address.String())
|
logger.Printf("Your IPv6 address is %s", address.String())
|
||||||
logger.Printf("Your IPv6 subnet is %s", subnet.String())
|
logger.Printf("Your IPv6 subnet is %s", subnet.String())
|
||||||
logger.Printf("Your Yggstack resolver name is %s%s", publicstr, types.NameMappingSuffix)
|
//logger.Printf("Your Yggstack resolver name is %s%s", publicstr, types.NameMappingSuffix)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Setup the admin socket.
|
// Setup the admin socket.
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue