summaryrefslogtreecommitdiffstats
path: root/CAN-binder/low-can-binding
diff options
context:
space:
mode:
authorRomain Forlot <romain.forlot@iot.bzh>2017-05-24 00:00:33 +0200
committerRomain Forlot <romain.forlot@iot.bzh>2017-05-24 00:00:33 +0200
commitd35da77dcd5273b54177f8bc8ae7e5992bb3ca09 (patch)
tree2782f53cefc3995283231b8ee306cac477232dba /CAN-binder/low-can-binding
parent7747851ca010a3dfe9ffee808376dd5a7af68b91 (diff)
Be able to copy active diagnostic request objects with their socket
Implement socket copy assignment operator on socketcan base class. Change-Id: I75a2d3b96275b7ab83372d74ff7fe0a0b0535dc7 Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
Diffstat (limited to 'CAN-binder/low-can-binding')
-rw-r--r--CAN-binder/low-can-binding/diagnostic/active-diagnostic-request.cpp1
-rw-r--r--CAN-binder/low-can-binding/utils/socketcan.cpp6
-rw-r--r--CAN-binder/low-can-binding/utils/socketcan.hpp1
3 files changed, 8 insertions, 0 deletions
diff --git a/CAN-binder/low-can-binding/diagnostic/active-diagnostic-request.cpp b/CAN-binder/low-can-binding/diagnostic/active-diagnostic-request.cpp
index e657456..e9f0cd1 100644
--- a/CAN-binder/low-can-binding/diagnostic/active-diagnostic-request.cpp
+++ b/CAN-binder/low-can-binding/diagnostic/active-diagnostic-request.cpp
@@ -45,6 +45,7 @@ active_diagnostic_request_t& active_diagnostic_request_t::operator=(const active
wait_for_multiple_responses_ = adr.wait_for_multiple_responses_;
frequency_clock_ = adr.frequency_clock_;
timeout_clock_ = adr.timeout_clock_;
+ socket_ = adr.socket_;
}
return *this;
diff --git a/CAN-binder/low-can-binding/utils/socketcan.cpp b/CAN-binder/low-can-binding/utils/socketcan.cpp
index d66822d..ffd4615 100644
--- a/CAN-binder/low-can-binding/utils/socketcan.cpp
+++ b/CAN-binder/low-can-binding/utils/socketcan.cpp
@@ -43,6 +43,12 @@ namespace utils
s.socket_ = INVALID_SOCKET;
}
+ socketcan_t& socketcan_t::operator=(const socketcan_t& s)
+ {
+ socket_ = std::move(s.socket_);
+ return *this;
+ }
+
socketcan_t::~socketcan_t()
{}
diff --git a/CAN-binder/low-can-binding/utils/socketcan.hpp b/CAN-binder/low-can-binding/utils/socketcan.hpp
index c3abb2f..1e7cd3c 100644
--- a/CAN-binder/low-can-binding/utils/socketcan.hpp
+++ b/CAN-binder/low-can-binding/utils/socketcan.hpp
@@ -35,6 +35,7 @@ namespace utils
socketcan_t();
socketcan_t(const socketcan_t& s);
socketcan_t(socketcan_t&&);
+ socketcan_t& operator=(const socketcan_t& s);
virtual ~socketcan_t();
const struct sockaddr_can& get_tx_address() const;