X-Git-Url: https://git.syn-net.org/debian/?a=blobdiff_plain;f=src%2FsysExec.cpp;h=62c2d22bc9fb3df81dd8aba802282d37e9543ac7;hb=326bc57905738d0bd416ce3d0d7cc79b14ef7a4a;hp=49c0cae58457d364026ded9290f6e8c337803cb4;hpb=bb834fe0ed7a38b724f49b944adb801634eb6194;p=anytun.git diff --git a/src/sysExec.cpp b/src/sysExec.cpp index 49c0cae..62c2d22 100644 --- a/src/sysExec.cpp +++ b/src/sysExec.cpp @@ -6,12 +6,12 @@ * tunnel endpoints. It has less protocol overhead than IPSec in Tunnel * mode and allows tunneling of every ETHER TYPE protocol (e.g. * ethernet, ip, arp ...). satp directly includes cryptography and - * message authentication based on the methodes used by SRTP. It is + * message authentication based on the methods used by SRTP. It is * intended to deliver a generic, scaleable and secure solution for * tunneling and relaying of packets of any protocol. * * - * Copyright (C) 2007-2009 Othmar Gsenger, Erwin Nindl, + * Copyright (C) 2007-2014 Markus Grüneis, Othmar Gsenger, Erwin Nindl, * Christian Pointner * * This file is part of Anytun. @@ -27,7 +27,20 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with anytun. If not, see . + * along with Anytun. If not, see . + * + * In addition, as a special exception, the copyright holders give + * permission to link the code of portions of this program with the + * OpenSSL library under certain conditions as described in each + * individual source file, and distribute linked combinations + * including the two. + * You must obey the GNU General Public License in all respects + * for all of the code used other than OpenSSL. If you modify + * file(s) with this exception, you may extend this exception to your + * version of the file(s), but you are not obligated to do so. If you + * do not wish to do so, delete this exception statement from your + * version. If you delete this exception statement from all source + * files in the program, then also delete it here. */ #include @@ -38,120 +51,35 @@ #include "log.h" #include "anytunError.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include +//use system specific sys exec +#if !defined(_MSC_VER) && !defined(MINGW) +#include "sysExec.hpp" +#else +#include "win32/sysExec.hpp" +#endif + -void anytun_exec(std::string const& script) +SysExec::SysExec(std::string const& script) : script_(script),closed_(false),return_code_(0) { - anytun_exec(script, StringVector(), StringList()); + doExec(StringVector(), StringList()); } -void anytun_exec(std::string const& script, StringVector const& args) +SysExec::SysExec(std::string const& script, StringVector args) : script_(script),closed_(false),return_code_(0) { - anytun_exec(script, args, StringList()); + doExec(args, StringList()); } -void anytun_exec(std::string const& script, StringList const& env) +SysExec::SysExec(std::string const& script, StringList env) : script_(script),closed_(false),return_code_(0) { - anytun_exec(script, StringVector(), env); + doExec(StringVector(), env); } -void anytun_exec(std::string const& script, StringVector const& args, StringList const& env) +SysExec::SysExec(std::string const& script, StringVector args, StringList env) : script_(script),closed_(false),return_code_(0) { - int pipefd[2]; - if(pipe(pipefd) == -1) { - cLog.msg(Log::PRIO_ERROR) << "executing script '" << script << "' pipe() error: " << AnytunErrno(errno); - return; - } - - pid_t pid; - pid = fork(); - if(pid == -1) { - cLog.msg(Log::PRIO_ERROR) << "executing script '" << script << "' fork() error: " << AnytunErrno(errno); - return; - } - - if(pid) { - close(pipefd[1]); - boost::thread(boost::bind(waitForScript, script, pid, pipefd[0])); - return; - } - -// child code - int fd; - for (fd=getdtablesize();fd>=0;--fd) // close all file descriptors - if(fd != pipefd[1]) close(fd); - - fd = open("/dev/null",O_RDWR); // stdin - if(fd == -1) - cLog.msg(Log::PRIO_WARNING) << "can't open stdin"; - else { - if(dup(fd) == -1) // stdout - cLog.msg(Log::PRIO_WARNING) << "can't open stdout"; - if(dup(fd) == -1) // stderr - cLog.msg(Log::PRIO_WARNING) << "can't open stderr"; - } - - char** argv = new char*[args.size() + 2]; - argv[0] = new char[script.size() + 1]; - std::strcpy(argv[0], script.c_str()); - for(unsigned int i=0; isize() + 1]; - std::strcpy(evp[i], it->c_str()); - ++i; - } - evp[env.size()] = NULL; - - execve(script.c_str(), argv, evp); - // if execve returns, an error occurred, but logging doesn't work - // because we closed all file descriptors, so just write errno to - // pipe and call exit - int err = errno; - int ret = write(pipefd[1], (void*)(&err), sizeof(err)); - if(ret != sizeof(errno)) - exit(-2); - exit(-1); + doExec(args, env); } -void waitForScript(std::string const& script, pid_t pid, int pipefd) +int SysExec::getReturnCode() const { - int status = 0; - waitpid(pid, &status, 0); - - fd_set rfds; - FD_ZERO(&rfds); - FD_SET(pipefd, &rfds); - struct timeval tv = { 0 , 0 }; - if(select(pipefd+1, &rfds, NULL, NULL, &tv) == 1) { - int err = 0; - if(read(pipefd, (void*)(&err), sizeof(err)) >= static_cast(sizeof(err))) { - cLog.msg(Log::PRIO_NOTICE) << "script '" << script << "' exec() error: " << AnytunErrno(err); - close(pipefd); - return; - } - } - if(WIFEXITED(status)) - cLog.msg(Log::PRIO_NOTICE) << "script '" << script << "' returned " << WEXITSTATUS(status); - else if(WIFSIGNALED(status)) - cLog.msg(Log::PRIO_NOTICE) << "script '" << script << "' terminated after signal " << WTERMSIG(status); - else - cLog.msg(Log::PRIO_ERROR) << "executing script '" << script << "': unkown error"; - - close(pipefd); + return return_code_; }