aboutsummaryrefslogtreecommitdiffstats
path: root/cmd
diff options
context:
space:
mode:
authorzelig <viktor.tron@gmail.com>2014-12-15 03:55:52 +0800
committerzelig <viktor.tron@gmail.com>2014-12-15 04:52:28 +0800
commit61940b2275a8f3c77d906947b2d1126bb6c3b21d (patch)
tree93396df91edf9bf3d6ab1e8de91abf92c1a79859 /cmd
parente77b720ead2e8f91f6f98664a66953c3826269c6 (diff)
downloadgo-tangerine-61940b2275a8f3c77d906947b2d1126bb6c3b21d.tar.gz
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')
-rw-r--r--cmd/ethereum/flags.go5
-rw-r--r--cmd/utils/cmd.go9
2 files changed, 14 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")
diff --git a/cmd/utils/cmd.go b/cmd/utils/cmd.go
index 24d5970bd..867ef5e37 100644
--- a/cmd/utils/cmd.go
+++ b/cmd/utils/cmd.go
@@ -154,13 +154,22 @@ func NatType(natType string, gateway string) (nat p2p.NAT) {
nat = p2p.UPNP()
case "PMP":
ip := net.ParseIP(gateway)
+<<<<<<< HEAD
if ip != nil {
clilogger.Fatalf("bad PMP gateway '%s'", gateway)
+=======
+ if ip == nil {
+ clilogger.Fatalln("cannot resolve PMP gateway IP %s", gateway)
+>>>>>>> adapt cmd/cli to new backend
}
nat = p2p.PMP(ip)
case "":
default:
+<<<<<<< HEAD
clilogger.Fatalf("unrecognised NAT type '%s'", natType)
+=======
+ clilogger.Fatalln("unrecognised NAT type %s", natType)
+>>>>>>> adapt cmd/cli to new backend
}
return
}