Reworked subscription to integrate filtering.

- Creation of an object which old the subscription context
(filter, signal) : low_can_subscription_t
- Move socket from can_signal_t to this new object.
- Adding a member to can_message_t to transport subscription_id to be able to
retrieve it with all the context through running.

Change-Id: I87be8cd6c3c93a81040357920d8c081a316800c3
Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>

1 files changed, 3 insertions, 2 deletions

diff --git a/CAN-binder/low-can-binding/utils/signals.hpp b/CAN-binder/low-can-binding/utils/signals.hpp
index a0fa99d1..54d88938 100644
--- a/CAN-binder/low-can-binding/utils/signals.hpp
+++ b/CAN-binder/low-can-binding/utils/signals.hpp
@@ -27,6 +27,7 @@
 #include "../diagnostic/diagnostic-message.hpp"
 
 #include "../binding/low-can-hat.hpp"
+#include "../binding/low-can-cb.hpp"
 
 namespace utils
 {
@@ -40,7 +41,7 @@ namespace utils
 	{
 	private:
 		std::mutex subscribed_signals_mutex_;
-		std::map<std::string, struct afb_event> subscribed_signals_;
+		std::map<int, std::pair<std::shared_ptr<low_can_subscription_t>, struct afb_event> > subscribed_signals_;
 
 		signals_manager_t(); ///< Private constructor to make singleton class.
 
@@ -48,7 +49,7 @@ namespace utils
 		static signals_manager_t& instance();
 
 		std::mutex& get_subscribed_signals_mutex();
-		std::map<std::string, struct afb_event>& get_subscribed_signals();
+		std::map<int, std::pair<std::shared_ptr<low_can_subscription_t>, struct afb_event> >& get_subscribed_signals();
 
 		struct signals_found find_signals(const openxc_DynamicField &key);
 		void find_diagnostic_messages(const openxc_DynamicField &key, std::vector<std::shared_ptr<diagnostic_message_t> >& found_signals);