X-Git-Url: https://git.syn-net.org/debian/?a=blobdiff_plain;f=src%2FlogTargets.h;h=6696dfe284efc7b30b0e8b3d68c14c3edd51883f;hb=65944fb7a518dc659bacaf80cf235a0352fc6a7e;hp=64ad945dd007fa5d6557b0ce05651aa4f7e8eea4;hpb=058ae090a970436caec3b3059e9e18b310dd6b0d;p=anytun.git

diff --git a/src/logTargets.h b/src/logTargets.h
index 64ad945..6696dfe 100644
--- a/src/logTargets.h
+++ b/src/logTargets.h
@@ -6,19 +6,20 @@
  *  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-2008 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.
  *
  *  Anytun is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License version 3 as
- *  published by the Free Software Foundation.
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  any later version.
  *
  *  Anytun is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -26,11 +27,24 @@
  *  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 _LOG_TARGETS_H_
-#define _LOG_TARGETS_H_
+#ifndef ANYTUN_logTargets_h_INCLUDED
+#define ANYTUN_logTargets_h_INCLUDED
 
 #include <string>
 #include <map>
@@ -63,7 +77,7 @@ public:
   int getMaxPrio() { return max_prio; };
   void setMaxPrio(int p) { max_prio = p; };
 
-  virtual void log(std::string msg, int prio) = 0;  
+  virtual void log(std::string msg, int prio) = 0;
 
 protected:
   bool opened;
@@ -71,11 +85,12 @@ protected:
   int max_prio;
 };
 
-class LogTargetList 
+class LogTargetList
 {
 public:
-  typedef enum { TARGET_UNKNOWN, TARGET_SYSLOG, TARGET_FILE, 
-                 TARGET_STDOUT, TARGET_STDERR, TARGET_WINEVENTLOG } target_type_t;
+  typedef enum { TARGET_UNKNOWN, TARGET_SYSLOG, TARGET_FILE,
+                 TARGET_STDOUT, TARGET_STDERR, TARGET_WINEVENTLOG
+               } target_type_t;
 
   static target_type_t targetTypeFromString(std::string type);
   static std::string targetTypeToString(target_type_t type);
@@ -84,7 +99,7 @@ public:
   LogTarget* add(std::string conf);
   LogTarget* add(target_type_t type, int prio, std::string conf);
   void clear();
-  
+
   void log(std::string msg, int prio);
 
 private:
@@ -125,14 +140,14 @@ public:
 
   void open();
   void close();
-  void log(std::string msg, int prio);  
+  void log(std::string msg, int prio);
   static bool duplicateAllowed() { return false; };
 
-  LogTargetSyslog& setLogName(std::string l); 
+  LogTargetSyslog& setLogName(std::string l);
   std::string getLogName() const { return logname; }
   LogTargetSyslog& setFacility(int f);
   int getFacility() const { return facility; }
-  
+
 private:
   std::string logname;
   int facility;
@@ -148,12 +163,12 @@ public:
 
   void open();
   void close();
-  void log(std::string msg, int prio);  
+  void log(std::string msg, int prio);
   static bool duplicateAllowed() { return true; };
 
-  LogTargetFile& setLogFilename(std::string l); 
+  LogTargetFile& setLogFilename(std::string l);
   std::string getLogFilename() const { return logfilename; }
-  
+
 private:
   std::string logfilename;
   std::ofstream logfile;
@@ -169,7 +184,7 @@ public:
 
   void open();
   void close();
-  void log(std::string msg, int prio);  
+  void log(std::string msg, int prio);
   static bool duplicateAllowed() { return false; };
 
 private:
@@ -188,10 +203,10 @@ public:
 
   void open();
   void close();
-  void log(std::string msg, int prio);  
+  void log(std::string msg, int prio);
   static bool duplicateAllowed() { return false; };
 
-  LogTargetWinEventlog& setLogName(std::string l); 
+  LogTargetWinEventlog& setLogName(std::string l);
   std::string getLogName() const { return logname; };
 
 private: