diff options
author | Romain Forlot <romain.forlot@iot.bzh> | 2017-05-10 09:49:13 +0200 |
---|---|---|
committer | Romain Forlot <romain.forlot@iot.bzh> | 2017-05-10 18:45:55 +0200 |
commit | 613d8daa7ce886365602d87458943975c411236a (patch) | |
tree | 04536c4fc08a958e3bf0e63f49c8d5710c5709ca /CAN-binder/low-can-binding/utils/socketcan-raw.cpp | |
parent | 4e95381b037b783b5f4193134732cb96ff6f52cf (diff) |
Move reading input stream to specialized socket class.
We always read the same object so how to fill it is the job of specialized class
not a generic method can do that.
Change-Id: Ia262871cec6b7ed3341eb314d5ed6641b8da61e6
Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
Diffstat (limited to 'CAN-binder/low-can-binding/utils/socketcan-raw.cpp')
-rw-r--r-- | CAN-binder/low-can-binding/utils/socketcan-raw.cpp | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/CAN-binder/low-can-binding/utils/socketcan-raw.cpp b/CAN-binder/low-can-binding/utils/socketcan-raw.cpp index 589f6abc..d8cd906f 100644 --- a/CAN-binder/low-can-binding/utils/socketcan-raw.cpp +++ b/CAN-binder/low-can-binding/utils/socketcan-raw.cpp @@ -61,4 +61,25 @@ namespace utils } return socket_; } + + socketcan_raw_t& operator>>(socketcan_raw_t& s, can_message_t& cm) + { + struct canfd_frame frame; + + const struct sockaddr_can& addr = s.get_tx_address(); + socklen_t addrlen = sizeof(addr); + struct ifreq ifr; + + ssize_t nbytes = ::recvfrom(s.socket(), &frame, sizeof(frame), 0, (struct sockaddr*)&addr, &addrlen); + ifr.ifr_ifindex = addr.can_ifindex; + ioctl(s.socket(), SIOCGIFNAME, &ifr); + + DEBUG(binder_interface, "Data available: %i bytes read", (int)nbytes); + DEBUG(binder_interface, "read: Found on bus %s:\n id: %X, length: %X, data %02X%02X%02X%02X%02X%02X%02X%02X", ifr.ifr_name, frame.can_id, frame.len, + frame.data[0], frame.data[1], frame.data[2], frame.data[3], frame.data[4], frame.data[5], frame.data[6], frame.data[7]); + + cm = ::can_message_t::convert_from_frame(frame , nbytes); + + return s; + } }
\ No newline at end of file |