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

diff --git a/src/sysExec.h b/src/sysExec.h
index b5400b9..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,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 <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
@@ -42,33 +55,33 @@ typedef std::list<std::string> StringList;
 
 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();
+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;
+  int waitForScript();
+  int getReturnCode() const;
 
-    static void waitAndDestroy(SysExec*& s);
+  static void waitAndDestroy(SysExec*& s);
 
-  private:
-    void doExec(StringVector args, StringList env);
+private:
+  void doExec(StringVector args, StringList env);
 
-    std::string script_;
-    bool closed_;    
-#ifdef _MSC_VER
-    PROCESS_INFORMATION process_info_;
-    DWORD return_code_;
+  std::string script_;
+  bool closed_;
+#if !defined(_MSC_VER) && !defined(MINGW)
+  pid_t pid_;
+  int pipefd_;
+  int return_code_;
 #else
-    pid_t pid_;
-    int pipefd_;
-    int return_code_;
+  PROCESS_INFORMATION process_info_;
+  DWORD return_code_;
 #endif
 
-    
+
 };
 
 #endif