- if (!::strcmp(name, "*"))
- ret = subscribe_unsubscribe_all(request, subscribe);
- else
- {
- //if(obd2_handler_c.is_obd2_signal(name))
- if(false)
- {
- // TODO
- }
- else
- {
- openxc_DynamicField search_key = build_DynamicField(std::string(name));
- sig = find_can_signals(search_key);
- if (sig.empty())
- ret = 0;
- }
- ret = subscribe_unsubscribe_signals(request, subscribe, sig);
- NOTICE(binder_interface, "Subscribed correctly to %d/%d signal(s).", ret, (int)sig.size());
- }
+ openxc_DynamicField search_key = build_DynamicField(std::string(name));
+ signals = find_signals(search_key);
+ if (signals.empty())
+ ret = 0;
+
+ ret = subscribe_unsubscribe_signals(request, subscribe, signals);
+ NOTICE(binder_interface, "Subscribed correctly to %d/%d signal(s).", ret, (int)signals.size());
+