From a261e68d0dd32a03fdf42522e6d2c8259ba0f3d1 Mon Sep 17 00:00:00 2001 From: Romain Forlot Date: Tue, 9 May 2017 16:48:49 +0200 Subject: Fix: Avoid returning negative value that's stop watch socket Even if the frame read is wrong doesn't mean that socket is compromise only that communication on CAN bus is difficult, maybe temporary. On en EPOLL err code, or hangup, just close and restart the socket and reset the filter. Change-Id: I61f146fd269bb2524f09e1f2ed89d93e83166136 Signed-off-by: Romain Forlot --- CAN-binder/low-can-binding/can/can-signals.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'CAN-binder/low-can-binding/can/can-signals.cpp') diff --git a/CAN-binder/low-can-binding/can/can-signals.cpp b/CAN-binder/low-can-binding/can/can-signals.cpp index c8098a51..d072fb36 100644 --- a/CAN-binder/low-can-binding/can/can-signals.cpp +++ b/CAN-binder/low-can-binding/can/can-signals.cpp @@ -235,7 +235,7 @@ int can_signal_t::create_rx_filter() return -1; } -can_message_format_t can_signal_t::read_socket() +void can_signal_t::read_socket() { can_message_t msg; can_bus_t& cbm = configuration_t::instance().get_can_bus_manager(); @@ -243,6 +243,4 @@ can_message_format_t can_signal_t::read_socket() std::lock_guard can_message_lock(cbm.get_can_message_mutex()); { cbm.push_new_can_message(msg); } cbm.get_new_can_message_cv().notify_one(); - - return msg.get_format(); } \ No newline at end of file -- cgit 1.2.3-korg