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 <romain.forlot@iot.bzh>
int read(sd_event_source *s, int fd, uint32_t revents, void *userdata)
{
can_signal_t* sig= (can_signal_t*)userdata;
- if(sig->read_socket() != can_message_format_t::ERROR)
- return 0;
- return -1;
+ sig->read_socket();
+
+ /* check if error or hangup */
+ if ((revents & (EPOLLERR|EPOLLRDHUP|EPOLLHUP)) != 0)
+ {
+ sd_event_source_unref(s);
+ sig->get_socket().close();
+ sig->create_rx_filter();
+ }
+ return 0;
}
///******************************************************************************
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();
std::lock_guard<std::mutex> 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
void set_last_value(float val);
int create_rx_filter();
- can_message_format_t read_socket();
+ void read_socket();
};
\ No newline at end of file