X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fcan_event_push.cpp;h=07ae8d3c5e84f54c54dd89ae97c390373bf40cfa;hb=cddc9c28e3e1a242e55f68c9971d0710ada30e9f;hp=d3f4cbd6135a73050c60a8d1e21c1517a8ccc4e4;hpb=c8a9ae83b95b3105717c58e390ba216567937772;p=apps%2Fagl-service-can-low-level.git

diff --git a/src/can_event_push.cpp b/src/can_event_push.cpp
index d3f4cbd6..07ae8d3c 100644
--- a/src/can_event_push.cpp
+++ b/src/can_event_push.cpp
@@ -16,31 +16,19 @@
  * limitations under the License.
  */
 
-#include <linux/can.h>
-#include <linux/can/raw.h>
-#include <queue>
-
-#include <afb/afb-binding.h>
-
-#include "can-utils.h"
-#include "openxc-utils.hpp"
-#include "openxc.pb.h"
-#include "json-c/json.h"
+#include "can_event_push.hpp"
 
 void can_event_push(can_bus_t& can_bus)
 {
 	openxc_VehicleMessage v_message;
 	openxc_SimpleMessage s_message;
-	iterator it_event;
-
-	while(true)
+	
+	while(can_bus.has_vehicle_message())
 	{
-		if(v_message = can_bus->next_vehicle_message())
-		{
-			s_message = get_simple_message(v_msg);
-			const auto& it_event = subscribed_signals.find(s_message.name);
-			if(! it_event->end() && afb_event_is_valid(it_event->second))
-				afb_event_push(it_event->second, jsonify_simple(s_message));
-		}
+		v_message = can_bus.next_vehicle_message();
+		s_message = get_simple_message(v_message);
+		const auto& it_event = subscribed_signals.find(s_message.name);
+		if(it_event != subscribed_signals.end() && afb_event_is_valid(it_event->second))
+			afb_event_push(it_event->second, jsonify_simple(s_message));
 	}
 }