summaryrefslogtreecommitdiff
path: root/src/main.cc
diff options
context:
space:
mode:
authorJoel Klinghed <the_jk@yahoo.com>2017-07-23 01:20:04 +0200
committerJoel Klinghed <the_jk@yahoo.com>2017-07-23 01:20:04 +0200
commit4f9cb7f330beab9fb09f52421b2dbd15835476e2 (patch)
tree328517eb3aeea310d0328c08953f57ae663e8d75 /src/main.cc
parentc278eac390bd37c5ca8b319ed15605211822c08f (diff)
Add proxy to GUI
Access via "Setup..." in main menu Uses a socketpair to connect monitor so only proxy port is open
Diffstat (limited to 'src/main.cc')
-rw-r--r--src/main.cc7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/main.cc b/src/main.cc
index f9e1af6..f4f6a84 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -11,7 +11,9 @@
#include "config.hh"
#include "io.hh"
#include "logger.hh"
+#include "looper.hh"
#include "proxy.hh"
+#include "resolver.hh"
namespace {
@@ -169,13 +171,16 @@ int main(int argc, char** argv) {
}
auto foreground = config->get("foreground", false);
auto cwd = get_cwd();
+ std::unique_ptr<Looper> looper(Looper::create());
+ std::unique_ptr<Resolver> resolver(Resolver::create(looper.get()));
std::unique_ptr<Proxy> proxy(
Proxy::create(config.get(), cwd, configfile,
foreground ? "bogus" :
(logfile_from_argument ? logfile : nullptr),
foreground ? logger.get() : file_logger.get(),
accept_socket.release(),
- monitor_socket.release()));
+ monitor_socket.release(),
+ looper.get(), resolver.get()));
if (!foreground) {
if (daemon(0, 0)) {
logger->out(Logger::ERR, "Failed to fork: %s", strerror(errno));