log cleanup

2 files changed, 98 insertions, 93 deletions

diff --git a/src/log.cpp b/src/log.cpp
index cdb8577..60f6e54 100644
--- a/src/log.cpp
+++ b/src/log.cpp
@@ -1,32 +1,32 @@
 /*
- *	anytun
+ *  anytun
  *
- *	The secure anycast tunneling protocol (satp) defines a protocol used
- *	for communication between any combination of unicast and anycast
- *	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
- *	intended to deliver a generic, scaleable and secure solution for
- *	tunneling and relaying of packets of any protocol.
+ *  The secure anycast tunneling protocol (satp) defines a protocol used
+ *  for communication between any combination of unicast and anycast
+ *  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
+ *  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, 
- *													Christian Pointner <satp@wirdorange.org>
+ *  Copyright (C) 2007-2008 Othmar Gsenger, Erwin Nindl, 
+ *                          Christian Pointner <satp@wirdorange.org>
  *
- *	This file is part of Anytun.
+ *  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.
+ *  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.
  *
- *	Anytun is distributed in the hope that it will be useful,
- *	but WITHOUT ANY WARRANTY; without even the implied warranty of
- *	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	See the
- *	GNU General Public License for more details.
+ *  Anytun is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  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/>.
+ *  You should have received a copy of the GNU General Public License
+ *  along with anytun.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <iostream>
@@ -49,70 +49,56 @@ Log& cLog = Log::instance();
 #ifndef USE_SSL_CRYPTO
 std::ostream& operator<<(std::ostream& stream, LogGpgError const& value) 
 {
-	char buf[STERROR_TEXT_MAX];
-	buf[0] = 0;
-	gpg_strerror_r(value.err_, buf, STERROR_TEXT_MAX);
-	return stream << buf;
+  char buf[STERROR_TEXT_MAX];
+  buf[0] = 0;
+  gpg_strerror_r(value.err_, buf, STERROR_TEXT_MAX);
+  return stream << buf;
 }
 #endif
 #endif
 std::ostream& operator<<(std::ostream& stream, LogErrno const& value)
 {
-	boost::system::system_error err(boost::system::error_code(value.err_,boost::system::get_system_category()));
-//	boost::system::system_error err(boost::system::error_code(value.err_,boost::system::get_posix_category()));
-	return stream << err.what();
+  boost::system::system_error err(boost::system::error_code(value.err_,boost::system::get_system_category()));
+//  boost::system::system_error err(boost::system::error_code(value.err_,boost::system::get_posix_category()));
+  return stream << err.what();
 }
 
 LogStringBuilder::LogStringBuilder(LogStringBuilder const& src) : log(src.log), prio(src.prio) 
 {
-	stream << src.stream.str();
+  stream << src.stream.str();
 }
 
 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() 
 {
-	Lock lock(log.mutex);
-#ifdef LOG_SYSLOG
-	syslog(prio | log.getFacility(), "%s", stream.str().c_str());	 
-#endif
-#ifdef LOG_STDOUT
-	std::cout << "LOG-" << Log::prioToString(prio) << ": " << stream.str() << std::endl;
-#endif
-#ifdef LOG_WINEVENTLOG
-  LPCTSTR lpszStrings[1];  
-  CHAR buffer[STERROR_TEXT_MAX];
-  StringCchPrintfA(buffer, STERROR_TEXT_MAX, "%s", stream.str().c_str());
-  lpszStrings[0] = buffer;
-  if(log.h_event_source_)
-    ReportEventA(log.h_event_source_, Log::prioToEventLogType(prio), 0, prio, NULL, 1, 0, lpszStrings, NULL);
-#endif
+  log.log(stream.str(), prio);
 }
 
 Log& Log::instance()
 {
-	Lock lock(instMutex);
-	static instanceCleaner c;
-	if(!inst)
-		inst = new Log();
-	
-	return *inst;
+  Lock lock(instMutex);
+  static instanceCleaner c;
+  if(!inst)
+    inst = new Log();
+  
+  return *inst;
 }
 
 Log::Log()
 {
-	facility = FAC_DAEMON;
-	logName = "anytun";
-	open();
+  facility = FAC_DAEMON;
+  logName = "anytun";
+  open();
 }
 
 Log::~Log()
 {
 #ifdef LOG_SYSLOG
-	closelog();
+  closelog();
 #endif
 #ifdef LOG_WINEVENTLOG
   if(h_event_source_)
@@ -120,59 +106,78 @@ Log::~Log()
 #endif
 }
 
-#ifdef LOG_STDOUT
-std::string Log::prioToString(int prio)
+void Log::open()
 {
-	switch(prio) {
-	case PRIO_EMERG: return "EMERG";
-	case PRIO_ALERT: return "ALERT";
-	case PRIO_CRIT: return "CRIT";
-	case PRIO_ERR: return "ERR";
-	case PRIO_WARNING: return "WARNING";
-	case PRIO_NOTICE: return "NOTICE";
-	case PRIO_INFO: return "INFO";
-	case PRIO_DEBUG: return "DEBUG";
-	default: return "UNKNOWN";
-	}
-}
+#ifdef LOG_SYSLOG
+  openlog(logName.c_str(), LOG_PID, facility);
 #endif
 #ifdef LOG_WINEVENTLOG
-WORD Log::prioToEventLogType(int prio)
-{
-	switch(prio) {
-	case PRIO_EMERG: return EVENTLOG_ERROR_TYPE;
-	case PRIO_ALERT: return EVENTLOG_ERROR_TYPE;
-	case PRIO_CRIT: return EVENTLOG_ERROR_TYPE;
-	case PRIO_ERR: return EVENTLOG_ERROR_TYPE;
-	case PRIO_WARNING: return EVENTLOG_WARNING_TYPE;
-	case PRIO_NOTICE: return EVENTLOG_INFORMATION_TYPE;
-	case PRIO_INFO: return EVENTLOG_SUCCESS;
-	case PRIO_DEBUG: return EVENTLOG_INFORMATION_TYPE;
-	default: return EVENTLOG_ERROR_TYPE;
-	}
-}
+  h_event_source_ = RegisterEventSourceA(NULL, logName.c_str());
 #endif
+}
 
-void Log::open()
+void Log::log(std::string msg, int prio)
 {
+  Lock lock(mutex);
 #ifdef LOG_SYSLOG
-	openlog(logName.c_str(), LOG_PID, facility);
+  syslog(prio | facility, "%s", msg.c_str());  
+#endif
+#ifdef LOG_STDOUT
+  std::cout << "LOG-" << Log::prioToString(prio) << ": " << msg << std::endl;
 #endif
 #ifdef LOG_WINEVENTLOG
-  h_event_source_ = RegisterEventSourceA(NULL, logName.c_str());
+  LPCTSTR lpszStrings[1];  
+  CHAR buffer[STERROR_TEXT_MAX];
+  StringCchPrintfA(buffer, STERROR_TEXT_MAX, "%s", msg.c_str());
+  lpszStrings[0] = buffer;
+  if(log.h_event_source_)
+    ReportEventA(log.h_event_source_, Log::prioToEventLogType(prio), 0, prio, NULL, 1, 0, lpszStrings, NULL);
+#endif
+}
+
+#ifdef LOG_STDOUT
+std::string Log::prioToString(int prio)
+{
+  switch(prio) {
+  case PRIO_EMERG: return "EMERG";
+  case PRIO_ALERT: return "ALERT";
+  case PRIO_CRIT: return "CRIT";
+  case PRIO_ERR: return "ERR";
+  case PRIO_WARNING: return "WARNING";
+  case PRIO_NOTICE: return "NOTICE";
+  case PRIO_INFO: return "INFO";
+  case PRIO_DEBUG: return "DEBUG";
+  default: return "UNKNOWN";
+  }
+}
 #endif
+#ifdef LOG_WINEVENTLOG
+WORD Log::prioToEventLogType(int prio)
+{
+  switch(prio) {
+  case PRIO_EMERG: return EVENTLOG_ERROR_TYPE;
+  case PRIO_ALERT: return EVENTLOG_ERROR_TYPE;
+  case PRIO_CRIT: return EVENTLOG_ERROR_TYPE;
+  case PRIO_ERR: return EVENTLOG_ERROR_TYPE;
+  case PRIO_WARNING: return EVENTLOG_WARNING_TYPE;
+  case PRIO_NOTICE: return EVENTLOG_INFORMATION_TYPE;
+  case PRIO_INFO: return EVENTLOG_SUCCESS;
+  case PRIO_DEBUG: return EVENTLOG_INFORMATION_TYPE;
+  default: return EVENTLOG_ERROR_TYPE;
+  }
 }
+#endif
 
 Log& Log::setLogName(std::string newLogName)
 {
-	logName = newLogName;
-	open();
-	return *this;
+  logName = newLogName;
+  open();
+  return *this;
 }
 
 Log& Log::setFacility(int newFacility)
 {
-	facility = newFacility;
-	open();
-	return *this;
+  facility = newFacility;
+  open();
+  return *this;
 }
diff --git a/src/log.h b/src/log.h
index 6975ed5..8e9cc56 100644
--- a/src/log.h
+++ b/src/log.h
@@ -151,7 +151,6 @@ public:
   static WORD prioToEventLogType(int prio);
 #endif
 
-
   static Log& instance();
 
   Log& setLogName(std::string newLogName); 
@@ -178,6 +177,7 @@ private:
   friend class instanceCleaner;
 
   void open();
+  void log(std::string msg, int prio);
 
   Mutex mutex;
   friend class LogStringBuilder;