[trac749] refactor more C++ utility code

src/bin/auth/auth_srv.cc

@@ -31,7 +31,7 @@
 
 #include <exceptions/exceptions.h>
 
-#include <util/buffer.h>
+#include <util/io/buffer.h>
 
 #include <dns/edns.h>
 #include <dns/exceptions.h>
@@ -64,7 +64,7 @@ using namespace isc;
 using namespace isc::cc;
 using namespace isc::datasrc;
 using namespace isc::dns;
-using namespace isc::util;
+using namespace isc::util::io;
 using namespace isc::auth;
 using namespace isc::dns::rdata;
 using namespace isc::data;

src/bin/auth/auth_srv.h

@@ -109,7 +109,7 @@ public:
     /// \throw isc::Unexpected Protocol type of \a message is unexpected
     void processMessage(const asiolink::IOMessage& io_message,
                         isc::dns::MessagePtr message,
-                        isc::util::OutputBufferPtr buffer,
+                        isc::util::io::OutputBufferPtr buffer,
                         asiolink::DNSServer* server);
 
     /// \brief Set verbose flag

src/bin/auth/benchmarks/query_bench.cc

@@ -22,7 +22,7 @@
 #include <bench/benchmark.h>
 #include <bench/benchmark_util.h>
 
-#include <util/buffer.h>
+#include <util/io/buffer.h>
 #include <dns/message.h>
 #include <dns/name.h>
 #include <dns/question.h>
@@ -41,7 +41,7 @@ using namespace isc;
 using namespace isc::data;
 using namespace isc::auth;
 using namespace isc::dns;
-using namespace isc::util;
+using namespace isc::util::io;
 using namespace isc::xfr;
 using namespace isc::bench;
 using namespace asiolink;

src/bin/auth/main.cc

@@ -25,7 +25,7 @@
 
 #include <exceptions/exceptions.h>
 
-#include <util/buffer.h>
+#include <util/io/buffer.h>
 
 #include <dns/message.h>
 #include <dns/messagerenderer.h>
@@ -50,7 +50,7 @@ using namespace isc::data;
 using namespace isc::cc;
 using namespace isc::config;
 using namespace isc::dns;
-using namespace isc::util;
+using namespace isc::util::io;
 using namespace isc::xfr;
 using namespace asiolink;
 

src/bin/auth/tests/auth_srv_unittest.cc

@@ -41,7 +41,7 @@
 using namespace std;
 using namespace isc::cc;
 using namespace isc::dns;
-using namespace isc::util;
+using namespace isc::util::io;
 using namespace isc::dns::rdata;
 using namespace isc::data;
 using namespace isc::xfr;

src/bin/host/host.cc

@@ -24,7 +24,7 @@
 #include <string>
 #include <iostream>
 
-#include <util/buffer.h>
+#include <util/io/buffer.h>
 
 #include <dns/name.h>
 #include <dns/message.h>
@@ -38,7 +38,7 @@
 
 using namespace std;
 using namespace isc::dns;
-using namespace isc::util;
+using namespace isc::util::io;
 
 namespace {
 char* dns_type = NULL;    // not set, so A, AAAA, MX

src/bin/resolver/main.cc

@@ -29,7 +29,7 @@
 
 #include <exceptions/exceptions.h>
 
-#include <util/buffer.h>
+#include <util/io/buffer.h>
 #include <dns/rcode.h>
 #include <dns/message.h>
 #include <dns/messagerenderer.h>

src/bin/resolver/resolver.cc

@@ -29,7 +29,7 @@
 
 #include <exceptions/exceptions.h>
 
-#include <util/buffer.h>
+#include <util/io/buffer.h>
 
 #include <dns/opcode.h>
 #include <dns/rcode.h>
@@ -51,7 +51,7 @@
 using namespace std;
 
 using namespace isc;
-using namespace isc::util;
+using namespace isc::util::io;
 using namespace isc::dns;
 using namespace isc::data;
 using namespace isc::config;

src/bin/resolver/resolver.h

@@ -77,7 +77,7 @@ public:
     void processMessage(const asiolink::IOMessage& io_message,
                         isc::dns::MessagePtr query_message,
                         isc::dns::MessagePtr answer_message,
-                        isc::util::OutputBufferPtr buffer,
+                        isc::util::io::OutputBufferPtr buffer,
                         asiolink::DNSServer* server);
 
     /// \brief Set and get the config session

src/lib/asiolink/dns_answer.h

@@ -66,7 +66,7 @@ public:
     virtual void operator()(const IOMessage& io_message,
                             isc::dns::MessagePtr query_message,
                             isc::dns::MessagePtr answer_message,
-                            isc::util::OutputBufferPtr buffer) const = 0;
+                            isc::util::io::OutputBufferPtr buffer) const = 0;
 };
 
 }      // namespace asiolink

