rms/openvpn3
1
0
Fork 0
mirror of https://github.com/amnezia-vpn/openvpn3.git synced 2026-05-17 08:26:28 +03:00
Code Issues Packages Projects Releases Wiki Activity

Remove old and/or unneeded code from logging

Browse Source 
Also, update copyright dates

Signed-off-by: Mark Deric <jmark@openvpn.net>
This commit is contained in:
Mark Deric
2024-02-18 00:44:50 -08:00
parent e5c850cc82
commit 9ffa263bc8
6 changed files with 21 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
openvpn/log/logbase.hpp
View File

@@ -4,7 +4,7 @@
// packet encryption, packet authentication, and
// packet compression.
//
// Copyright (C) 2012-2022 OpenVPN Inc.
// Copyright (C) 2012-2024 OpenVPN Inc.
//
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU Affero General Public License Version 3
@@ -19,13 +19,10 @@
// along with this program in the COPYING file.
// If not, see <http://www.gnu.org/licenses/>.
#ifndef OPENVPN_LOG_LOGBASE_H
#define OPENVPN_LOG_LOGBASE_H
#pragma once
#include "openvpn/log/logbase_class.hpp"
#define OPENVPN_LOG_INFO(x) x
#include <openvpn/log/logthread.hpp>
#endif

21
openvpn/log/logbase_class.hpp
View File

@@ -4,7 +4,7 @@
// packet encryption, packet authentication, and
// packet compression.
//
// Copyright (C) 2012-2022 OpenVPN Inc.
// Copyright (C) 2012-2024 OpenVPN Inc.
//
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU Affero General Public License Version 3
@@ -19,8 +19,7 @@
// along with this program in the COPYING file.
// If not, see <http://www.gnu.org/licenses/>.
#ifndef OPENVPN_LOG_LOGBASE_CLASS_H
#define OPENVPN_LOG_LOGBASE_CLASS_H
#pragma once
#include <string>
@@ -30,22 +29,10 @@
namespace openvpn {
#ifdef OPENVPN_LOGBASE_NO_RC
struct LogBase
struct LogBase : RC<thread_safe_refcount>
{
// typedef RCPtr<LogBase> Ptr;
virtual void log(const std::string &str) = 0;
};
#else
struct LogBase : public RC<thread_safe_refcount>
{
typedef RCPtr<LogBase> Ptr;
virtual void log(const std::string &str) = 0;
};
#endif
} // namespace openvpn
#endif

7
openvpn/log/logsimple.hpp
View File

@@ -4,7 +4,7 @@
// packet encryption, packet authentication, and
// packet compression.
//
// Copyright (C) 2012-2022 OpenVPN Inc.
// Copyright (C) 2012-2024 OpenVPN Inc.
//
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU Affero General Public License Version 3
@@ -21,8 +21,7 @@
// Define simple logging macros that simply output to stdout
#ifndef OPENVPN_LOG_LOGSIMPLE_H
#define OPENVPN_LOG_LOGSIMPLE_H
#pragma once
#include <iostream>
@@ -36,5 +35,3 @@
#define OPENVPN_LOG_NTNL(args) OPENVPN_LOG_STREAM << args << std::flush
#define OPENVPN_LOG_STRING(str) OPENVPN_LOG_STREAM << (str) << std::flush
#endif // OPENVPN_LOG_LOGSIMPLE_H

10
openvpn/log/logthread.hpp
View File

@@ -4,7 +4,7 @@
// packet encryption, packet authentication, and
// packet compression.
//
// Copyright (C) 2012-2022 OpenVPN Inc.
// Copyright (C) 2012-2024 OpenVPN Inc.
//
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU Affero General Public License Version 3
@@ -22,13 +22,7 @@
// This is a general-purpose logging framework that allows for OPENVPN_LOG and
// OPENVPN_LOG_NTNL macros to dispatch logging data to a thread-local handler.
// NOTE: define USE_ASIO_THREADLOCAL if your C++ doesn't support the
// "thread_local" attribute.
#ifndef OPENVPN_LOG_LOGTHREAD_H
#define OPENVPN_LOG_LOGTHREAD_H
#pragma once
#include "openvpn/log/logthread_macros.hpp"
#include "openvpn/log/logthread_class.hpp"
#endif

