fix: test for opened CAN socket.

[apps/agl-service-can-low-level.git] / src / low-can-binding.cpp

diff --git a/src/low-can-binding.cpp b/src/low-can-binding.cpp
index 13452a4..23ab2da 100644 (file)
--- a/src/low-can-binding.cpp
+++ b/src/low-can-binding.cpp
@@ -22,17 +22,19 @@
 #include <mutex>
 #include <vector>
 #include <thread>
-#include <fcntl.h>
+#include <time.h>
 #include <linux/can.h>
 #include <json-c/json.h>
 #include <systemd/sd-event.h>
 
 #include "openxc.pb.h"
+#include "configuration.hpp"
 #include "can/can-bus.hpp"
 #include "can/can-signals.hpp"
 #include "can/can-message.hpp"
 #include "utils/timer.hpp"
 #include "utils/signals.hpp"
+#include "obd2/obd2-signals.hpp"
 #include "utils/openxc-utils.hpp"
 
 extern "C"
@@ -40,13 +42,9 @@ extern "C"
        #include <afb/afb-service-itf.h>
 };
 
-/*
- *     Interface between the daemon and the binding
- */
+// Interface between the daemon and the binding
 const struct afb_binding_interface *binder_interface;
 
-can_bus_t *can_bus_handler;
-
 /********************************************************************************
 *
 *              Subscription and unsubscription
@@ -82,7 +80,7 @@ static int subscribe_unsubscribe_signal(struct afb_req request, bool subscribe,
 
        std::lock_guard<std::mutex> subscribed_signals_lock(get_subscribed_signals_mutex());
        std::map<std::string, struct afb_event>& s = get_subscribed_signals();
-       if (s.find(sig) != s.end() && !afb_event_is_valid(s[std::string(sig)]))
+       if (s.find(sig) != s.end() && !afb_event_is_valid(s[sig]))
        {
                if(!subscribe)
                {
@@ -90,12 +88,14 @@ static int subscribe_unsubscribe_signal(struct afb_req request, bool subscribe,
                        ret = -1;
                }
                else
+               {
                        /* Event it isn't valid annymore, recreate it */
                        ret = create_event_handle(sig, s);
+               }
        }
        else
        {
-               /* Event don't exist , so let's create it */
+               /* Event doesn't exist , so let's create it */
                struct afb_event empty_event = {nullptr, nullptr};
                subscribed_signals[sig] = empty_event;
                ret = create_event_handle(sig, s);
@@ -110,24 +110,45 @@ static int subscribe_unsubscribe_signal(struct afb_req request, bool subscribe,
 }
 
 /**
- * @fn static int subscribe_unsubscribe_signals(struct afb_req request, bool subscribe, const std::vector<CanSignal>& signals)
+ * @fn static int subscribe_unsubscribe_signals(struct afb_req request, bool subscribe, const std::vector<can_signal_t>& signals)
  * @brief subscribe to all signals in the vector signals
  *
  * @param[in] afb_req request : contain original request use to subscribe or unsubscribe
  * @param[in] subscribe boolean value used to chose between a subscription operation or an unsubscription
- * @param[in] CanSignal  vector with CanSignal to subscribe
+ * @param[in] can_signal_t  vector with can_signal_t to subscribe
  *
  * @return Number of correctly subscribed signal
  */
 static int subscribe_unsubscribe_signals(struct afb_req request, bool subscribe, const std::vector<std::string>& signals)
 {
        int rets = 0;
+       sd_event_source *source;
+
+       //TODO: Implement way to dynamically call the right function no matter 
+       // how much signals types we have.
+       /// const std::string& can_prefix = configuration_t::instance().get_can_signals().front().get_prefix();
+       const std::string& obd2_prefix = configuration_t::instance().get_obd2_signals().front().get_prefix();
 
-       for(auto& sig : signals)
+       for(const std::string& sig : signals)
        {
-               int ret = subscribe_unsubscribe_signal(request, subscribe, sig);
+               int ret;
+               if (sig.find_first_of(obd2_prefix.c_str(), 0, obd2_prefix.size()))
+               {
+                       std::vector<obd2_signal_t*> found;
+                       configuration_t::instance().find_obd2_signals(build_DynamicField(sig), found);
+                       int frequency = found.front()->get_frequency();
+                       DiagnosticRequest* diag_req = new DiagnosticRequest(found.front()->build_diagnostic_request());
+                       configuration_t::instance().get_diagnostic_manager().add_recurring_request(
+                               diag_req, sig.c_str(), false, obd2_signal_t::decode_obd2_response, nullptr, (float)frequency);
+                               //TODO: Adding callback requesting ignition status:     diag_req, sig.c_str(), false, obd2_signal_t::decode_obd2_response, obd2_signal_t::check_ignition_status, frequency);
+                       sd_event_add_time(afb_daemon_get_event_loop(binder_interface->daemon), &source, CLOCK_MONOTONIC, frequency, 0,
+                                                               configuration_t::instance().get_diagnostic_manager().send_request, diag_req);
+               }
+
+               ret = subscribe_unsubscribe_signal(request, subscribe, sig);
                if(ret <= 0)
                        return ret;
+
                rets++;
                DEBUG(binder_interface, "Signal: %s subscribed", sig.c_str());
        }
@@ -222,18 +243,19 @@ extern "C"
        */
        int afbBindingV1ServiceInit(struct afb_service service)
        {
-               int fd_conf;
-               fd_conf = afb_daemon_rootdir_open_locale(binder_interface->daemon, "can_buses.json", O_RDONLY, NULL);
+               can_bus_t& can_bus_manager = configuration_t::instance().get_can_bus_manager();
 
-               /* Initialize the CAN bus handler */
-               can_bus_handler = new can_bus_t(fd_conf);
-
-               /* Open CAN socket */
-               if(can_bus_handler->init_can_dev() == 0)
+               /// Initialize CAN socket
+               if(can_bus_manager.init_can_dev() == 0)
                {
-                       can_bus_handler->start_threads();
+                       can_bus_manager.start_threads();
                        return 0;
                }
+
+               /// Initialize Diagnostic manager that will handle obd2 requests
+               diagnostic_manager_t& diag_manager = configuration_t::instance().get_diagnostic_manager();
+               diag_manager.initialize(can_bus_manager.get_can_devices().front());
+
                ERROR(binder_interface, "There was something wrong with CAN device Initialization. Check your config file maybe");
                return 1;
        }