src/lib/asiolink/dns_lookup.h

@@ -17,7 +17,7 @@
 
 #include <asiolink/io_message.h>
 #include <asiolink/dns_server.h>
-#include <util/buffer.h>
+#include <util/io/buffer.h>
 #include <dns/message.h>
 
 namespace asiolink {
@@ -70,7 +70,7 @@ public:
     virtual void operator()(const IOMessage& io_message,
                             isc::dns::MessagePtr message,
                             isc::dns::MessagePtr answer_message,
-                            isc::util::OutputBufferPtr buffer,
+                            isc::util::io::OutputBufferPtr buffer,
                             DNSServer* server) const
     {
         (*self_)(io_message, message, answer_message, buffer, server);

src/lib/asiolink/io_asio_socket.h

@@ -26,7 +26,7 @@
 #include <exceptions/exceptions.h>
 #include <coroutine.h>
 
-#include <util/buffer.h>
+#include <util/io/buffer.h>
 
 #include <asiolink/io_error.h>
 #include <asiolink/io_socket.h>
@@ -270,7 +270,7 @@ public:
     virtual bool processReceivedData(const void* staging, size_t length,
                                      size_t& cumulative, size_t& offset,
                                      size_t& expected,
-                                     isc::util::OutputBufferPtr& outbuff) = 0;
+                                     isc::util::io::OutputBufferPtr& outbuff) = 0;
 
     /// \brief Cancel I/O On AsioSocket
     virtual void cancel() = 0;
@@ -372,7 +372,7 @@ public:
     virtual bool receiveComplete(const void* staging, size_t length,
                                  size_t& cumulative, size_t& offset,
                                  size_t& expected,
-                                 isc::util::OutputBufferPtr& outbuff)
+                                 isc::util::io::OutputBufferPtr& outbuff)
     {
         return (true);
     }

src/lib/asiolink/io_fetch.cc

@@ -22,16 +22,14 @@
 #include <boost/scoped_ptr.hpp>
 #include <boost/date_time/posix_time/posix_time_types.hpp>
 
-#include <util/buffer.h>
-
 #include <dns/message.h>
 #include <dns/messagerenderer.h>
 #include <dns/opcode.h>
 #include <dns/rcode.h>
 #include <log/logger.h>
 
-#include <util/qid_gen.h>
-#include <util/qid_gen.h>
+#include <util/io/buffer.h>
+#include <util/random/qid_gen.h>
 
 #include <asio.hpp>
 #include <asio/deadline_timer.hpp>
@@ -51,7 +49,8 @@
 
 using namespace asio;
 using namespace isc::dns;
-using namespace isc::util;
+using namespace isc::util::io;
+using namespace isc::util::random;
 using namespace isc::log;
 using namespace std;
 

src/lib/asiolink/io_fetch.h

@@ -25,7 +25,7 @@
 
 #include <asio/error_code.hpp>
 
