diff options
author | Romain Forlot <romain.forlot@iot.bzh> | 2017-03-01 17:06:17 +0100 |
---|---|---|
committer | Romain Forlot <romain.forlot@iot.bzh> | 2017-03-01 17:06:17 +0100 |
commit | d10240e4c0d05ae6ccd633f7b82cbdd48ec27d7c (patch) | |
tree | 2a01b179557949e1de3871718bf00f1b40413192 /src/can-bus.cpp | |
parent | 834d1a950d38a821284955f2732cdbb5b05ebd2a (diff) |
Fix: miss 'if' brackets to get incomplete CAN frames correctly
Fix: displaying can message frame with hexa format.
Change-Id: Iff658ac38f21a15945ed82509d4e291f0fda7503
Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
Diffstat (limited to 'src/can-bus.cpp')
-rw-r--r-- | src/can-bus.cpp | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/can-bus.cpp b/src/can-bus.cpp index 989dfa20..81dee9a7 100644 --- a/src/can-bus.cpp +++ b/src/can-bus.cpp @@ -361,7 +361,7 @@ canfd_frame can_bus_dev_t::read() { ssize_t nbytes; //int maxdlen; - canfd_frame canfd_frame; + struct canfd_frame cfd; /* Test that socket is really opened */ if (can_socket_ < 0) @@ -370,17 +370,18 @@ canfd_frame can_bus_dev_t::read() is_running_ = false; } - nbytes = ::read(can_socket_, &canfd_frame, CANFD_MTU); + nbytes = ::read(can_socket_, &cfd, CANFD_MTU); /* if we did not fit into CAN sized messages then stop_reading. */ if (nbytes != CANFD_MTU && nbytes != CAN_MTU) + { if (errno == ENETDOWN) ERROR(binder_interface, "read: %s CAN device down", device_name_); - ERROR(binder_interface, "read: Error reading CAN bus"); - ::memset(&canfd_frame, 0, sizeof(canfd_frame)); - stop_reading(); + ERROR(binder_interface, "read: Incomplete CAN(FD) frame"); + ::memset(&cfd, 0, sizeof(cfd)); + } - return canfd_frame; + return cfd; } void can_bus_dev_t::start_reading(can_bus_t& can_bus) |