X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=CAN-binder%2Flow-can-binding%2Fdiagnostic%2Factive-diagnostic-request.cpp;h=61775b8ebfb8af7e90bd731e6c8c2e6b53144b41;hb=eafde4cec4fc026444501ed3a096a12e6eb8fc90;hp=e657456f649106fca17ddb19bbf79343116e7519;hpb=1a8c681528f9f1ff45d111b0c8cdfed7a697bae6;p=apps%2Fagl-service-can-low-level.git

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 e657456f..61775b8e 100644
--- a/CAN-binder/low-can-binding/diagnostic/active-diagnostic-request.cpp
+++ b/CAN-binder/low-can-binding/diagnostic/active-diagnostic-request.cpp
@@ -20,7 +20,7 @@
 
 #include "active-diagnostic-request.hpp"
 
-#include "../binding/configuration.hpp"
+#include "../binding/application.hpp"
 
 #define ERROR_PID 0xFF
 
@@ -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;
@@ -60,7 +61,8 @@ active_diagnostic_request_t::active_diagnostic_request_t()
 	  recurring_{false},
 	  wait_for_multiple_responses_{false},
 	  frequency_clock_{frequency_clock_t()},
-	  timeout_clock_{frequency_clock_t()}
+	  timeout_clock_{frequency_clock_t()},
+	  socket_{}
 {}
 
 active_diagnostic_request_t::active_diagnostic_request_t(const std::string& bus, DiagnosticRequest* request,
@@ -78,9 +80,17 @@ active_diagnostic_request_t::active_diagnostic_request_t(const std::string& bus,
 	  recurring_{frequencyHz ? true : false},
 	  wait_for_multiple_responses_{wait_for_multiple_responses},
 	  frequency_clock_{frequency_clock_t(frequencyHz)},
-	  timeout_clock_{frequency_clock_t(10)}
+	  timeout_clock_{frequency_clock_t(10)},
+	  socket_{}
 {}
 
+active_diagnostic_request_t::~active_diagnostic_request_t()
+{
+	socket_.close();
+	delete handle_;
+	handle_ = nullptr;
+}
+
 uint32_t active_diagnostic_request_t::get_id() const
 {
 	return id_;