-#include <util/buffer.h>
+#include <util/io/buffer.h>
 #include <dns/question.h>
 
 namespace asiolink {
@@ -134,7 +134,7 @@ public:
     ///     -1 indicates no timeout.
     IOFetch(Protocol protocol, IOService& service,
         const isc::dns::Question& question, const IOAddress& address,
-        uint16_t port, isc::util::OutputBufferPtr& buff, Callback* cb,
+        uint16_t port, isc::util::io::OutputBufferPtr& buff, Callback* cb,
         int wait = -1);
 
     /// \brief Return Current Protocol

src/lib/asiolink/tcp_server.cc

@@ -23,7 +23,7 @@
 
 #include <log/dummylog.h>
 
-#include <util/buffer.h>
+#include <util/io/buffer.h>
 
 #include <asio.hpp>
 #include <asiolink/dummy_io_cb.h>
@@ -38,7 +38,7 @@ using asio::ip::tcp;
 
 using namespace std;
 using namespace isc::dns;
-using namespace isc::util;
+using namespace isc::util::io;
 
 namespace asiolink {
 

src/lib/asiolink/tcp_server.h

@@ -91,7 +91,7 @@ private:
     boost::shared_ptr<asio::ip::tcp::socket> socket_;
 
     // The buffer into which the response is written
-    boost::shared_ptr<isc::util::OutputBuffer> respbuf_;
+    boost::shared_ptr<isc::util::io::OutputBuffer> respbuf_;
 
     // \c IOMessage and \c Message objects to be passed to the
     // DNS lookup and answer providers

src/lib/asiolink/tcp_socket.h

@@ -33,8 +33,8 @@
 
 #include <config.h>
 
-#include <util/buffer.h>
-#include <util/asiolink_utilities.h>
+#include <util/io/buffer.h>
+#include <util/io/io_utilities.h>
 
 #include <asiolink/io_asio_socket.h>
 #include <asiolink/io_endpoint.h>
@@ -155,7 +155,7 @@ public:
     virtual bool processReceivedData(const void* staging, size_t length,
                                      size_t& cumulative, size_t& offset,
                                      size_t& expected,
-                                     isc::util::OutputBufferPtr& outbuff);
+                                     isc::util::io::OutputBufferPtr& outbuff);
 
     /// \brief Cancel I/O On Socket
     virtual void cancel();
@@ -185,7 +185,7 @@ private:
     // The option of sending the data in two operations, the count followed by
     // the data was discounted as that would lead to two callbacks which would
     // cause problems with the stackless coroutine code.
-    isc::util::OutputBufferPtr   send_buffer_;   ///< Send buffer
+    isc::util::io::OutputBufferPtr   send_buffer_;   ///< Send buffer
 };
 
 // Constructor - caller manages socket
