j1939: Following kernel updates

[apps/agl-service-can-low-level.git] / low-can-binding / utils / socketcan.hpp

diff --git a/low-can-binding/utils/socketcan.hpp b/low-can-binding/utils/socketcan.hpp
index 6419175..7b2501a 100644 (file)
--- a/low-can-binding/utils/socketcan.hpp
+++ b/low-can-binding/utils/socketcan.hpp
@@ -21,12 +21,14 @@
 
 #include <sys/socket.h>
 #include <linux/can/bcm.h>
+#include <linux/sockios.h>
 #include <string.h>
 
 #include "../binding/low-can-hat.hpp"
-#include "../can/can-message.hpp"
+#include "../can/message/can-message.hpp"
 
 #define INVALID_SOCKET -1
+#define NO_CAN_ID 0xFFFFFFFFU
 
 namespace utils
 {
@@ -47,15 +49,15 @@ namespace utils
                virtual int open(std::string device_name) = 0;
                int setopt(int level, int optname, const void* optval, socklen_t optlen);
                virtual int close();
-               virtual std::shared_ptr<can_message_t> read_message() = 0;
-               virtual void write_message(std::shared_ptr<can_message_t> obj) = 0;
-               virtual void write_message(std::vector<std::shared_ptr<can_message_t>>& vobj) = 0;
+               virtual std::shared_ptr<message_t> read_message() = 0;
+               virtual int write_message(message_t& obj) = 0;
+               virtual int write_message(std::vector<message_t>& vobj);
 
        protected:
                int socket_;
                struct sockaddr_can tx_address_;
                int open(int domain, int type, int protocol);
+               int bind(const struct sockaddr* addr, socklen_t len);
+               int connect(const struct sockaddr* addr, socklen_t len);
        };
-
-
 }