Implement unsubscribe like subscribe.

[apps/low-level-can-service.git] / CAN-binder / low-can-binding / binding / low-can-cb.cpp

diff --git a/CAN-binder/low-can-binding/binding/low-can-cb.cpp b/CAN-binder/low-can-binding/binding/low-can-cb.cpp
index 2183893..df6795f 100644 (file)
--- a/CAN-binder/low-can-binding/binding/low-can-cb.cpp
+++ b/CAN-binder/low-can-binding/binding/low-can-cb.cpp
@@ -189,13 +189,33 @@ static int subscribe_unsubscribe_signals(struct afb_req request, bool subscribe,
                        return -1;
                }
                struct sd_event_source* e_source;
-               sd_event_add_io(afb_daemon_get_event_loop(binder_interface->daemon), &e_source, sig->get_socket().socket(), EPOLLIN, read, sig);
+               sd_event_add_io(afb_daemon_get_event_loop(binder_interface->daemon), &e_source, sig->get_socket().socket(), EPOLLIN, read, sig.get());
                rets++;
                DEBUG(binder_interface, "%s: signal: %s subscribed", __FUNCTION__, sig->get_name().c_str());
        }
        return rets;
 }
 
+static int process_args(struct afb_req request, std::vector<std::string> args, bool subscribe)
+{
+       struct utils::signals_found sf;
+       int ok = 0, total = 0;
+
+       for(const auto& sig: args)
+       {
+               openxc_DynamicField search_key = build_DynamicField(sig);
+               sf = utils::signals_manager_t::instance().find_signals(search_key);
+               total = (int)sf.can_signals.size() + (int)sf.diagnostic_messages.size();
+
+               if (sf.can_signals.empty() && sf.diagnostic_messages.empty())
+                       NOTICE(binder_interface, "%s: No signal(s) found for %s.", __FUNCTION__, sig.c_str());
+               else
+                       ok = subscribe_unsubscribe_signals(request, subscribe, sf);
+       }
+       NOTICE(binder_interface, "%s: Subscribed/unsubscribe correctly to %d/%d signal(s).", __FUNCTION__, ok, total);
+       return ok;
+}
+
 static const std::vector<std::string> parse_args_from_request(struct afb_req request, bool subscribe)
 {
        int i, n;
@@ -228,32 +248,25 @@ static const std::vector<std::string> parse_args_from_request(struct afb_req req
 void subscribe(struct afb_req request)
 {
        std::vector<std::string> args;
-       struct utils::signals_found sf;
-       int ok = 0, total = 0;
        bool subscribe = true;
 
        args = parse_args_from_request(request, subscribe);
 
-       for(const auto& sig: args)
-       {
-               openxc_DynamicField search_key = build_DynamicField(sig);
-               sf = utils::signals_manager_t::instance().find_signals(search_key);
-               total = (int)sf.can_signals.size() + (int)sf.diagnostic_messages.size();
-
-               if (sf.can_signals.empty() && sf.diagnostic_messages.empty())
-                       NOTICE(binder_interface, "%s: No signal(s) found for %s.", __FUNCTION__, sig.c_str());
-               else
-                       ok = subscribe_unsubscribe_signals(request, subscribe, sf);
-       }
-
-       NOTICE(binder_interface, "%s: Subscribed/unsubscribe correctly to %d/%d signal(s).", __FUNCTION__, ok, total);
-       if (ok > 0)
+       if (process_args(request, args, subscribe) > 0)
                afb_req_success(request, NULL, NULL);
        else
                afb_req_fail(request, "error", NULL);
 }
 
-       void unsubscribe(struct afb_req request)
+void unsubscribe(struct afb_req request)
 {
-       parse_args_from_request(request, false);
+       std::vector<std::string> args;
+       bool subscribe = false;
+       
+       args = parse_args_from_request(request, subscribe);
+
+       if (process_args(request, args, subscribe) > 0)
+               afb_req_success(request, NULL, NULL);
+       else
+               afb_req_fail(request, "error", NULL);
 }
\ No newline at end of file