X-Git-Url: https://git.syn-net.org/debian/?a=blobdiff_plain;f=src%2Flog.h;h=42ac675f9bee3e26721762e5cdd5b515c6c061dc;hb=5123ec3335dda691676f62467c57edc2517a5d5c;hp=dcdedc480d469dfbf408716dd9446a0ebb63a80a;hpb=058ae090a970436caec3b3059e9e18b310dd6b0d;p=anytun.git

diff --git a/src/log.h b/src/log.h
index dcdedc4..42ac675 100644
--- a/src/log.h
+++ b/src/log.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_H_
-#define _LOG_H_
+#ifndef ANYTUN_log_h_INCLUDED
+#define ANYTUN_log_h_INCLUDED
 
 #include <string>
 #include <sstream>
@@ -40,7 +54,7 @@
 
 class Log;
 
-class LogStringBuilder 
+class LogStringBuilder
 {
 public:
   LogStringBuilder(LogStringBuilder const& src);
@@ -76,24 +90,14 @@ public:
 private:
   Log() {};
   ~Log() {};
-  Log(const Log &l);
-  void operator=(const Log &l);
-
-  static Log* inst;
-  static Mutex instMutex;
-  class instanceCleaner {
-    public: ~instanceCleaner() {
-      if(Log::inst != 0)
-        delete Log::inst;
-    }
-  };
-  friend class instanceCleaner;
+
+  Log(const Log& l);
+  void operator=(const Log& l);
 
   void log(std::string msg, int prio);
 
   Mutex mutex;
   friend class LogStringBuilder;
-
   LogTargetList targets;
 };