diff options
| author | louiz’ <louiz@louiz.org> | 2017-06-28 14:41:33 +0200 |
|---|---|---|
| committer | louiz’ <louiz@louiz.org> | 2017-06-28 14:41:33 +0200 |
| commit | 13a1ab1878fd6312aea485ded3f5bad59c36f17f (patch) | |
| tree | 071b90523126d677f714cbf13346507f2e500d69 /src/identd | |
| parent | a1349361d2c15929e8260536c9091f2a4c2048a4 (diff) | |
| parent | 7e69d0387e85eeed10d605349feeba595c3fa0ee (diff) | |
| download | biboumi-13a1ab1878fd6312aea485ded3f5bad59c36f17f.tar.gz biboumi-13a1ab1878fd6312aea485ded3f5bad59c36f17f.tar.bz2 biboumi-13a1ab1878fd6312aea485ded3f5bad59c36f17f.tar.xz biboumi-13a1ab1878fd6312aea485ded3f5bad59c36f17f.zip | |
Merge remote-tracking branch 'remotes/debian/master' into debian
Diffstat (limited to 'src/identd')
| -rw-r--r-- | src/identd/identd_server.hpp | 2 | ||||
| -rw-r--r-- | src/identd/identd_socket.cpp | 2 | ||||
| -rw-r--r-- | src/identd/identd_socket.hpp | 3 |
3 files changed, 3 insertions, 4 deletions
diff --git a/src/identd/identd_server.hpp b/src/identd/identd_server.hpp index 5f74976..b1c8ec8 100644 --- a/src/identd/identd_server.hpp +++ b/src/identd/identd_server.hpp @@ -10,7 +10,7 @@ class BiboumiComponent; class IdentdServer: public TcpSocketServer<IdentdSocket> { public: - IdentdServer(const BiboumiComponent& biboumi_component, std::shared_ptr<Poller> poller, const uint16_t port): + IdentdServer(const BiboumiComponent& biboumi_component, std::shared_ptr<Poller>& poller, const uint16_t port): TcpSocketServer<IdentdSocket>(poller, port), biboumi_component(biboumi_component) {} diff --git a/src/identd/identd_socket.cpp b/src/identd/identd_socket.cpp index a94f172..b85257c 100644 --- a/src/identd/identd_socket.cpp +++ b/src/identd/identd_socket.cpp @@ -8,7 +8,7 @@ #include <logger/logger.hpp> -IdentdSocket::IdentdSocket(std::shared_ptr<Poller> poller, const socket_t socket, TcpSocketServer<IdentdSocket>& server): +IdentdSocket::IdentdSocket(std::shared_ptr<Poller>& poller, const socket_t socket, TcpSocketServer<IdentdSocket>& server): TCPSocketHandler(poller), server(dynamic_cast<IdentdServer&>(server)) { diff --git a/src/identd/identd_socket.hpp b/src/identd/identd_socket.hpp index 1c2bd27..a386d80 100644 --- a/src/identd/identd_socket.hpp +++ b/src/identd/identd_socket.hpp @@ -2,7 +2,6 @@ #include <network/socket_handler.hpp> -#include <cassert> #include <network/tcp_socket_handler.hpp> #include <logger/logger.hpp> @@ -17,7 +16,7 @@ class TcpSocketServer; class IdentdSocket: public TCPSocketHandler { public: - IdentdSocket(std::shared_ptr<Poller> poller, const socket_t socket, TcpSocketServer<IdentdSocket>& server); + IdentdSocket(std::shared_ptr<Poller>& poller, const socket_t socket, TcpSocketServer<IdentdSocket>& server); ~IdentdSocket() = default; std::string generate_answer(const BiboumiComponent& biboumi, uint16_t local, uint16_t remote); |