summaryrefslogtreecommitdiff
path: root/src/anytun.cpp
diff options
context:
space:
mode:
authorChristian Pointner <equinox@anytun.org>2010-02-06 16:03:13 +0000
committerChristian Pointner <equinox@anytun.org>2010-02-06 16:03:13 +0000
commit2b3a72143af34177543c8542ccd57866d78cb275 (patch)
treed05800530d3c9f0d15a44869c1cf4c0c5d9f9894 /src/anytun.cpp
parentremoved Doxygen config (diff)
removed NO_EXEC
added NOMINMAX to windows build targets
Diffstat (limited to 'src/anytun.cpp')
-rw-r--r--src/anytun.cpp7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/anytun.cpp b/src/anytun.cpp
index e70087d..384b7c3 100644
--- a/src/anytun.cpp
+++ b/src/anytun.cpp
@@ -399,14 +399,14 @@ int main(int argc, char* argv[])
TunDevice dev(gOpt.getDevName(), gOpt.getDevType(), net.net_addr, net.prefix_length);
cLog.msg(Log::PRIO_NOTICE) << "dev opened - name '" << dev.getActualName() << "', node '" << dev.getActualNode() << "'";
cLog.msg(Log::PRIO_NOTICE) << "dev type is '" << dev.getTypeString() << "'";
-#ifndef NO_EXEC
+
SysExec * postup_script = NULL;
if(gOpt.getPostUpScript() != "") {
cLog.msg(Log::PRIO_NOTICE) << "executing post-up script '" << gOpt.getPostUpScript() << "'";
StringVector args = boost::assign::list_of(dev.getActualName())(dev.getActualNode());
postup_script = new SysExec(gOpt.getPostUpScript(), args);
}
-#endif
+
#ifndef NO_DAEMON
if(gOpt.getChrootDir() != "") {
try {
@@ -423,11 +423,10 @@ int main(int argc, char* argv[])
// this has to be called before the first thread is started
gSignalController.init(service);
gResolver.init();
-#ifndef NO_EXEC
boost::thread(boost::bind(&TunDevice::waitUntilReady,&dev));
if (postup_script)
boost::thread(boost::bind(&SysExec::waitAndDestroy,postup_script));
-#endif
+
initCrypto();
PacketSource* src = new UDPPacketSource(gOpt.getLocalAddr(), gOpt.getLocalPort());