diff options
| author | zelig <viktor.tron@gmail.com> | 2014-12-15 03:55:52 +0800 |
|---|---|---|
| committer | zelig <viktor.tron@gmail.com> | 2014-12-15 04:52:28 +0800 |
| commit | 61940b2275a8f3c77d906947b2d1126bb6c3b21d (patch) | |
| tree | 93396df91edf9bf3d6ab1e8de91abf92c1a79859 /cmd/ethereum | |
| parent | e77b720ead2e8f91f6f98664a66953c3826269c6 (diff) | |
| download | go-tangerine-61940b2275a8f3c77d906947b2d1126bb6c3b21d.tar go-tangerine-61940b2275a8f3c77d906947b2d1126bb6c3b21d.tar.gz go-tangerine-61940b2275a8f3c77d906947b2d1126bb6c3b21d.tar.bz2 go-tangerine-61940b2275a8f3c77d906947b2d1126bb6c3b21d.tar.lz go-tangerine-61940b2275a8f3c77d906947b2d1126bb6c3b21d.tar.xz go-tangerine-61940b2275a8f3c77d906947b2d1126bb6c3b21d.tar.zst go-tangerine-61940b2275a8f3c77d906947b2d1126bb6c3b21d.zip | |
adapt cmd/cli to new backend
- new flag nat for nat support UPNP|PMP
- new flag pmp for PMP gateway IP
- add NatType to utils/cmd to get p2p.NAT from nat type string
- obsolete usepnp flag
- get rid of IsUpToDate and sleep in miner start
- ethereum constructor takes nat type, port, maxpeer
- add pubkey arg to client identity
Diffstat (limited to 'cmd/ethereum')
| -rw-r--r-- | cmd/ethereum/flags.go | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/cmd/ethereum/flags.go b/cmd/ethereum/flags.go index 0bea73794..e709ecf50 100644 --- a/cmd/ethereum/flags.go +++ b/cmd/ethereum/flags.go @@ -85,8 +85,13 @@ 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") +<<<<<<< HEAD flag.StringVar(&NatType, "nat", "", "nat support (UPNP|PMP)") flag.StringVar(&PMPGateway, "gateway", "", "PMP gateway IP") +======= + flag.StringVar(&NatType, "nat", "", "NAT support (UPNP|PMP) (none)") + flag.StringVar(&PMPGateway, "pmp", "", "Gateway IP for PMP") +>>>>>>> adapt cmd/cli to new backend 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") |