diff options
| author | zelig <viktor.tron@gmail.com> | 2014-12-15 04:57:29 +0800 |
|---|---|---|
| committer | zelig <viktor.tron@gmail.com> | 2014-12-15 04:57:29 +0800 |
| commit | 72290f67fee2be183981c9672d830040466187bd (patch) | |
| tree | a98e9720b169aec5484472945726a326d4b75631 /cmd | |
| parent | 4c89d5331f41fa93e6840893c6727b05eabe5f99 (diff) | |
| download | dexon-72290f67fee2be183981c9672d830040466187bd.tar dexon-72290f67fee2be183981c9672d830040466187bd.tar.gz dexon-72290f67fee2be183981c9672d830040466187bd.tar.bz2 dexon-72290f67fee2be183981c9672d830040466187bd.tar.lz dexon-72290f67fee2be183981c9672d830040466187bd.tar.xz dexon-72290f67fee2be183981c9672d830040466187bd.tar.zst dexon-72290f67fee2be183981c9672d830040466187bd.zip | |
resolve merge conflict hell
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/ethereum/flags.go | 5 | ||||
| -rw-r--r-- | cmd/utils/cmd.go | 11 |
2 files changed, 1 insertions, 15 deletions
diff --git a/cmd/ethereum/flags.go b/cmd/ethereum/flags.go index e709ecf50..556735491 100644 --- a/cmd/ethereum/flags.go +++ b/cmd/ethereum/flags.go @@ -85,13 +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") -<<<<<<< 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 867ef5e37..3e3ac617a 100644 --- a/cmd/utils/cmd.go +++ b/cmd/utils/cmd.go @@ -154,22 +154,13 @@ 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 + clilogger.Fatalf("cannot resolve PMP gateway IP %s", gateway) } 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 } |