X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=low-can-binding%2Futils%2Fsocketcan.hpp;h=6419175d73e81d7a33ad635d981f25b1d3cfb265;hb=ed4d7bde0c6dd6d7f4812f2601e1fa2f681ed960;hp=82b797e0177826eb880f8c2faa31f433daf12c5d;hpb=32e25cbca210a359b09768537b6f443fe90a3070;p=apps%2Fagl-service-can-low-level.git diff --git a/low-can-binding/utils/socketcan.hpp b/low-can-binding/utils/socketcan.hpp index 82b797e0..6419175d 100644 --- a/low-can-binding/utils/socketcan.hpp +++ b/low-can-binding/utils/socketcan.hpp @@ -24,11 +24,13 @@ #include #include "../binding/low-can-hat.hpp" +#include "../can/can-message.hpp" #define INVALID_SOCKET -1 namespace utils { + class socketcan_t { public: @@ -44,28 +46,16 @@ namespace utils int socket() const; virtual int open(std::string device_name) = 0; int setopt(int level, int optname, const void* optval, socklen_t optlen); - int close(); + virtual int close(); + virtual std::shared_ptr read_message() = 0; + virtual void write_message(std::shared_ptr obj) = 0; + virtual void write_message(std::vector>& vobj) = 0; protected: int socket_; struct sockaddr_can tx_address_; - int open(int domain, int type, int protocol); }; - template - socketcan_t& operator<<(socketcan_t& s, const std::vector& vobj) - { - for(const auto& obj : vobj) - s << obj; - return s; - } - template - socketcan_t& operator<<(socketcan_t& s, const T& obj) - { - if (::sendto(s.socket(), &obj, sizeof(obj), 0, (const struct sockaddr*)&s.get_tx_address(), sizeof(s.get_tx_address())) < 0) - ERROR("Error sending : %i %s", errno, ::strerror(errno)); - return s; - } }