X-Git-Url: https://git.syn-net.org/debian/?a=blobdiff_plain;f=src%2Flog.cpp;h=142156b06c4d6e8573873f88d2df95093c31ecf9;hb=ad05e83616ca7c348db398c0fd6d5c4acce49fae;hp=d0ed7f89929e0cd395cf8cb8f831e2a4d7396845;hpb=058ae090a970436caec3b3059e9e18b310dd6b0d;p=anytun.git

diff --git a/src/log.cpp b/src/log.cpp
index d0ed7f8..142156b 100644
--- a/src/log.cpp
+++ b/src/log.cpp
@@ -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,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.
  */
 
 #include <iostream>
@@ -35,33 +49,27 @@
 
 #include "threadUtils.hpp"
 
-Log* Log::inst = NULL;
-Mutex Log::instMutex;
 Log& cLog = Log::instance();
 
-LogStringBuilder::LogStringBuilder(LogStringBuilder const& src) : log(src.log), prio(src.prio) 
+LogStringBuilder::LogStringBuilder(LogStringBuilder const& src) : log(src.log), prio(src.prio)
 {
   stream << src.stream.str();
 }
 
-LogStringBuilder::LogStringBuilder(Log& l, int p) : log(l), prio(p) 
+LogStringBuilder::LogStringBuilder(Log& l, int p) : log(l), prio(p)
 {
-      // do something on the start of the line.
+  // do something on the start of the line.
 }
 
-LogStringBuilder::~LogStringBuilder() 
+LogStringBuilder::~LogStringBuilder()
 {
   log.log(stream.str(), prio);
 }
 
 Log& Log::instance()
 {
-  Lock lock(instMutex);
-  static instanceCleaner c;
-  if(!inst)
-    inst = new Log();
-  
-  return *inst;
+  static Log instance;
+  return instance;
 }
 
 void Log::addTarget(std::string conf)
@@ -69,8 +77,9 @@ void Log::addTarget(std::string conf)
   Lock lock(mutex);
   LogTarget* target = targets.add(conf);
   target->open();
-  if(target->getMaxPrio() > 0)
+  if(target->getMaxPrio() > 0) {
     target->enable();
+  }
 }
 
 void Log::addTarget(LogTargetList::target_type_t type, int prio, std::string conf)
@@ -78,8 +87,9 @@ void Log::addTarget(LogTargetList::target_type_t type, int prio, std::string con
   Lock lock(mutex);
   LogTarget* target = targets.add(type, prio, conf);
   target->open();
-  if(target->getMaxPrio() > 0)
+  if(target->getMaxPrio() > 0) {
     target->enable();
+  }
 }
 
 void Log::log(std::string msg, int prio)
@@ -91,11 +101,17 @@ void Log::log(std::string msg, int prio)
 std::string Log::prioToString(int prio)
 {
   switch(prio) {
-  case PRIO_ERROR: return "ERROR";
-  case PRIO_WARNING: return "WARNING";
-  case PRIO_NOTICE: return "NOTICE";
-  case PRIO_INFO: return "INFO";
-  case PRIO_DEBUG: return "DEBUG";
-  default: return "UNKNOWN";
+  case PRIO_ERROR:
+    return "ERROR";
+  case PRIO_WARNING:
+    return "WARNING";
+  case PRIO_NOTICE:
+    return "NOTICE";
+  case PRIO_INFO:
+    return "INFO";
+  case PRIO_DEBUG:
+    return "DEBUG";
+  default:
+    return "UNKNOWN";
   }
 }