aboutsummaryrefslogtreecommitdiffstats
path: root/cmd/utils/cmd.go
diff options
context:
space:
mode:
Diffstat (limited to 'cmd/utils/cmd.go')
-rw-r--r--cmd/utils/cmd.go9
1 files changed, 9 insertions, 0 deletions
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
}