@@ -268,7 +268,7 @@ TCPSocket<C>::asyncSend(const void* data, size_t length,
             uint16_t count = boost::numeric_cast<uint16_t>(length);
 
             // Copy data into a buffer preceded by the count field.
-            send_buffer_.reset(new isc::util::OutputBuffer(length + 2));
+            send_buffer_.reset(new isc::util::io::OutputBuffer(length + 2));
             send_buffer_->writeUint16(count);
             send_buffer_->writeData(data, length);
 
@@ -333,7 +333,7 @@ template <typename C> bool
 TCPSocket<C>::processReceivedData(const void* staging, size_t length,
                                   size_t& cumulative, size_t& offset,
                                   size_t& expected,
-                                  isc::util::OutputBufferPtr& outbuff)
+                                  isc::util::io::OutputBufferPtr& outbuff)
 {
     // Point to the data in the staging buffer and note how much there is.
     const uint8_t* data = static_cast<const uint8_t*>(staging);
@@ -358,7 +358,7 @@ TCPSocket<C>::processReceivedData(const void* staging, size_t length,
         }
 
         // Have enough data to interpret the packet count, so do so now.
-        expected = isc::util::readUint16(data);
+        expected = isc::util::io::readUint16(data);
 
         // We have two bytes less of data to process.  Point to the start of the
         // data and adjust the packet size.  Note that at this point,

src/lib/asiolink/tests/dns_server_unittest.cc

@@ -67,6 +67,7 @@
 
 using namespace asiolink;
 using namespace asio;
+
 namespace {
 static const std::string server_ip = "127.0.0.1";
 const int server_port = 5553;
@@ -109,7 +110,7 @@ class DummyLookup : public DNSLookup, public ServerStopper {
         void operator()(const IOMessage& io_message,
                 isc::dns::MessagePtr message,
                 isc::dns::MessagePtr answer_message,
-                isc::util::OutputBufferPtr buffer,
+                isc::util::io::OutputBufferPtr buffer,
                 DNSServer* server) const {
             stopServer();
             server->resume(true);
@@ -123,7 +124,7 @@ class SimpleAnswer : public DNSAnswer, public ServerStopper {
         void operator()(const IOMessage& message,
                 isc::dns::MessagePtr query_message,
                 isc::dns::MessagePtr answer_message,
-                isc::util::OutputBufferPtr buffer) const
+                isc::util::io::OutputBufferPtr buffer) const
         {
             //copy what we get from user
             buffer->writeData(message.getData(), message.getDataSize());

src/lib/asiolink/tests/io_fetch_unittest.cc

@@ -26,8 +26,8 @@
 
 #include <asio.hpp>
 
-#include <util/buffer.h>
-#include <util/asiolink_utilities.h>
+#include <util/io/buffer.h>
+#include <util/io/io_utilities.h>
 
 #include <dns/question.h>
 #include <dns/message.h>
@@ -43,7 +43,7 @@
 
 using namespace asio;
 using namespace isc::dns;
-using namespace isc::util;
+using namespace isc::util::io;
 using namespace asio::ip;
 using namespace std;
 

src/lib/asiolink/tests/tcp_socket_unittest.cc

@@ -35,8 +35,8 @@
 #include <boost/bind.hpp>
 #include <boost/shared_ptr.hpp>
 
-#include <util/buffer.h>
-#include <util/asiolink_utilities.h>
+#include <util/io/buffer.h>
+#include <util/io/io_utilities.h>
 
 #include <asio.hpp>
 
@@ -47,7 +47,7 @@
 using namespace asio;
 using namespace asio::ip;
 using namespace asiolink;
-using namespace isc::util;
+using namespace isc::util::io;
 using namespace std;
 
 namespace {

src/lib/asiolink/tests/udp_socket_unittest.cc

@@ -35,8 +35,8 @@
 #include <boost/bind.hpp>
 #include <boost/shared_ptr.hpp>
 
-#include <util/buffer.h>
-#include <util/asiolink_utilities.h>
+#include <util/io/buffer.h>
+#include <util/io/io_utilities.h>
 
 #include <asio.hpp>
 
@@ -46,7 +46,7 @@
 
 using namespace asio;
 using namespace asiolink;
-using namespace isc::util;
+using namespace isc::util::io;
 using namespace std;
 
 namespace {

src/lib/asiolink/udp_server.cc

@@ -38,7 +38,7 @@ using isc::log::dlog;
 
 using namespace std;
 using namespace isc::dns;
-using namespace isc::util;
+using namespace isc::util::io;
 
 namespace asiolink {
 
@@ -135,7 +135,7 @@ struct UDPServer::Data {
     isc::dns::MessagePtr answer_message_;
 
     // The buffer into which the response is written
-    isc::util::OutputBufferPtr respbuf_;
+    isc::util::io::OutputBufferPtr respbuf_;
 
     // The buffer into which the query packet is written
     boost::shared_array<char> data_;

src/lib/asiolink/udp_socket.h

@@ -141,7 +141,7 @@ public:
     virtual bool processReceivedData(const void* staging, size_t length,
                                      size_t& cumulative, size_t& offset,
                                      size_t& expected,
-                                     isc::util::OutputBufferPtr& outbuff);
+                                     isc::util::io::OutputBufferPtr& outbuff);
 
     /// \brief Cancel I/O On Socket
     virtual void cancel();
@@ -283,7 +283,7 @@ template <typename C> bool
 UDPSocket<C>::processReceivedData(const void* staging, size_t length,
                                   size_t& cumulative, size_t& offset,
                                   size_t& expected,
-                                  isc::util::OutputBufferPtr& outbuff)
+                                  isc::util::io::OutputBufferPtr& outbuff)
 {
     // Set return values to what we should expect.
     cumulative = length;

src/lib/bench/benchmark_util.cc

@@ -19,7 +19,7 @@
 
 #include <exceptions/exceptions.h>
 
-#include <util/buffer.h>
+#include <util/io/buffer.h>
 #include <dns/exceptions.h>
 #include <dns/name.h>
 #include <dns/message.h>
@@ -35,7 +35,7 @@
 using namespace std;
 using namespace isc;
 using namespace isc::dns;
-using namespace isc::util;
+using namespace isc::util::io;
 
 namespace isc {
 namespace bench {

src/lib/bench/tests/loadquery_unittest.cc

@@ -17,7 +17,7 @@
 #include <vector>
 #include <sstream>
 
-#include <util/buffer.h>
+#include <util/io/buffer.h>
 #include <dns/message.h>
 #include <dns/name.h>
 #include <dns/opcode.h>
@@ -32,7 +32,7 @@
 using namespace std;
 using namespace isc::bench;
 using namespace isc::dns;
-using namespace isc::util;
+using namespace isc::util::io;
 
 namespace {
 typedef pair<string, string> QueryParam;

src/lib/cache/tests/cache_test_messagefromfile.h

@@ -14,7 +14,7 @@
 
 #include <vector>
 #include <dns/tests/unittest_util.h>
-#include <util/buffer.h>
+#include <util/io/buffer.h>
 #include <dns/message.h>
 
 using namespace isc;
@@ -31,7 +31,7 @@ messageFromFile(Message& message, const char* datafile) {
     std::vector<unsigned char> data;
     UnitTestUtil::readWireData(datafile, data);
 
-    isc::util::InputBuffer buffer(&data[0], data.size());
+    isc::util::io::InputBuffer buffer(&data[0], data.size());
     message.fromWire(buffer);
 }
 

src/lib/cache/tests/cache_test_sectioncount.h

@@ -14,7 +14,7 @@
 
 #include <vector>
 #include <dns/tests/unittest_util.h>
-#include <util/buffer.h>
+#include <util/io/buffer.h>
 #include <dns/message.h>
 
 using namespace isc;

src/lib/cache/tests/message_cache_unittest.cc

@@ -16,7 +16,7 @@
 #include <string>
 #include <gtest/gtest.h>
 #include <dns/tests/unittest_util.h>
-#include <util/buffer.h>
+#include <util/io/buffer.h>
 #include "../message_cache.h"
 #include "../rrset_cache.h"
 #include "../resolver_cache.h"
@@ -25,7 +25,7 @@
 using namespace isc::cache;
 using namespace isc;
 using namespace isc::dns;
-using namespace isc::util;
+using namespace isc::util::io;
 using namespace std;
 
 namespace {

src/lib/cache/tests/message_entry_unittest.cc

@@ -15,7 +15,7 @@
 #include <gtest/gtest.h>
 #include <dns/tests/unittest_util.h>
 #include <dns/message.h>
-#include <util/buffer.h>
+#include <util/io/buffer.h>
 #include "../message_entry.h"
 #include "../rrset_cache.h"
 #include "../resolver_cache.h"

src/lib/datasrc/data_source.cc

@@ -26,9 +26,9 @@
 #include <datasrc/data_source.h>
 #include <datasrc/query.h>
 
-#include <util/base32hex.h>
-#include <util/buffer.h>
-#include <util/sha1.h>
+#include <util/compat/base32hex.h>
+#include <util/compat/sha1.h>
+#include <util/io/buffer.h>
 
 #include <dns/message.h>
 #include <dns/name.h>
@@ -46,7 +46,8 @@
                       } while (0)
 
 using namespace std;
-using namespace isc::util;
+using namespace isc::util::io;
+using namespace isc::util::compat;
 using namespace isc::dns;
 using namespace isc::dns::rdata;
 

src/lib/datasrc/tests/datasrc_unittest.cc

@@ -20,7 +20,7 @@
 
 #include <gtest/gtest.h>
 
-#include <util/buffer.h>
+#include <util/io/buffer.h>
 
 #include <dns/message.h>
 #include <dns/messagerenderer.h>
@@ -45,7 +45,7 @@
 
 using isc::UnitTestUtil;
 using namespace std;
-using namespace isc::util;
+using namespace isc::util::io;
 using namespace isc::dns;
 using namespace isc::dns::rdata;
 using namespace isc::datasrc;

src/lib/dns/Makefile.am

@@ -64,7 +64,6 @@ lib_LTLIBRARIES = libdns++.la
 libdns___la_SOURCES =
 libdns___la_SOURCES += edns.h edns.cc
 libdns___la_SOURCES += exceptions.h exceptions.cc
-libdns___la_SOURCES += util/hex.h
 libdns___la_SOURCES += masterload.h masterload.cc
 libdns___la_SOURCES += message.h message.cc
 libdns___la_SOURCES += messagerenderer.h messagerenderer.cc

src/lib/dns/edns.cc

@@ -36,7 +36,7 @@
 using namespace std;
 using namespace boost;
 using namespace isc::dns::rdata;
-using namespace isc::util;
+using namespace isc::util::io;
 
 namespace isc {
 namespace dns {

src/lib/dns/edns.h

@@ -25,8 +25,10 @@
 
 namespace isc {
 namespace util {
+namespace io {
 class OutputBuffer;
 }
+}
 
 namespace dns {
 
@@ -323,7 +325,7 @@ public: