mirror of https://github.com/Icinga/icinga2.git
parent
386b9de042
commit
344b047ea0
|
@ -27,7 +27,7 @@ mkclass_target(sysloglogger.ti sysloglogger.tcpp sysloglogger.thpp)
|
|||
|
||||
set(base_SOURCES
|
||||
application.cpp application.thpp application-version.cpp array.cpp
|
||||
array-script.cpp boolean.cpp boolean-script.cpp console.cpp context.cpp
|
||||
array-script.cpp boolean.cpp boolean-script.cpp base64.cpp console.cpp context.cpp
|
||||
convert.cpp datetime.cpp datetime.thpp datetime-script.cpp debuginfo.cpp dictionary.cpp dictionary-script.cpp
|
||||
configobject.cpp configobject.thpp configobject-script.cpp configtype.cpp configwriter.cpp dependencygraph.cpp
|
||||
exception.cpp fifo.cpp filelogger.cpp filelogger.thpp initialize.cpp json.cpp
|
||||
|
|
|
@ -17,7 +17,7 @@
|
|||
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. *
|
||||
******************************************************************************/
|
||||
|
||||
#include "remote/base64.hpp"
|
||||
#include "base/base64.hpp"
|
||||
#include <openssl/bio.h>
|
||||
#include <openssl/evp.h>
|
||||
#include <openssl/buffer.h>
|
|
@ -31,7 +31,7 @@ namespace icinga
|
|||
*
|
||||
* @ingroup remote
|
||||
*/
|
||||
struct I2_REMOTE_API Base64
|
||||
struct I2_BASE_API Base64
|
||||
{
|
||||
static String Decode(const String& data);
|
||||
static String Encode(const String& data);
|
|
@ -23,7 +23,7 @@ mkclass_target(zone.ti zone.tcpp zone.thpp)
|
|||
set(remote_SOURCES
|
||||
actionshandler.cpp apiaction.cpp apiclient.cpp
|
||||
apifunction.cpp apilistener.cpp apilistener.thpp apilistener-configsync.cpp
|
||||
apilistener-filesync.cpp apiuser.cpp apiuser.thpp authority.cpp base64.cpp
|
||||
apilistener-filesync.cpp apiuser.cpp apiuser.thpp authority.cpp
|
||||
consolehandler.cpp configfileshandler.cpp configpackageshandler.cpp configpackageutility.cpp configobjectutility.cpp
|
||||
configstageshandler.cpp createobjecthandler.cpp deleteobjecthandler.cpp
|
||||
endpoint.cpp endpoint.thpp eventshandler.cpp eventqueue.cpp filterutility.cpp
|
||||
|
|
|
@ -18,7 +18,7 @@
|
|||
******************************************************************************/
|
||||
|
||||
#include "remote/apiclient.hpp"
|
||||
#include "remote/base64.hpp"
|
||||
#include "base/base64.hpp"
|
||||
#include "base/json.hpp"
|
||||
#include "base/logger.hpp"
|
||||
#include "base/exception.hpp"
|
||||
|
|
|
@ -18,9 +18,9 @@
|
|||
******************************************************************************/
|
||||
|
||||
#include "remote/httpclientconnection.hpp"
|
||||
#include "remote/base64.hpp"
|
||||
#include "base/configtype.hpp"
|
||||
#include "base/objectlock.hpp"
|
||||
#include "base/base64.hpp"
|
||||
#include "base/utility.hpp"
|
||||
#include "base/logger.hpp"
|
||||
#include "base/exception.hpp"
|
||||
|
|
|
@ -23,7 +23,7 @@
|
|||
#include "remote/apilistener.hpp"
|
||||
#include "remote/apifunction.hpp"
|
||||
#include "remote/jsonrpc.hpp"
|
||||
#include "remote/base64.hpp"
|
||||
#include "base/base64.hpp"
|
||||
#include "base/configtype.hpp"
|
||||
#include "base/objectlock.hpp"
|
||||
#include "base/utility.hpp"
|
||||
|
|
|
@ -20,13 +20,13 @@ set(Boost_USE_STATIC_LIBS OFF)
|
|||
include(BoostTestTargets)
|
||||
|
||||
set(base_test_SOURCES
|
||||
base-array.cpp base-convert.cpp base-dictionary.cpp base-fifo.cpp
|
||||
base-array.cpp base-base64.cpp base-convert.cpp base-dictionary.cpp base-fifo.cpp
|
||||
base-json.cpp base-match.cpp base-netstring.cpp base-object.cpp
|
||||
base-serialize.cpp base-shellescape.cpp base-stacktrace.cpp
|
||||
base-stream.cpp base-string.cpp base-timer.cpp base-type.cpp
|
||||
base-value.cpp config-ops.cpp icinga-checkresult.cpp icinga-macros.cpp
|
||||
icinga-notification.cpp
|
||||
icinga-perfdata.cpp remote-base64.cpp remote-url.cpp
|
||||
icinga-perfdata.cpp remote-url.cpp
|
||||
)
|
||||
|
||||
if(ICINGA2_UNITY_BUILD)
|
||||
|
@ -44,6 +44,7 @@ add_boost_test(base
|
|||
base_array/foreach
|
||||
base_array/clone
|
||||
base_array/json
|
||||
base_base64/base64
|
||||
base_convert/tolong
|
||||
base_convert/todouble
|
||||
base_convert/tostring
|
||||
|
@ -112,7 +113,6 @@ add_boost_test(base
|
|||
icinga_perfdata/ignore_invalid_warn_crit_min_max
|
||||
icinga_perfdata/invalid
|
||||
icinga_perfdata/multi
|
||||
remote_base64/base64
|
||||
remote_url/id_and_path
|
||||
remote_url/parameters
|
||||
remote_url/get_and_set
|
||||
|
|
|
@ -17,12 +17,12 @@
|
|||
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. *
|
||||
******************************************************************************/
|
||||
|
||||
#include "remote/base64.hpp"
|
||||
#include "base/base64.hpp"
|
||||
#include <BoostTestTargetConfig.h>
|
||||
|
||||
using namespace icinga;
|
||||
|
||||
BOOST_AUTO_TEST_SUITE(remote_base64)
|
||||
BOOST_AUTO_TEST_SUITE(base_base64)
|
||||
|
||||
BOOST_AUTO_TEST_CASE(base64)
|
||||
{
|
Loading…
Reference in New Issue