diff options
| author | zelig <viktor.tron@gmail.com> | 2014-12-15 02:29:05 +0800 |
|---|---|---|
| committer | zelig <viktor.tron@gmail.com> | 2014-12-15 04:30:56 +0800 |
| commit | d9b16c1197f607a52ad62c71425b690bee973c3f (patch) | |
| tree | a49f437ad21c316889107544bb4e97b1a3c3b476 | |
| parent | ae7c1e3e55610cc28bb4f79ede5660dd89c019c5 (diff) | |
| download | go-tangerine-d9b16c1197f607a52ad62c71425b690bee973c3f.tar go-tangerine-d9b16c1197f607a52ad62c71425b690bee973c3f.tar.gz go-tangerine-d9b16c1197f607a52ad62c71425b690bee973c3f.tar.bz2 go-tangerine-d9b16c1197f607a52ad62c71425b690bee973c3f.tar.lz go-tangerine-d9b16c1197f607a52ad62c71425b690bee973c3f.tar.xz go-tangerine-d9b16c1197f607a52ad62c71425b690bee973c3f.tar.zst go-tangerine-d9b16c1197f607a52ad62c71425b690bee973c3f.zip | |
new cli options
- nat UPNP|PMP
- gateway for PMP NAT
- obsolete usepnp
- add pubkey to client identity
| -rw-r--r-- | cmd/ethereum/flags.go | 6 | ||||
| -rw-r--r-- | cmd/ethereum/main.go | 4 |
2 files changed, 6 insertions, 4 deletions
diff --git a/cmd/ethereum/flags.go b/cmd/ethereum/flags.go index 783944cf2..0bea73794 100644 --- a/cmd/ethereum/flags.go +++ b/cmd/ethereum/flags.go @@ -38,7 +38,8 @@ var ( StartRpc bool StartWebSockets bool RpcPort int - UseUPnP bool + NatType string + PMPGateway string OutboundPort string ShowGenesis bool AddPeer string @@ -84,7 +85,8 @@ func Init() { flag.StringVar(&KeyRing, "keyring", "", "identifier for keyring to use") flag.StringVar(&KeyStore, "keystore", "db", "system to store keyrings: db|file (db)") flag.StringVar(&OutboundPort, "port", "30303", "listening port") - flag.BoolVar(&UseUPnP, "upnp", false, "enable UPnP support") + flag.StringVar(&NatType, "nat", "", "nat support (UPNP|PMP)") + flag.StringVar(&PMPGateway, "gateway", "", "PMP gateway IP") flag.IntVar(&MaxPeer, "maxpeer", 10, "maximum desired peers") flag.IntVar(&RpcPort, "rpcport", 8080, "port to start json-rpc server on") flag.BoolVar(&StartRpc, "rpc", false, "start rpc server") diff --git a/cmd/ethereum/main.go b/cmd/ethereum/main.go index 43551fb3a..4f87ef17b 100644 --- a/cmd/ethereum/main.go +++ b/cmd/ethereum/main.go @@ -69,9 +69,9 @@ func main() { // create, import, export keys utils.KeyTasks(keyManager, KeyRing, GenAddr, SecretFile, ExportDir, NonInteractive) - clientIdentity := utils.NewClientIdentity(ClientIdentifier, Version, Identifier) + clientIdentity := utils.NewClientIdentity(ClientIdentifier, Version, Identifier, string(keyManager.PublicKey())) - ethereum := utils.NewEthereum(db, clientIdentity, keyManager, UseUPnP, OutboundPort, MaxPeer) + ethereum := utils.NewEthereum(db, clientIdentity, keyManager, utils.NatType(NatType, PMPGateway), OutboundPort, MaxPeer) if Dump { var block *types.Block |