add web socket ui

This commit is contained in:
Jeff Becker 2016-10-20 09:12:15 -04:00
parent 3d4e2a275c
commit b4e9ed7d18
15 changed files with 322 additions and 9 deletions

View file

@ -176,9 +176,21 @@ namespace config {
trust.add_options()
("trust.enabled", value<bool>()->default_value(false), "Enable explicit trust options")
("trust.family", value<std::string>()->default_value(""), "Router Familiy to trust for first hops")
<<<<<<< HEAD
("trust.routers", value<std::string>()->default_value(""), "Only Connect to these routers")
("trust.hidden", value<bool>()->default_value(false), "Should we hide our router from other routers?");
=======
("trust.routerInfo", value<std::string>()->default_value(""), "Path to routerInfo of floodfill to use with floodfill friend mode")
("trust.hidden", value<bool>()->default_value(true), "should we hide our router from other routers?");
options_description websocket("Websocket Options");
websocket.add_options()
("websockets.enabled", value<bool>()->default_value(false), "enable websocket server")
("websockets.address", value<std::string>()->default_value("127.0.0.1"), "address to bind websocket server on")
("websockets.port", value<uint16_t>()->default_value(7666), "port to bind websocket server on");
>>>>>>> bda4170... add web socket ui
m_OptionsDesc
.add(general)
.add(limits)
@ -193,7 +205,8 @@ namespace config {
.add(precomputation)
.add(reseed)
.add(addressbook)
.add(trust)
.add(trust)
.add(websocket)
;
}