* add websocks

* enable socks, websocks and httpproxy as client tunnels

* remove old websocks config
This commit is contained in:
Jeff Becker 2017-01-07 08:32:50 -05:00
parent 43c1a87c48
commit c5d3c0c6f8
8 changed files with 408 additions and 341 deletions

View file

@ -203,12 +203,6 @@ namespace config {
("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");
options_description websocks("WebSOCKS options");
websocks.add_options()
("websocks.enabled", value<bool>()->default_value(false), "enable WebSOCKS server")
("websocks.address", value<std::string>()->default_value("127.0.0.1"), "address to bind WebSOCKS server on")
("websocks.port", value<uint16_t>()->default_value(7666), "port to bind WebSOCKS server on");
m_OptionsDesc
.add(general)
.add(limits)
@ -225,7 +219,6 @@ namespace config {
.add(addressbook)
.add(trust)
.add(websocket)
.add(websocks)
;
}