Code Review
/
apps
/
agl-service-can-low-level.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
misc: Some cleanup and fixes about signatures.
[apps/agl-service-can-low-level.git]
/
low-can-binding
/
utils
/
socketcan-j1939
/
socketcan-j1939.cpp
diff --git
a/low-can-binding/utils/socketcan-j1939/socketcan-j1939.cpp
b/low-can-binding/utils/socketcan-j1939/socketcan-j1939.cpp
index
3816325
..
e8d85b5
100644
(file)
--- a/
low-can-binding/utils/socketcan-j1939/socketcan-j1939.cpp
+++ b/
low-can-binding/utils/socketcan-j1939/socketcan-j1939.cpp
@@
-168,6
+168,8
@@
namespace utils
{
socket_ = socketcan_t::open(PF_CAN, SOCK_DGRAM, CAN_J1939);
{
socket_ = socketcan_t::open(PF_CAN, SOCK_DGRAM, CAN_J1939);
+ if (socket_ < 0)
+ return socket_;
define_tx_address(device_name, name, pgn, addr);
define_tx_address(device_name, name, pgn, addr);
@@
-209,8
+211,6
@@
namespace utils
if(nbytes < 0)
return nullptr;
if(nbytes < 0)
return nullptr;
- //AFB_DEBUG("Data available: %i bytes read", (int)nbytes);
-
struct timeval tv;
ioctl(socket(), SIOCGSTAMP, &tv);
uint64_t timestamp = 1000000 * tv.tv_sec + tv.tv_usec;
struct timeval tv;
ioctl(socket(), SIOCGSTAMP, &tv);
uint64_t timestamp = 1000000 * tv.tv_sec + tv.tv_usec;