X-Git-Url: https://git.syn-net.org/debian/?a=blobdiff_plain;f=src%2FsysExec.h;h=666186d4d9dbdc6367cb93e4c8a6a6541db7d41d;hb=ad68eaec71b8cd401dcc4ee7a13bd0e18ce392b0;hp=e6084726112cd382d2d13f160f7871738afd4ccb;hpb=f9ad69dfae6bcec427652b0c4230603e465bd544;p=anytun.git

diff --git a/src/sysExec.h b/src/sysExec.h
index e608472..666186d 100644
--- a/src/sysExec.h
+++ b/src/sysExec.h
@@ -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 <satp@wirdorange.org>
  *
  *  This file is part of Anytun.
@@ -27,14 +27,25 @@
  *  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 <http://www.gnu.org/licenses/>.
+ *  along with Anytun.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ *  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.
  */
 
 #ifndef ANYTUN_sysExec_h_INCLUDED
 #define ANYTUN_sysExec_h_INCLUDED
 
-#ifndef NO_EXEC
-
 #include <vector>
 #include <list>
 #include <string>
@@ -42,11 +53,35 @@
 typedef std::vector<std::string> StringVector;
 typedef std::list<std::string> StringList;
 
-void anytun_exec(std::string const& script);
-void anytun_exec(std::string const& script, StringVector const& args);
-void anytun_exec(std::string const& script, StringList const& env);
-void anytun_exec(std::string const& script, StringVector const& args, StringList const& env);
-void waitForScript(std::string const& script, pid_t pid, int pipefd);
+class SysExec
+{
+public:
+  SysExec(std::string const& script);
+  SysExec(std::string const& script, StringVector args);
+  SysExec(std::string const& script, StringList env);
+  SysExec(std::string const& script, StringVector args, StringList env);
+  ~SysExec();
+
+  int waitForScript();
+  int getReturnCode() const;
+
+  static void waitAndDestroy(SysExec*& s);
 
+private:
+  void doExec(StringVector args, StringList env);
+
+  std::string script_;
+  bool closed_;
+#if !defined(_MSC_VER) && !defined(MINGW)
+  pid_t pid_;
+  int pipefd_;
+  int return_code_;
+#else
+  PROCESS_INFORMATION process_info_;
+  DWORD return_code_;
 #endif
+
+
+};
+
 #endif