Add config field and node info filed for direct RPC server

leventeliu · leventeliu · commit 44eea627e155 · 2019-04-04T20:51:12.000+08:00
diff --git a/conf/config.go b/conf/config.go
@@ -112,13 +112,14 @@ type Config struct {
 	StartupSyncHoles bool `yaml:"StartupSyncHoles,omitempty"`
 	GenerateKeyPair  bool `yaml:"-"`
 	//TODO(auxten): set yaml key for config
-	WorkingRoot     string            `yaml:"WorkingRoot"`
-	PubKeyStoreFile string            `yaml:"PubKeyStoreFile"`
-	PrivateKeyFile  string            `yaml:"PrivateKeyFile"`
-	DHTFileName     string            `yaml:"DHTFileName"`
-	ListenAddr      string            `yaml:"ListenAddr"`
-	ThisNodeID      proto.NodeID      `yaml:"ThisNodeID"`
-	ValidDNSKeys    map[string]string `yaml:"ValidDNSKeys"` // map[DNSKEY]domain
+	WorkingRoot      string            `yaml:"WorkingRoot"`
+	PubKeyStoreFile  string            `yaml:"PubKeyStoreFile"`
+	PrivateKeyFile   string            `yaml:"PrivateKeyFile"`
+	DHTFileName      string            `yaml:"DHTFileName"`
+	ListenAddr       string            `yaml:"ListenAddr"`
+	ListenDirectAddr string            `yaml:"ListenDirectAddr",omitempty`
+	ThisNodeID       proto.NodeID      `yaml:"ThisNodeID"`
+	ValidDNSKeys     map[string]string `yaml:"ValidDNSKeys"` // map[DNSKEY]domain
 	// Check By BP DHT.Ping
 	MinNodeIDDifficulty int `yaml:"MinNodeIDDifficulty"`
 
diff --git a/proto/nodeinfo.go b/proto/nodeinfo.go
@@ -111,11 +111,12 @@ func (k *NodeKey) Less(y *NodeKey) bool {
 
 // Node is all node info struct.
 type Node struct {
-	ID        NodeID                `yaml:"ID"`
-	Role      ServerRole            `yaml:"Role"`
-	Addr      string                `yaml:"Addr"`
-	PublicKey *asymmetric.PublicKey `yaml:"PublicKey"`
-	Nonce     mine.Uint256          `yaml:"Nonce"`
+	ID         NodeID                `yaml:"ID"`
+	Role       ServerRole            `yaml:"Role"`
+	Addr       string                `yaml:"Addr"`
+	DirectAddr string                `yaml:"DirectAddr",omitempty`
+	PublicKey  *asymmetric.PublicKey `yaml:"PublicKey"`
+	Nonce      mine.Uint256          `yaml:"Nonce"`
 }
 
 // NewNode just return a new node struct.
diff --git a/proto/nodeinfo_gen.go b/proto/nodeinfo_gen.go
