From 2b3a72143af34177543c8542ccd57866d78cb275 Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Sat, 6 Feb 2010 16:03:13 +0000 Subject: removed NO_EXEC added NOMINMAX to windows build targets --- src/anytun.cpp | 7 +++---- src/anytun.vcproj | 34 +++++++++++++++++----------------- src/bsd/tunDevice.cpp | 2 -- src/linux/tunDevice.cpp | 2 -- src/options.cpp | 4 ---- src/sysExec.h | 3 --- 6 files changed, 20 insertions(+), 32 deletions(-) (limited to 'src') 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()); diff --git a/src/anytun.vcproj b/src/anytun.vcproj index 337c9f7..fea7ffa 100644 --- a/src/anytun.vcproj +++ b/src/anytun.vcproj @@ -1,4 +1,4 @@ - + device name" << std::endl; std::cout << " [-t|--type] device type" << std::endl; std::cout << " [-n|--ifconfig] / the local address for the tun/tap device and the used prefix length" << std::endl; - #ifndef NO_EXEC std::cout << " [-x|--post-up-script]