X-Git-Url: https://git.syn-net.org/debian/?p=anytun.git;a=blobdiff_plain;f=src%2FsysExec.cpp;h=a69349f53bc34de2fc196ea9e47aa24c590af816;hp=49c0cae58457d364026ded9290f6e8c337803cb4;hb=ece844834d2cecc028ce81ca283f5d441088580e;hpb=bb834fe0ed7a38b724f49b944adb801634eb6194

diff --git a/src/sysExec.cpp b/src/sysExec.cpp
index 49c0cae..a69349f 100644
--- a/src/sysExec.cpp
+++ b/src/sysExec.cpp
@@ -38,120 +38,35 @@
 #include "log.h"
 #include "anytunError.h"
 
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <errno.h>
-#include <sys/wait.h>
-#include <sys/select.h>
-#include <stdlib.h>
-#include <string.h>
-#include <cstring>
+//use system specific sys exec
+#ifndef _MSC_VER
+#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; i<args.size(); ++i) {
-    argv[i+1] = new char[args[i].size() + 1];
-    std::strcpy(argv[i+1], args[i].c_str());
-  }
-  argv[args.size() + 1] = NULL;
-
-  char** evp;
-  evp = new char*[env.size() + 1];
-  unsigned int i = 0;
-  for(StringList::const_iterator it = env.begin(); it != env.end(); ++it) {
-    evp[i] = new char[it->size() + 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<int>(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_;
 }