Merge pull request #3482 from ipfs/fix/daemon-routing-opt-chk

cmd/ipfs: error out on invalid routing option
ipfs · Dec 8, 2016 · e9215a6 · e9215a6
2 parents b6c1155 + 58a2c5f
commit e9215a6
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/cmd/ipfs/daemon.go b/cmd/ipfs/daemon.go
@@ -44,6 +44,7 @@ const (
 	routingOptionKwd          = "routing"
 	routingOptionSupernodeKwd = "supernode"
 	routingOptionDHTClientKwd = "dhtclient"
+	routingOptionDHTKwd       = "dht"
 	unencryptTransportKwd     = "disable-transport-encryption"
 	unrestrictedApiAccessKwd  = "unrestricted-api"
 	writableKwd               = "writable"
@@ -328,6 +329,11 @@ func daemonFunc(req cmds.Request, res cmds.Response) {
 		ncfg.Routing = corerouting.SupernodeClient(infos...)
 	case routingOptionDHTClientKwd:
 		ncfg.Routing = core.DHTClientOption
+	case routingOptionDHTKwd:
+		ncfg.Routing = core.DHTOption
+	default:
+		res.SetError(fmt.Errorf("unrecognized routing option: %s", routingOption), cmds.ErrNormal)
+		return
 	}
 
 	node, err := core.NewNode(req.Context(), ncfg)