Skip to content

Commit

Permalink
Merge pull request #5 from youchainhq/develop
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
Nanyan authored Jun 2, 2020
2 parents 61dc840 + 8c4d191 commit b24826b
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions cmd/utils/flags_p2p.go
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,8 @@ var (
cli.BoolFlag{Name: "p2p.localnet", Destination: &p2pLoaclNet, Usage: "The node runs on the local area network"},

cli.StringFlag{Name: "nat.type", Value: "Unknown", Destination: &defaultNatType, Usage: "NAT type, vales:Unknown|None|Full|Restricted|PortRestricted|Symmetric"},
cli.StringFlag{Name: "nat.master", Value: "27.159.122.55:45521", Usage: "NAT master server IP address and port", Destination: &natMasterAddr},
cli.StringFlag{Name: "nat.slave", Value: "27.159.122.3:45523", Usage: "NAT slave server IP address and port", Destination: &natSlaveAddr},
cli.StringFlag{Name: "nat.master", Value: "42.62.25.77:45521", Usage: "NAT master server IP address and port", Destination: &natMasterAddr},
cli.StringFlag{Name: "nat.slave", Value: "42.62.25.79:45523", Usage: "NAT slave server IP address and port", Destination: &natSlaveAddr},
cli.StringFlag{Name: "nat.pubservice", Value: "stun.ideasip.com:3478", Destination: &natPublicService, Usage: "NAT public detection service address"},
}
)
Expand All @@ -78,7 +78,7 @@ func SetP2PConfig(ctx *cli.Context, nodeConfig *node.Config) error {
natType = enode.GetNATTypeFromString(defaultNatType)
if natType == enode.NATUnknown {
logging.Info("start Nat check", "p2p port", nodeCfg.P2pPort, "discover port", nodeCfg.P2pDiscover)
natType, err = checkNatTypeLoop(nodeCfg.P2pPort, nodeCfg.P2pDiscover, true)
natType, err = checkNatTypeLoop(nodeCfg.P2pPort, nodeCfg.P2pDiscover, false)
if err != nil {
logging.Error("Nat check failed", "err", err)
return err
Expand Down
2 changes: 1 addition & 1 deletion params/client_version.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import "fmt"
const (
VersionMajor = 0 // Major version component of the current release
VersionMinor = 9 // Minor version component of the current release
VersionPatch = 7 // Patch version component of the current release
VersionPatch = 8 // Patch version component of the current release
VersionMeta = "" // Version metadata to append to the version string. Set to "" for stable release.
)

Expand Down

0 comments on commit b24826b

Please sign in to comment.