diff options
| -rw-r--r-- | src/log.cpp | 108 |
1 files changed, 54 insertions, 54 deletions
diff --git a/src/log.cpp b/src/log.cpp index a09fe9b..8b24025 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> @@ -44,10 +44,10 @@ 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 @@ -55,51 +55,51 @@ 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(); + 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); + Lock lock(log.mutex); #ifndef NOSYSLOG - syslog(prio | log.getFacility(), "%s", stream.str().c_str()); + syslog(prio | log.getFacility(), "%s", stream.str().c_str()); #endif #ifdef LOGSTDOUT - std::cout << "LOG-" << Log::prioToString(prio) << ": " << stream.str() << std::endl; + std::cout << "LOG-" << Log::prioToString(prio) << ": " << stream.str() << std::endl; #endif } 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() { #ifndef NOSYSLOG - closelog(); + closelog(); #endif } @@ -109,12 +109,12 @@ 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"; + 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"; } } @@ -123,20 +123,20 @@ std::string Log::prioToString(int prio) void Log::open() { #ifndef NOSYSLOG - openlog(logName.c_str(), LOG_PID, facility); + openlog(logName.c_str(), LOG_PID, facility); #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; } |