66
openvpn/log/logthread_class.hpp
View File

@@ -4,7 +4,7 @@
// packet encryption, packet authentication, and
// packet compression.
//
// Copyright (C) 2012-2022 OpenVPN Inc.
// Copyright (C) 2012-2024 OpenVPN Inc.
//
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU Affero General Public License Version 3
@@ -19,25 +19,10 @@
// along with this program in the COPYING file.
// If not, see <http://www.gnu.org/licenses/>.
// NOTE: define USE_ASIO_THREADLOCAL if your C++ doesn't support the
// "thread_local" attribute.
#ifndef OPENVPN_LOG_LOGTHREAD_CLASS_H
#define OPENVPN_LOG_LOGTHREAD_CLASS_H
#include <string>
#include <sstream>
#include <thread>
#if defined(USE_ASIO) && defined(USE_ASIO_THREADLOCAL)
#include <asio/detail/tss_ptr.hpp>
#endif
#include <openvpn/common/size.hpp>
#pragma once
// Define this parameter before including this header:
// OPENVPN_LOG_CLASS -- client class that exposes a log() method
#ifndef OPENVPN_LOG_CLASS
#error OPENVPN_LOG_CLASS must be defined
#endif
@@ -48,49 +33,17 @@ namespace Log {
#ifdef OPENVPN_LOG_GLOBAL
// OPENVPN_LOG uses global object pointer
inline OPENVPN_LOG_CLASS *global_log = nullptr; // GLOBAL
struct Context
{
struct Wrapper
{
};
Context(const Wrapper &wrap)
{
}
Context(OPENVPN_LOG_CLASS *cli)
{
global_log = cli;
}
~Context()
{
global_log = nullptr;
}
static bool defined()
{
return global_log != nullptr;
}
static OPENVPN_LOG_CLASS *obj()
{
return global_log;
}
};
#else
// OPENVPN_LOG uses thread-local object pointer
#if defined(USE_ASIO) && defined(USE_ASIO_THREADLOCAL)
inline asio::detail::tss_ptr<OPENVPN_LOG_CLASS> global_log; // GLOBAL
#else
inline thread_local OPENVPN_LOG_CLASS *global_log = nullptr; // GLOBAL
#endif
struct Context
{
// Mechanism for passing thread-local
// global_log to another thread.
// Mechanism for passing thread-local global_log to another thread.
class Wrapper
{
#ifndef OPENVPN_LOG_GLOBAL
public:
Wrapper()
: log(obj())
@@ -100,13 +53,15 @@ struct Context
private:
friend struct Context;
OPENVPN_LOG_CLASS *log;
#endif
};
// While in scope, turns on global_log
// for this thread.
// While in scope, turns on global_log for this thread.
Context(const Wrapper &wrap)
{
#ifndef OPENVPN_LOG_GLOBAL
global_log = wrap.log;
#endif
}
Context(OPENVPN_LOG_CLASS *cli)
@@ -129,8 +84,5 @@ struct Context
return global_log;
}
};
#endif
} // namespace Log
} // namespace openvpn
#endif

8
openvpn/log/logthread_macros.hpp
View File

@@ -4,7 +4,7 @@
// packet encryption, packet authentication, and
// packet compression.
//
// Copyright (C) 2012-2022 OpenVPN Inc.
// Copyright (C) 2012-2024 OpenVPN Inc.
//
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU Affero General Public License Version 3
@@ -22,8 +22,7 @@
// This is a general-purpose logging framework that allows for OPENVPN_LOG and
// OPENVPN_LOG_NTNL macros to dispatch logging data to a thread-local handler.
#ifndef OPENVPN_LOG_LOGTHREAD_MACROS_H
#define OPENVPN_LOG_LOGTHREAD_MACROS_H
#pragma once
// Define this parameter before including this header:
// OPENVPN_LOG_INFO -- converts a log string to the form that should be passed to log()
@@ -63,6 +62,3 @@
(openvpn::Log::Context::obj()->log(OPENVPN_LOG_INFO(str))); \
} \
} while (0)
#endif