From: Marcin Siodelski <marcin@isc.org>
Date: Thu, 5 Apr 2018 11:41:34 +0000 (+0200)
Subject: [5580] Do not use std::bind in boost async calls for unix sockets.
X-Git-Tag: trac5458a_base~25^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9b44014d616637ae4ca3dce929c4919bfd0b7d94;p=thirdparty%2Fkea.git

[5580] Do not use std::bind in boost async calls for unix sockets.
---

diff --git a/src/lib/asiolink/unix_domain_socket.cc b/src/lib/asiolink/unix_domain_socket.cc
index d1ad9ec30c..af6f4cd9ba 100644
--- a/src/lib/asiolink/unix_domain_socket.cc
+++ b/src/lib/asiolink/unix_domain_socket.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2017 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2017-2018 Internet Systems Consortium, Inc. ("ISC")
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -6,6 +6,7 @@
 
 #include <asiolink/asio_wrapper.h>
 #include <asiolink/unix_domain_socket.h>
+#include <boost/bind.hpp>
 #include <boost/enable_shared_from_this.hpp>
 #include <iostream>
 using namespace boost::asio::local;
@@ -161,11 +162,8 @@ public:
 void
 UnixDomainSocketImpl::asyncConnect(const stream_protocol::endpoint& endpoint,
                                    const UnixDomainSocket::ConnectHandler& handler) {
-    using namespace std::placeholders;
-
-    UnixDomainSocket::ConnectHandler local_handler =
-        std::bind(&UnixDomainSocketImpl::connectHandler, shared_from_this(),
-                  handler, _1);
+    auto local_handler = boost::bind(&UnixDomainSocketImpl::connectHandler, shared_from_this(),
+                                     handler, _1);
     socket_.async_connect(endpoint, local_handler);
 }
 
@@ -193,11 +191,8 @@ UnixDomainSocketImpl::asyncSend(const void* data, const size_t length,
 void
 UnixDomainSocketImpl::doSend(const boost::asio::const_buffers_1& buffer,
                              const UnixDomainSocket::Handler& handler) {
-    using namespace std::placeholders;
-
-    UnixDomainSocket::Handler local_handler =
-        std::bind(&UnixDomainSocketImpl::sendHandler, shared_from_this(),
-                  handler, buffer, _1, _2);
+    auto local_handler = boost::bind(&UnixDomainSocketImpl::sendHandler, shared_from_this(),
+                                     handler, buffer, _1, _2);
     socket_.async_send(buffer, local_handler);
 }
 
@@ -228,11 +223,8 @@ UnixDomainSocketImpl::asyncReceive(void* data, const size_t length,
 void
 UnixDomainSocketImpl::doReceive(const boost::asio::mutable_buffers_1& buffer,
                                 const UnixDomainSocket::Handler& handler) {
-    using namespace std::placeholders;
-
-    UnixDomainSocket::Handler local_handler =
-        std::bind(&UnixDomainSocketImpl::receiveHandler, shared_from_this(),
-                  handler, buffer, _1, _2);
+    auto local_handler = boost::bind(&UnixDomainSocketImpl::receiveHandler, shared_from_this(),
+                                     handler, buffer, _1, _2);
     socket_.async_receive(buffer, 0, local_handler);
 }