From a3e566c4d3631076e29f3651554603184b6351a7 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Sun, 17 May 2009 01:34:10 +0200 Subject: Gnulib durch boost ersetzt --- src/Common/Base64Encoder.cpp | 210 +++++++++++++++++++++++++++++++++ src/Common/Base64Encoder.h | 43 +++++++ src/Common/Initializable.cpp | 2 + src/Common/LogManager.cpp | 52 ++++---- src/Common/LogManager.h | 48 +++----- src/Common/Makefile.am | 7 +- src/Common/Makefile.in | 81 +++---------- src/Common/RequestHandlers/Makefile.in | 57 ++------- src/Common/Requests/Makefile.in | 57 ++------- src/Common/XmlPacket.cpp | 29 ++--- 10 files changed, 347 insertions(+), 239 deletions(-) create mode 100644 src/Common/Base64Encoder.cpp create mode 100644 src/Common/Base64Encoder.h (limited to 'src/Common') diff --git a/src/Common/Base64Encoder.cpp b/src/Common/Base64Encoder.cpp new file mode 100644 index 0000000..9607ec9 --- /dev/null +++ b/src/Common/Base64Encoder.cpp @@ -0,0 +1,210 @@ +/* + * Base64Encoder.cpp + * + * Copyright (C) 2009 Matthias Schiffer + * + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program 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 this program. If not, see . + */ + +#include "Base64Encoder.h" + +#include + +#define B64(_) \ + ((_) == 'A' ? 0 \ + : (_) == 'B' ? 1 \ + : (_) == 'C' ? 2 \ + : (_) == 'D' ? 3 \ + : (_) == 'E' ? 4 \ + : (_) == 'F' ? 5 \ + : (_) == 'G' ? 6 \ + : (_) == 'H' ? 7 \ + : (_) == 'I' ? 8 \ + : (_) == 'J' ? 9 \ + : (_) == 'K' ? 10 \ + : (_) == 'L' ? 11 \ + : (_) == 'M' ? 12 \ + : (_) == 'N' ? 13 \ + : (_) == 'O' ? 14 \ + : (_) == 'P' ? 15 \ + : (_) == 'Q' ? 16 \ + : (_) == 'R' ? 17 \ + : (_) == 'S' ? 18 \ + : (_) == 'T' ? 19 \ + : (_) == 'U' ? 20 \ + : (_) == 'V' ? 21 \ + : (_) == 'W' ? 22 \ + : (_) == 'X' ? 23 \ + : (_) == 'Y' ? 24 \ + : (_) == 'Z' ? 25 \ + : (_) == 'a' ? 26 \ + : (_) == 'b' ? 27 \ + : (_) == 'c' ? 28 \ + : (_) == 'd' ? 29 \ + : (_) == 'e' ? 30 \ + : (_) == 'f' ? 31 \ + : (_) == 'g' ? 32 \ + : (_) == 'h' ? 33 \ + : (_) == 'i' ? 34 \ + : (_) == 'j' ? 35 \ + : (_) == 'k' ? 36 \ + : (_) == 'l' ? 37 \ + : (_) == 'm' ? 38 \ + : (_) == 'n' ? 39 \ + : (_) == 'o' ? 40 \ + : (_) == 'p' ? 41 \ + : (_) == 'q' ? 42 \ + : (_) == 'r' ? 43 \ + : (_) == 's' ? 44 \ + : (_) == 't' ? 45 \ + : (_) == 'u' ? 46 \ + : (_) == 'v' ? 47 \ + : (_) == 'w' ? 48 \ + : (_) == 'x' ? 49 \ + : (_) == 'y' ? 50 \ + : (_) == 'z' ? 51 \ + : (_) == '0' ? 52 \ + : (_) == '1' ? 53 \ + : (_) == '2' ? 54 \ + : (_) == '3' ? 55 \ + : (_) == '4' ? 56 \ + : (_) == '5' ? 57 \ + : (_) == '6' ? 58 \ + : (_) == '7' ? 59 \ + : (_) == '8' ? 60 \ + : (_) == '9' ? 61 \ + : (_) == '+' ? 62 \ + : (_) == '/' ? 63 \ + : 0xFF) + + +namespace Mad { +namespace Common { + +std::string Base64Encoder::encode(const std::vector &data) { + static const char b64str[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; + + size_t inlen = data.size(), outlen = ((((inlen) + 2) / 3) * 4); + + boost::scoped_array buf(new char[outlen]); + char *ptr = buf.get(); + + for(size_t in = 0; in < data.size(); in += 3) { + *ptr++ = b64str[(data[in] >> 2) & 0x3f]; + *ptr++ = b64str[((data[in] << 4) + (--inlen ? data[in+1] >> 4 : 0)) & 0x3f]; + *ptr++ = (inlen ? b64str[((data[in+1] << 2) + (--inlen ? data[in+2] >> 6 : 0)) & 0x3f] : '='); + *ptr++ = inlen ? b64str[data[in+2] & 0x3f] : '='; + + if(!inlen) + break; + + inlen--; + } + + return std::string(buf.get(), outlen); +} + +std::vector Base64Encoder::decode(const std::string &data) { + static const boost::uint8_t b64[0x100] = { + B64(0), B64(1), B64(2), B64(3), + B64(4), B64(5), B64(6), B64(7), + B64(8), B64(9), B64(10), B64(11), + B64(12), B64(13), B64(14), B64(15), + B64(16), B64(17), B64(18), B64(19), + B64(20), B64(21), B64(22), B64(23), + B64(24), B64(25), B64(26), B64(27), + B64(28), B64(29), B64(30), B64(31), + B64(32), B64(33), B64(34), B64(35), + B64(36), B64(37), B64(38), B64(39), + B64(40), B64(41), B64(42), B64(43), + B64(44), B64(45), B64(46), B64(47), + B64(48), B64(49), B64(50), B64(51), + B64(52), B64(53), B64(54), B64(55), + B64(56), B64(57), B64(58), B64(59), + B64(60), B64(61), B64(62), B64(63), + B64(64), B64(65), B64(66), B64(67), + B64(68), B64(69), B64(70), B64(71), + B64(72), B64(73), B64(74), B64(75), + B64(76), B64(77), B64(78), B64(79), + B64(80), B64(81), B64(82), B64(83), + B64(84), B64(85), B64(86), B64(87), + B64(88), B64(89), B64(90), B64(91), + B64(92), B64(93), B64(94), B64(95), + B64(96), B64(97), B64(98), B64(99), + B64(100), B64(101), B64(102), B64(103), + B64(104), B64(105), B64(106), B64(107), + B64(108), B64(109), B64(110), B64(111), + B64(112), B64(113), B64(114), B64(115), + B64(116), B64(117), B64(118), B64(119), + B64(120), B64(121), B64(122), B64(123), + B64(124), B64(125), B64(126), B64(127), + B64(128), B64(129), B64(130), B64(131), + B64(132), B64(133), B64(134), B64(135), + B64(136), B64(137), B64(138), B64(139), + B64(140), B64(141), B64(142), B64(143), + B64(144), B64(145), B64(146), B64(147), + B64(148), B64(149), B64(150), B64(151), + B64(152), B64(153), B64(154), B64(155), + B64(156), B64(157), B64(158), B64(159), + B64(160), B64(161), B64(162), B64(163), + B64(164), B64(165), B64(166), B64(167), + B64(168), B64(169), B64(170), B64(171), + B64(172), B64(173), B64(174), B64(175), + B64(176), B64(177), B64(178), B64(179), + B64(180), B64(181), B64(182), B64(183), + B64(184), B64(185), B64(186), B64(187), + B64(188), B64(189), B64(190), B64(191), + B64(192), B64(193), B64(194), B64(195), + B64(196), B64(197), B64(198), B64(199), + B64(200), B64(201), B64(202), B64(203), + B64(204), B64(205), B64(206), B64(207), + B64(208), B64(209), B64(210), B64(211), + B64(212), B64(213), B64(214), B64(215), + B64(216), B64(217), B64(218), B64(219), + B64(220), B64(221), B64(222), B64(223), + B64(224), B64(225), B64(226), B64(227), + B64(228), B64(229), B64(230), B64(231), + B64(232), B64(233), B64(234), B64(235), + B64(236), B64(237), B64(238), B64(239), + B64(240), B64(241), B64(242), B64(243), + B64(244), B64(245), B64(246), B64(247), + B64(248), B64(249), B64(250), B64(251), + B64(252), B64(253), B64(254), B64(255) + }; + + size_t inlen = data.length(), outlen = 3 * (inlen / 4) + 2; + + boost::scoped_array buf(new boost::uint8_t[outlen]); + boost::uint8_t *ptr = buf.get(); + + for(size_t in = 0; in < data.length()-1; in += 4) { + if(b64[data[in]] >= 64 || b64[data[in+1]] >= 64) + break; + + *ptr++ = (b64[data[in]] << 2) + (b64[data[in+1]] >> 4); + if(in >= data.length()-2 || b64[data[in+2]] >= 64) + break; + + *ptr++ = (b64[data[in+1]] << 4) + (b64[data[in+2]] >> 2); + if(in >= data.length()-3 || b64[data[in+3]] >= 64) + break; + + *ptr++ = (b64[data[in+2]] << 6) + b64[data[in+3]]; + } + + return std::vector(buf.get(), ptr); +} + +} +} diff --git a/src/Common/Base64Encoder.h b/src/Common/Base64Encoder.h new file mode 100644 index 0000000..d451109 --- /dev/null +++ b/src/Common/Base64Encoder.h @@ -0,0 +1,43 @@ +/* + * Base64Encoder.h + * + * Copyright (C) 2009 Matthias Schiffer + * + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program 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 this program. If not, see . + */ + +#ifndef MAD_COMMON_BASE64ENCODER_H_ +#define MAD_COMMON_BASE64ENCODER_H_ + +#include +#include + +#include + +namespace Mad { +namespace Common { + +class Base64Encoder { + private: + Base64Encoder(); + + public: + static std::string encode(const std::vector &data); + static std::vector decode(const std::string &data); +}; + +} +} + +#endif /* MAD_COMMON_BASE64ENCODER_H_ */ diff --git a/src/Common/Initializable.cpp b/src/Common/Initializable.cpp index 2a9aef3..d2dc9fd 100644 --- a/src/Common/Initializable.cpp +++ b/src/Common/Initializable.cpp @@ -23,6 +23,8 @@ #include "Configurable.h" #include "Logger.h" +#include + namespace Mad { namespace Common { diff --git a/src/Common/LogManager.cpp b/src/Common/LogManager.cpp index 5741d38..b17d916 100644 --- a/src/Common/LogManager.cpp +++ b/src/Common/LogManager.cpp @@ -30,22 +30,22 @@ LogManager LogManager::logManager; void LogManager::ConsoleLogger::logMessage(MessageCategory category _UNUSED_PARAMETER_, MessageLevel level, time_t timestamp _UNUSED_PARAMETER_, const std::string &message) { if(level != CRITICAL) {// Critical messages are printed to cerr directly, so don't print them a second time - gl_lock_lock(cerrLock); + cerrLock.lock(); std::cerr << message << std::endl; - gl_lock_unlock(cerrLock); + cerrLock.unlock(); } } void LogManager::ConsoleLogger::logMessage(MessageCategory category _UNUSED_PARAMETER_, MessageLevel, time_t timestamp _UNUSED_PARAMETER_, const std::string &message, const std::string &messageSource) { - gl_lock_lock(cerrLock); + cerrLock.lock(); std::cerr << message << " from " << messageSource << std::endl; - gl_lock_unlock(cerrLock); + cerrLock.unlock(); } void LogManager::ConsoleLogger::logMessageDirect(MessageCategory category _UNUSED_PARAMETER_, MessageLevel level _UNUSED_PARAMETER_, time_t timestamp _UNUSED_PARAMETER_, const std::string &message) { - gl_lock_lock(cerrLock); + cerrLock.lock(); std::cerr << message << std::endl; - gl_lock_unlock(cerrLock); + cerrLock.unlock(); } @@ -73,72 +73,70 @@ void LogManager::configFinished() { if(loggers.empty()) registerLogger(static_cast(&consoleLogger)); - gl_lock_lock(lock); + queueLock.lock(); configured = true; - gl_cond_signal(queueCond); - gl_lock_unlock(lock); + queueLock.unlock(); + queueCond.notify_one(); } void LogManager::log(MessageCategory category, MessageLevel level, time_t timestamp, const std::string &message) { if(level == LoggerBase::CRITICAL) consoleLogger.logMessageDirect(category, level, timestamp, message); - gl_lock_lock(lock); + queueLock.lock(); Message m = {category, level, timestamp, message}; messageQueue.push(m); - gl_cond_signal(queueCond); - gl_lock_unlock(lock); + queueLock.unlock(); + queueCond.notify_one(); } void LogManager::log(MessageCategory category, MessageLevel level, time_t timestamp, const std::string &message, const std::string &source) { - gl_lock_lock(lock); + queueLock.lock(); RemoteMessage m = {category, level, timestamp, message, source}; remoteMessageQueue.push(m); - gl_cond_signal(queueCond); - gl_lock_unlock(lock); + queueLock.unlock(); + queueCond.notify_one(); } void LogManager::loggerThread() { - gl_lock_lock(lock); + boost::unique_lock lock(queueLock); running = true; while(running) { while(running && ((messageQueue.empty() && messageQueue.empty()) || !configured)) - gl_cond_wait(queueCond, lock); + queueCond.wait(lock); while(!messageQueue.empty()) { Message message = messageQueue.front(); messageQueue.pop(); - gl_lock_unlock(lock); + lock.unlock(); - gl_lock_lock(loggerLock); + loggerLock.lock(); for(std::set::iterator logger = loggers.begin(); logger != loggers.end(); ++logger) { if((*logger)->getLevel() >= message.level && (*logger)->isCategorySet(message.category)) (*logger)->logMessage(message.category, message.level, message.timestamp, message.message); } - gl_lock_unlock(loggerLock); + loggerLock.unlock(); - gl_lock_lock(lock); + lock.lock(); } while(!remoteMessageQueue.empty()) { RemoteMessage message = remoteMessageQueue.front(); remoteMessageQueue.pop(); - gl_lock_unlock(lock); + lock.unlock(); - gl_lock_lock(remoteLoggerLock); + remoteLoggerLock.lock(); for(std::set::iterator logger = remoteLoggers.begin(); logger != remoteLoggers.end(); ++logger) { if((*logger)->getLevel() >= message.level && (*logger)->isCategorySet(message.category)) (*logger)->logMessage(message.category, message.level, message.timestamp, message.message, message.source); } - gl_lock_unlock(remoteLoggerLock); + remoteLoggerLock.unlock(); - gl_lock_lock(lock); + lock.lock(); } } - - gl_lock_unlock(lock); } } diff --git a/src/Common/LogManager.h b/src/Common/LogManager.h index 1e10e0b..98bb6f7 100644 --- a/src/Common/LogManager.h +++ b/src/Common/LogManager.h @@ -29,8 +29,8 @@ #include #include -#include "glthread/lock.h" -#include "glthread/cond.h" +#include +#include namespace Mad { @@ -66,7 +66,7 @@ class LogManager : public Configurable { private: // For long messages, writing to cerr is not atomic // -> lock cerr to prevent mixing messages up - gl_lock_t cerrLock; + boost::mutex cerrLock; protected: virtual void logMessage(MessageCategory category _UNUSED_PARAMETER_, MessageLevel level, time_t timestamp _UNUSED_PARAMETER_, const std::string &message); @@ -87,65 +87,55 @@ class LogManager : public Configurable { std::set remoteLoggers; bool configured, running; - gl_lock_t lock; - gl_cond_t queueCond; + boost::mutex queueLock; + boost::condition_variable queueCond; - gl_lock_t loggerLock; - gl_lock_t remoteLoggerLock; + boost::mutex loggerLock; + boost::mutex remoteLoggerLock; std::queue messageQueue; std::queue remoteMessageQueue; void loggerThread(); void stopLoggerThread() { - gl_lock_lock(lock); + queueLock.lock(); running = false; - gl_cond_signal(queueCond); - gl_lock_unlock(lock); + queueLock.unlock(); + queueCond.notify_one(); } - LogManager() : configured(false), running(false) { - gl_lock_init(lock); - gl_lock_init(loggerLock); - gl_lock_init(remoteLoggerLock); - } + LogManager() : configured(false), running(false) {} protected: virtual bool handleConfigEntry(const ConfigEntry &entry, bool handled); virtual void configFinished(); public: - ~LogManager() { - gl_lock_destroy(remoteLoggerLock); - gl_lock_destroy(loggerLock); - gl_lock_destroy(lock); - } - void log(MessageCategory category, MessageLevel level, time_t timestamp, const std::string &message); void log(MessageCategory category, MessageLevel level, time_t timestamp, const std::string &message, const std::string &source); void registerLogger(Logger *logger) { - gl_lock_lock(loggerLock); + loggerLock.lock(); loggers.insert(logger); - gl_lock_unlock(loggerLock); + loggerLock.unlock(); } void unregisterLogger(Logger *logger) { - gl_lock_lock(loggerLock); + loggerLock.lock(); loggers.erase(logger); - gl_lock_unlock(loggerLock); + loggerLock.unlock(); } void registerLogger(RemoteLogger *logger) { - gl_lock_lock(remoteLoggerLock); + remoteLoggerLock.lock(); remoteLoggers.insert(logger); - gl_lock_unlock(remoteLoggerLock); + remoteLoggerLock.unlock(); } void unregisterLogger(RemoteLogger *logger) { - gl_lock_lock(remoteLoggerLock); + remoteLoggerLock.lock(); remoteLoggers.erase(logger); - gl_lock_unlock(remoteLoggerLock); + remoteLoggerLock.unlock(); } static LogManager *get() { diff --git a/src/Common/Makefile.am b/src/Common/Makefile.am index e50461a..c38f9c4 100644 --- a/src/Common/Makefile.am +++ b/src/Common/Makefile.am @@ -1,14 +1,13 @@ SUBDIRS = Requests RequestHandlers noinst_LTLIBRARIES = libcommon.la -libcommon_la_SOURCES = ActionManager.cpp ClientConnection.cpp ConfigEntry.cpp ConfigManager.cpp \ +libcommon_la_SOURCES = ActionManager.cpp Base64Encoder.cpp ClientConnection.cpp ConfigEntry.cpp ConfigManager.cpp \ Connection.cpp Initializable.cpp Logger.cpp LogManager.cpp \ ModuleManager.cpp Request.cpp RequestManager.cpp SystemManager.cpp \ Tokenizer.cpp XmlPacket.cpp -libcommon_la_LIBADD = Requests/librequests.la RequestHandlers/librequesthandlers.la ../../lib/libgnu.la -libcommon_la_LDFLAGS = $(LTLIBMULTITHREAD) $(LTLIBTHREAD) +libcommon_la_LIBADD = Requests/librequests.la RequestHandlers/librequesthandlers.la -noinst_HEADERS = ActionManager.h ClientConnection.h ConfigEntry.h ConfigManager.h \ +noinst_HEADERS = ActionManager.h Base64Encoder.h ClientConnection.h ConfigEntry.h ConfigManager.h \ Configurable.h Connection.h HostInfo.h Initializable.h Logger.h \ LoggerBase.h LogManager.h ModuleManager.h RemoteLogger.h Request.h \ RequestHandler.h RequestManager.h SystemBackend.h SystemManager.h \ diff --git a/src/Common/Makefile.in b/src/Common/Makefile.in index 915c3bb..ef3993d 100644 --- a/src/Common/Makefile.in +++ b/src/Common/Makefile.in @@ -37,22 +37,14 @@ subdir = src/Common DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ - $(top_srcdir)/m4/argz.m4 $(top_srcdir)/m4/ax_lib_mysql.m4 \ - $(top_srcdir)/m4/base64.m4 $(top_srcdir)/m4/cond.m4 \ - $(top_srcdir)/m4/errno_h.m4 $(top_srcdir)/m4/extensions.m4 \ - $(top_srcdir)/m4/gettimeofday.m4 \ - $(top_srcdir)/m4/gnulib-common.m4 \ - $(top_srcdir)/m4/gnulib-comp.m4 \ - $(top_srcdir)/m4/include_next.m4 $(top_srcdir)/m4/lib-ld.m4 \ - $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/lock.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/argz.m4 \ + $(top_srcdir)/m4/ax_boost_base.m4 \ + $(top_srcdir)/m4/ax_boost_thread.m4 \ + $(top_srcdir)/m4/ax_lib_mysql.m4 $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/m4/ltdl.m4 $(top_srcdir)/m4/ltoptions.m4 \ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/pkg.m4 \ - $(top_srcdir)/m4/stdbool.m4 $(top_srcdir)/m4/sys_time_h.m4 \ - $(top_srcdir)/m4/thread.m4 $(top_srcdir)/m4/threadlib.m4 \ - $(top_srcdir)/m4/time_h.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -60,15 +52,13 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = LTLIBRARIES = $(noinst_LTLIBRARIES) libcommon_la_DEPENDENCIES = Requests/librequests.la \ - RequestHandlers/librequesthandlers.la ../../lib/libgnu.la -am_libcommon_la_OBJECTS = ActionManager.lo ClientConnection.lo \ - ConfigEntry.lo ConfigManager.lo Connection.lo Initializable.lo \ - Logger.lo LogManager.lo ModuleManager.lo Request.lo \ - RequestManager.lo SystemManager.lo Tokenizer.lo XmlPacket.lo + RequestHandlers/librequesthandlers.la +am_libcommon_la_OBJECTS = ActionManager.lo Base64Encoder.lo \ + ClientConnection.lo ConfigEntry.lo ConfigManager.lo \ + Connection.lo Initializable.lo Logger.lo LogManager.lo \ + ModuleManager.lo Request.lo RequestManager.lo SystemManager.lo \ + Tokenizer.lo XmlPacket.lo libcommon_la_OBJECTS = $(am_libcommon_la_OBJECTS) -libcommon_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ - $(CXXFLAGS) $(libcommon_la_LDFLAGS) $(LDFLAGS) -o $@ DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/config/depcomp am__depfiles_maybe = depfiles @@ -105,6 +95,9 @@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ +BOOST_CPPFLAGS = @BOOST_CPPFLAGS@ +BOOST_LDFLAGS = @BOOST_LDFLAGS@ +BOOST_THREAD_LIB = @BOOST_THREAD_LIB@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ @@ -123,25 +116,13 @@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ -EMULTIHOP_HIDDEN = @EMULTIHOP_HIDDEN@ -EMULTIHOP_VALUE = @EMULTIHOP_VALUE@ -ENOLINK_HIDDEN = @ENOLINK_HIDDEN@ -ENOLINK_VALUE = @ENOLINK_VALUE@ -EOVERFLOW_HIDDEN = @EOVERFLOW_HIDDEN@ -EOVERFLOW_VALUE = @EOVERFLOW_VALUE@ -ERRNO_H = @ERRNO_H@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ GREP = @GREP@ GSSAPI_LIBS = @GSSAPI_LIBS@ GnuTLS_CFLAGS = @GnuTLS_CFLAGS@ GnuTLS_LIBS = @GnuTLS_LIBS@ -HAVE_STRUCT_TIMEVAL = @HAVE_STRUCT_TIMEVAL@ -HAVE_SYS_TIME_H = @HAVE_SYS_TIME_H@ -HAVE__BOOL = @HAVE__BOOL@ INCLTDL = @INCLTDL@ -INCLUDE_NEXT = @INCLUDE_NEXT@ -INCLUDE_NEXT_AS_FIRST_DIRECTIVE = @INCLUDE_NEXT_AS_FIRST_DIRECTIVE@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -154,22 +135,15 @@ LIBADD_DLD_LINK = @LIBADD_DLD_LINK@ LIBADD_DLOPEN = @LIBADD_DLOPEN@ LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@ LIBLTDL = @LIBLTDL@ -LIBMULTITHREAD = @LIBMULTITHREAD@ LIBOBJS = @LIBOBJS@ -LIBPTH = @LIBPTH@ -LIBPTH_PREFIX = @LIBPTH_PREFIX@ LIBS = @LIBS@ -LIBTHREAD = @LIBTHREAD@ LIBTOOL = @LIBTOOL@ LIPO = @LIPO@ LN_S = @LN_S@ LTDLDEPS = @LTDLDEPS@ LTDLINCL = @LTDLINCL@ LTDLOPEN = @LTDLOPEN@ -LTLIBMULTITHREAD = @LTLIBMULTITHREAD@ LTLIBOBJS = @LTLIBOBJS@ -LTLIBPTH = @LTLIBPTH@ -LTLIBTHREAD = @LTLIBTHREAD@ LT_CONFIG_H = @LT_CONFIG_H@ LT_DLLOADERS = @LT_DLLOADERS@ LT_DLPREOPEN = @LT_DLPREOPEN@ @@ -180,9 +154,6 @@ MYSQL_CFLAGS = @MYSQL_CFLAGS@ MYSQL_CONFIG = @MYSQL_CONFIG@ MYSQL_LDFLAGS = @MYSQL_LDFLAGS@ MYSQL_VERSION = @MYSQL_VERSION@ -NEXT_ERRNO_H = @NEXT_ERRNO_H@ -NEXT_SYS_TIME_H = @NEXT_SYS_TIME_H@ -NEXT_TIME_H = @NEXT_TIME_H@ NM = @NM@ NMEDIT = @NMEDIT@ OBJEXT = @OBJEXT@ @@ -196,22 +167,12 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ -PRAGMA_SYSTEM_HEADER = @PRAGMA_SYSTEM_HEADER@ RANLIB = @RANLIB@ READLINE_LIBS = @READLINE_LIBS@ -REPLACE_GETTIMEOFDAY = @REPLACE_GETTIMEOFDAY@ -REPLACE_LOCALTIME_R = @REPLACE_LOCALTIME_R@ -REPLACE_NANOSLEEP = @REPLACE_NANOSLEEP@ -REPLACE_STRPTIME = @REPLACE_STRPTIME@ -REPLACE_TIMEGM = @REPLACE_TIMEGM@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ -STDBOOL_H = @STDBOOL_H@ STRIP = @STRIP@ -SYS_TIME_H = @SYS_TIME_H@ -SYS_TIME_H_DEFINES_STRUCT_TIMESPEC = @SYS_TIME_H_DEFINES_STRUCT_TIMESPEC@ -TIME_H_DEFINES_STRUCT_TIMESPEC = @TIME_H_DEFINES_STRUCT_TIMESPEC@ VERSION = @VERSION@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ @@ -237,10 +198,6 @@ datarootdir = @datarootdir@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ -gl_LIBOBJS = @gl_LIBOBJS@ -gl_LTLIBOBJS = @gl_LTLIBOBJS@ -gltests_LIBOBJS = @gltests_LIBOBJS@ -gltests_LTLIBOBJS = @gltests_LTLIBOBJS@ have_df = @have_df@ host = @host@ host_alias = @host_alias@ @@ -282,14 +239,13 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ SUBDIRS = Requests RequestHandlers noinst_LTLIBRARIES = libcommon.la -libcommon_la_SOURCES = ActionManager.cpp ClientConnection.cpp ConfigEntry.cpp ConfigManager.cpp \ +libcommon_la_SOURCES = ActionManager.cpp Base64Encoder.cpp ClientConnection.cpp ConfigEntry.cpp ConfigManager.cpp \ Connection.cpp Initializable.cpp Logger.cpp LogManager.cpp \ ModuleManager.cpp Request.cpp RequestManager.cpp SystemManager.cpp \ Tokenizer.cpp XmlPacket.cpp -libcommon_la_LIBADD = Requests/librequests.la RequestHandlers/librequesthandlers.la ../../lib/libgnu.la -libcommon_la_LDFLAGS = $(LTLIBMULTITHREAD) $(LTLIBTHREAD) -noinst_HEADERS = ActionManager.h ClientConnection.h ConfigEntry.h ConfigManager.h \ +libcommon_la_LIBADD = Requests/librequests.la RequestHandlers/librequesthandlers.la +noinst_HEADERS = ActionManager.h Base64Encoder.h ClientConnection.h ConfigEntry.h ConfigManager.h \ Configurable.h Connection.h HostInfo.h Initializable.h Logger.h \ LoggerBase.h LogManager.h ModuleManager.h RemoteLogger.h Request.h \ RequestHandler.h RequestManager.h SystemBackend.h SystemManager.h \ @@ -338,7 +294,7 @@ clean-noinstLTLIBRARIES: rm -f "$${dir}/so_locations"; \ done libcommon.la: $(libcommon_la_OBJECTS) $(libcommon_la_DEPENDENCIES) - $(libcommon_la_LINK) $(libcommon_la_OBJECTS) $(libcommon_la_LIBADD) $(LIBS) + $(CXXLINK) $(libcommon_la_OBJECTS) $(libcommon_la_LIBADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -347,6 +303,7 @@ distclean-compile: -rm -f *.tab.c @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ActionManager.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Base64Encoder.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ClientConnection.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ConfigEntry.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ConfigManager.Plo@am__quote@ diff --git a/src/Common/RequestHandlers/Makefile.in b/src/Common/RequestHandlers/Makefile.in index 8595870..e5cce2c 100644 --- a/src/Common/RequestHandlers/Makefile.in +++ b/src/Common/RequestHandlers/Makefile.in @@ -37,22 +37,14 @@ subdir = src/Common/RequestHandlers DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ - $(top_srcdir)/m4/argz.m4 $(top_srcdir)/m4/ax_lib_mysql.m4 \ - $(top_srcdir)/m4/base64.m4 $(top_srcdir)/m4/cond.m4 \ - $(top_srcdir)/m4/errno_h.m4 $(top_srcdir)/m4/extensions.m4 \ - $(top_srcdir)/m4/gettimeofday.m4 \ - $(top_srcdir)/m4/gnulib-common.m4 \ - $(top_srcdir)/m4/gnulib-comp.m4 \ - $(top_srcdir)/m4/include_next.m4 $(top_srcdir)/m4/lib-ld.m4 \ - $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/lock.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/argz.m4 \ + $(top_srcdir)/m4/ax_boost_base.m4 \ + $(top_srcdir)/m4/ax_boost_thread.m4 \ + $(top_srcdir)/m4/ax_lib_mysql.m4 $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/m4/ltdl.m4 $(top_srcdir)/m4/ltoptions.m4 \ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/pkg.m4 \ - $(top_srcdir)/m4/stdbool.m4 $(top_srcdir)/m4/sys_time_h.m4 \ - $(top_srcdir)/m4/thread.m4 $(top_srcdir)/m4/threadlib.m4 \ - $(top_srcdir)/m4/time_h.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -89,6 +81,9 @@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ +BOOST_CPPFLAGS = @BOOST_CPPFLAGS@ +BOOST_LDFLAGS = @BOOST_LDFLAGS@ +BOOST_THREAD_LIB = @BOOST_THREAD_LIB@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ @@ -107,25 +102,13 @@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ -EMULTIHOP_HIDDEN = @EMULTIHOP_HIDDEN@ -EMULTIHOP_VALUE = @EMULTIHOP_VALUE@ -ENOLINK_HIDDEN = @ENOLINK_HIDDEN@ -ENOLINK_VALUE = @ENOLINK_VALUE@ -EOVERFLOW_HIDDEN = @EOVERFLOW_HIDDEN@ -EOVERFLOW_VALUE = @EOVERFLOW_VALUE@ -ERRNO_H = @ERRNO_H@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ GREP = @GREP@ GSSAPI_LIBS = @GSSAPI_LIBS@ GnuTLS_CFLAGS = @GnuTLS_CFLAGS@ GnuTLS_LIBS = @GnuTLS_LIBS@ -HAVE_STRUCT_TIMEVAL = @HAVE_STRUCT_TIMEVAL@ -HAVE_SYS_TIME_H = @HAVE_SYS_TIME_H@ -HAVE__BOOL = @HAVE__BOOL@ INCLTDL = @INCLTDL@ -INCLUDE_NEXT = @INCLUDE_NEXT@ -INCLUDE_NEXT_AS_FIRST_DIRECTIVE = @INCLUDE_NEXT_AS_FIRST_DIRECTIVE@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -138,22 +121,15 @@ LIBADD_DLD_LINK = @LIBADD_DLD_LINK@ LIBADD_DLOPEN = @LIBADD_DLOPEN@ LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@ LIBLTDL = @LIBLTDL@ -LIBMULTITHREAD = @LIBMULTITHREAD@ LIBOBJS = @LIBOBJS@ -LIBPTH = @LIBPTH@ -LIBPTH_PREFIX = @LIBPTH_PREFIX@ LIBS = @LIBS@ -LIBTHREAD = @LIBTHREAD@ LIBTOOL = @LIBTOOL@ LIPO = @LIPO@ LN_S = @LN_S@ LTDLDEPS = @LTDLDEPS@ LTDLINCL = @LTDLINCL@ LTDLOPEN = @LTDLOPEN@ -LTLIBMULTITHREAD = @LTLIBMULTITHREAD@ LTLIBOBJS = @LTLIBOBJS@ -LTLIBPTH = @LTLIBPTH@ -LTLIBTHREAD = @LTLIBTHREAD@ LT_CONFIG_H = @LT_CONFIG_H@ LT_DLLOADERS = @LT_DLLOADERS@ LT_DLPREOPEN = @LT_DLPREOPEN@ @@ -164,9 +140,6 @@ MYSQL_CFLAGS = @MYSQL_CFLAGS@ MYSQL_CONFIG = @MYSQL_CONFIG@ MYSQL_LDFLAGS = @MYSQL_LDFLAGS@ MYSQL_VERSION = @MYSQL_VERSION@ -NEXT_ERRNO_H = @NEXT_ERRNO_H@ -NEXT_SYS_TIME_H = @NEXT_SYS_TIME_H@ -NEXT_TIME_H = @NEXT_TIME_H@ NM = @NM@ NMEDIT = @NMEDIT@ OBJEXT = @OBJEXT@ @@ -180,22 +153,12 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ -PRAGMA_SYSTEM_HEADER = @PRAGMA_SYSTEM_HEADER@ RANLIB = @RANLIB@ READLINE_LIBS = @READLINE_LIBS@ -REPLACE_GETTIMEOFDAY = @REPLACE_GETTIMEOFDAY@ -REPLACE_LOCALTIME_R = @REPLACE_LOCALTIME_R@ -REPLACE_NANOSLEEP = @REPLACE_NANOSLEEP@ -REPLACE_STRPTIME = @REPLACE_STRPTIME@ -REPLACE_TIMEGM = @REPLACE_TIMEGM@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ -STDBOOL_H = @STDBOOL_H@ STRIP = @STRIP@ -SYS_TIME_H = @SYS_TIME_H@ -SYS_TIME_H_DEFINES_STRUCT_TIMESPEC = @SYS_TIME_H_DEFINES_STRUCT_TIMESPEC@ -TIME_H_DEFINES_STRUCT_TIMESPEC = @TIME_H_DEFINES_STRUCT_TIMESPEC@ VERSION = @VERSION@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ @@ -221,10 +184,6 @@ datarootdir = @datarootdir@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ -gl_LIBOBJS = @gl_LIBOBJS@ -gl_LTLIBOBJS = @gl_LTLIBOBJS@ -gltests_LIBOBJS = @gltests_LIBOBJS@ -gltests_LTLIBOBJS = @gltests_LTLIBOBJS@ have_df = @have_df@ host = @host@ host_alias = @host_alias@ diff --git a/src/Common/Requests/Makefile.in b/src/Common/Requests/Makefile.in index a150e6a..c809e3c 100644 --- a/src/Common/Requests/Makefile.in +++ b/src/Common/Requests/Makefile.in @@ -37,22 +37,14 @@ subdir = src/Common/Requests DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ - $(top_srcdir)/m4/argz.m4 $(top_srcdir)/m4/ax_lib_mysql.m4 \ - $(top_srcdir)/m4/base64.m4 $(top_srcdir)/m4/cond.m4 \ - $(top_srcdir)/m4/errno_h.m4 $(top_srcdir)/m4/extensions.m4 \ - $(top_srcdir)/m4/gettimeofday.m4 \ - $(top_srcdir)/m4/gnulib-common.m4 \ - $(top_srcdir)/m4/gnulib-comp.m4 \ - $(top_srcdir)/m4/include_next.m4 $(top_srcdir)/m4/lib-ld.m4 \ - $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/lock.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/argz.m4 \ + $(top_srcdir)/m4/ax_boost_base.m4 \ + $(top_srcdir)/m4/ax_boost_thread.m4 \ + $(top_srcdir)/m4/ax_lib_mysql.m4 $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/m4/ltdl.m4 $(top_srcdir)/m4/ltoptions.m4 \ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/pkg.m4 \ - $(top_srcdir)/m4/stdbool.m4 $(top_srcdir)/m4/sys_time_h.m4 \ - $(top_srcdir)/m4/thread.m4 $(top_srcdir)/m4/threadlib.m4 \ - $(top_srcdir)/m4/time_h.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -89,6 +81,9 @@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ +BOOST_CPPFLAGS = @BOOST_CPPFLAGS@ +BOOST_LDFLAGS = @BOOST_LDFLAGS@ +BOOST_THREAD_LIB = @BOOST_THREAD_LIB@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ @@ -107,25 +102,13 @@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ -EMULTIHOP_HIDDEN = @EMULTIHOP_HIDDEN@ -EMULTIHOP_VALUE = @EMULTIHOP_VALUE@ -ENOLINK_HIDDEN = @ENOLINK_HIDDEN@ -ENOLINK_VALUE = @ENOLINK_VALUE@ -EOVERFLOW_HIDDEN = @EOVERFLOW_HIDDEN@ -EOVERFLOW_VALUE = @EOVERFLOW_VALUE@ -ERRNO_H = @ERRNO_H@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ GREP = @GREP@ GSSAPI_LIBS = @GSSAPI_LIBS@ GnuTLS_CFLAGS = @GnuTLS_CFLAGS@ GnuTLS_LIBS = @GnuTLS_LIBS@ -HAVE_STRUCT_TIMEVAL = @HAVE_STRUCT_TIMEVAL@ -HAVE_SYS_TIME_H = @HAVE_SYS_TIME_H@ -HAVE__BOOL = @HAVE__BOOL@ INCLTDL = @INCLTDL@ -INCLUDE_NEXT = @INCLUDE_NEXT@ -INCLUDE_NEXT_AS_FIRST_DIRECTIVE = @INCLUDE_NEXT_AS_FIRST_DIRECTIVE@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -138,22 +121,15 @@ LIBADD_DLD_LINK = @LIBADD_DLD_LINK@ LIBADD_DLOPEN = @LIBADD_DLOPEN@ LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@ LIBLTDL = @LIBLTDL@ -LIBMULTITHREAD = @LIBMULTITHREAD@ LIBOBJS = @LIBOBJS@ -LIBPTH = @LIBPTH@ -LIBPTH_PREFIX = @LIBPTH_PREFIX@ LIBS = @LIBS@ -LIBTHREAD = @LIBTHREAD@ LIBTOOL = @LIBTOOL@ LIPO = @LIPO@ LN_S = @LN_S@ LTDLDEPS = @LTDLDEPS@ LTDLINCL = @LTDLINCL@ LTDLOPEN = @LTDLOPEN@ -LTLIBMULTITHREAD = @LTLIBMULTITHREAD@ LTLIBOBJS = @LTLIBOBJS@ -LTLIBPTH = @LTLIBPTH@ -LTLIBTHREAD = @LTLIBTHREAD@ LT_CONFIG_H = @LT_CONFIG_H@ LT_DLLOADERS = @LT_DLLOADERS@ LT_DLPREOPEN = @LT_DLPREOPEN@ @@ -164,9 +140,6 @@ MYSQL_CFLAGS = @MYSQL_CFLAGS@ MYSQL_CONFIG = @MYSQL_CONFIG@ MYSQL_LDFLAGS = @MYSQL_LDFLAGS@ MYSQL_VERSION = @MYSQL_VERSION@ -NEXT_ERRNO_H = @NEXT_ERRNO_H@ -NEXT_SYS_TIME_H = @NEXT_SYS_TIME_H@ -NEXT_TIME_H = @NEXT_TIME_H@ NM = @NM@ NMEDIT = @NMEDIT@ OBJEXT = @OBJEXT@ @@ -180,22 +153,12 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ -PRAGMA_SYSTEM_HEADER = @PRAGMA_SYSTEM_HEADER@ RANLIB = @RANLIB@ READLINE_LIBS = @READLINE_LIBS@ -REPLACE_GETTIMEOFDAY = @REPLACE_GETTIMEOFDAY@ -REPLACE_LOCALTIME_R = @REPLACE_LOCALTIME_R@ -REPLACE_NANOSLEEP = @REPLACE_NANOSLEEP@ -REPLACE_STRPTIME = @REPLACE_STRPTIME@ -REPLACE_TIMEGM = @REPLACE_TIMEGM@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ -STDBOOL_H = @STDBOOL_H@ STRIP = @STRIP@ -SYS_TIME_H = @SYS_TIME_H@ -SYS_TIME_H_DEFINES_STRUCT_TIMESPEC = @SYS_TIME_H_DEFINES_STRUCT_TIMESPEC@ -TIME_H_DEFINES_STRUCT_TIMESPEC = @TIME_H_DEFINES_STRUCT_TIMESPEC@ VERSION = @VERSION@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ @@ -221,10 +184,6 @@ datarootdir = @datarootdir@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ -gl_LIBOBJS = @gl_LIBOBJS@ -gl_LTLIBOBJS = @gl_LTLIBOBJS@ -gltests_LIBOBJS = @gltests_LIBOBJS@ -gltests_LTLIBOBJS = @gltests_LTLIBOBJS@ have_df = @have_df@ host = @host@ host_alias = @host_alias@ diff --git a/src/Common/XmlPacket.cpp b/src/Common/XmlPacket.cpp index 73dd87d..6e3d007 100644 --- a/src/Common/XmlPacket.cpp +++ b/src/Common/XmlPacket.cpp @@ -20,13 +20,10 @@ #include #include "XmlPacket.h" +#include "Base64Encoder.h" #include #include -extern "C" { -#include "base64.h" -} - namespace Mad { namespace Common { @@ -38,10 +35,7 @@ void XmlPacket::Element::updateStr() { return; if(type == BINARY) { - char *base64Data; - base64_encode_alloc((char*)binData, value.var_size, &base64Data); - str = base64Data; - std::free(base64Data); + str = Base64Encoder::encode(std::vector((boost::uint8_t*)binData, ((boost::uint8_t*)binData)+value.var_size)); } else if(type != STRING) { std::ostringstream buf; @@ -99,7 +93,12 @@ XmlPacket::Element::Element(xmlNodePtr node) : elementNode(node), binData(0), ty if(!xmlStrcmp(typestr, (xmlChar*)"binary")) { type = BINARY; - base64_decode_alloc((char*)content, xmlStrlen(content), (char**)&binData, &value.var_size); + + std::vector v = Base64Encoder::decode(str); + + value.var_size = v.size(); + binData = std::malloc(value.var_size); + std::memcpy(binData, v.data(), value.var_size); } else if(!xmlStrcmp(typestr, (xmlChar*)"int")) { type = INT; @@ -215,17 +214,9 @@ bool XmlPacket::Entry::addBinary(const std::string &name, const void *data, size if(elements.find(name) != elements.end() || lists.find(name) != lists.end()) return false; - char *base64Data; + std::string base64Data = Base64Encoder::encode(std::vector((boost::uint8_t*)data, ((boost::uint8_t*)data)+size));; - base64_encode_alloc((const char*)data, size, &base64Data); - if(!base64Data) - return false; - - bool ret = add(name, std::string(base64Data), "binary"); - - std::free(base64Data); - - return ret; + return add(name, base64Data, "binary"); } XmlPacket::List::List(xmlNodePtr node) : Element(node, LIST) { -- cgit v1.2.3