X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=CAN-binder%2Flow-can-binding%2Futils%2Fsocketcan.hpp;h=3c02a4fa535b49f860cbc003a2d389241235d2db;hb=7679cd97dc4c20103f8afb364437dbcfd359befc;hp=a66e259a0f0698c7557847d5ed8e4e5488d35b44;hpb=454e4f65caca85395a5ca79814d6ca333dd5ae6b;p=apps%2Fagl-service-can-low-level.git

diff --git a/CAN-binder/low-can-binding/utils/socketcan.hpp b/CAN-binder/low-can-binding/utils/socketcan.hpp
index a66e259a..3c02a4fa 100644
--- a/CAN-binder/low-can-binding/utils/socketcan.hpp
+++ b/CAN-binder/low-can-binding/utils/socketcan.hpp
@@ -24,48 +24,33 @@
 #include <string.h>
 
 #include "../can/can-message.hpp"
-#include "low-can-binding.hpp"
+#include "../low-can-binding.hpp"
 
 #define INVALID_SOCKET -1
 
 namespace utils
 {
-	struct simple_bcm_msg
-	{
-		struct bcm_msg_head msg_head;
-		struct can_frame frames;
-	};
-
-	struct canfd_bcm_msg
-	{
-		struct bcm_msg_head msg_head;
-		struct canfd_frame frames;
-		canfd_bcm_msg() { msg_head.flags |= CAN_FD_FRAME; }
-	};
-
 	class socketcan_t
 	{
 	public:
 		socketcan_t();
-		socketcan_t(const socketcan_t&) = delete;
+		socketcan_t(const socketcan_t&);
 		socketcan_t(socketcan_t&&);
-		~socketcan_t();
+		virtual ~socketcan_t();
 
 		const struct sockaddr_can& get_tx_address() const;
 		explicit operator bool() const;
 
 		int socket() const;
-		int open(std::string device_name);
+		virtual int open(std::string device_name) = 0;
 		int setopt(int level, int optname, const void* optval, socklen_t optlen);
 		int close();
 
-	private:
+	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);
 	};
 
 	template <typename T>
@@ -83,9 +68,6 @@ namespace utils
 			ERROR(binder_interface, "%s: Error sending : %i %s", __FUNCTION__, errno, ::strerror(errno));
 		return s;
 	}
-	
-	socketcan_t& operator<<(socketcan_t& s, const struct simple_bcm_msg& obj);
-	socketcan_t& operator<<(socketcan_t& s, const struct canfd_bcm_msg& obj);
 
 	socketcan_t& operator>>(socketcan_t& s, can_message_t& cm);
 }