summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlouiz’ <louiz@louiz.org>2016-11-18 20:54:41 +0100
committerlouiz’ <louiz@louiz.org>2016-12-04 16:15:21 +0100
commit732f53d798c86558e1e625c22e957243bb2d6467 (patch)
tree4bdbbb6442c10ebec2ba91e8ac32e92f80758b63
parent3f53db79c0f010dfb1ac1f4aa8ed098d42c5b96f (diff)
downloadbiboumi-732f53d798c86558e1e625c22e957243bb2d6467.tar.gz
biboumi-732f53d798c86558e1e625c22e957243bb2d6467.tar.bz2
biboumi-732f53d798c86558e1e625c22e957243bb2d6467.tar.xz
biboumi-732f53d798c86558e1e625c22e957243bb2d6467.zip
Clean a few more things
-rw-r--r--louloulibs/network/dns_handler.cpp1
-rw-r--r--louloulibs/network/dns_handler.hpp3
-rw-r--r--louloulibs/network/tcp_socket_handler.hpp4
-rw-r--r--src/identd/identd_socket.hpp7
4 files changed, 4 insertions, 11 deletions
diff --git a/louloulibs/network/dns_handler.cpp b/louloulibs/network/dns_handler.cpp
index fef0cfc..b1807b5 100644
--- a/louloulibs/network/dns_handler.cpp
+++ b/louloulibs/network/dns_handler.cpp
@@ -8,7 +8,6 @@
#include <utils/timed_events.hpp>
#include <algorithm>
-#include <stdexcept>
DNSHandler DNSHandler::instance;
diff --git a/louloulibs/network/dns_handler.hpp b/louloulibs/network/dns_handler.hpp
index fd1729d..53a7799 100644
--- a/louloulibs/network/dns_handler.hpp
+++ b/louloulibs/network/dns_handler.hpp
@@ -20,8 +20,9 @@ class DNSSocketHandler;
class DNSHandler
{
-public:
+private:
DNSHandler();
+public:
~DNSHandler() = default;
DNSHandler(const DNSHandler&) = delete;
DNSHandler(DNSHandler&&) = delete;
diff --git a/louloulibs/network/tcp_socket_handler.hpp b/louloulibs/network/tcp_socket_handler.hpp
index c33c8f2..5863d4a 100644
--- a/louloulibs/network/tcp_socket_handler.hpp
+++ b/louloulibs/network/tcp_socket_handler.hpp
@@ -204,8 +204,8 @@ protected:
/**
* Called when we detect a disconnection from the remote host.
*/
- virtual void on_connection_close(const std::string& error) = 0;
- virtual void on_connection_failed(const std::string& error) = 0;
+ virtual void on_connection_close(const std::string&) {}
+ virtual void on_connection_failed(const std::string&) {}
private:
#ifdef BOTAN_FOUND
diff --git a/src/identd/identd_socket.hpp b/src/identd/identd_socket.hpp
index 98077f2..1c2bd27 100644
--- a/src/identd/identd_socket.hpp
+++ b/src/identd/identd_socket.hpp
@@ -22,8 +22,6 @@ class IdentdSocket: public TCPSocketHandler
std::string generate_answer(const BiboumiComponent& biboumi, uint16_t local, uint16_t remote);
void parse_in_buffer(const std::size_t size) override final;
- void on_connection_close(const std::string&) override final
- {}
bool is_connected() const override final
{
@@ -35,10 +33,5 @@ class IdentdSocket: public TCPSocketHandler
}
private:
- void connect() override
- { assert(false); }
- void on_connection_failed(const std::string&) override final
- { assert(false); }
-
IdentdServer& server;
};