X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=low-can-binding%2Futils%2Fsocketcan-bcm.cpp;h=e992ccbe5eee29b359f5bcb4aff8c986735ab965;hb=7ea53d8a89912cd0ab00fa4c0957f40ee6c9db8a;hp=0f6bc75ca2af059bdf13fe21db6dd84151c8a544;hpb=d2d2620bbb8f0aad0181e67e9f6affc3d6cb4a51;p=apps%2Fagl-service-can-low-level.git

diff --git a/low-can-binding/utils/socketcan-bcm.cpp b/low-can-binding/utils/socketcan-bcm.cpp
index 0f6bc75c..e992ccbe 100644
--- a/low-can-binding/utils/socketcan-bcm.cpp
+++ b/low-can-binding/utils/socketcan-bcm.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015, 2016 ,2017 "IoT.bzh"
+ * Copyright (C) 2015, 2016 , 2017, 2018, 2019 "IoT\.bzh"
  * Author "Romain Forlot" <romain.forlot@iot.bzh>
  * Author "Loïc Collignon" <loic.collignon@iot.bzh>
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -25,12 +25,6 @@
 
 namespace utils
 {
-	/// @brief Connect the socket.
-	/// @return 0 if success.
-	int socketcan_bcm_t::connect(const struct sockaddr* addr, socklen_t len)
-	{
-		return socket_ != INVALID_SOCKET ? ::connect(socket_, addr, len) : 0;
-	}
 
  	/// @brief Open a raw socket CAN.
 	/// @param[in] device_name is the kernel network device name of the CAN interface.
@@ -104,19 +98,19 @@ namespace utils
 		return cm;
 	}
 
-	void socketcan_bcm_t::write_message(std::vector<std::shared_ptr<message_t>>& vobj)
+	int socketcan_bcm_t::write_message(message_t& m)
 	{
-		for(const auto& obj : vobj)
-			write_message(obj);
-	}
 
-	void socketcan_bcm_t::write_message(std::shared_ptr<message_t> m)
-	{
-		struct bcm_msg obj = m->get_bcm_msg();
+		can_message_t&  cm = reinterpret_cast<can_message_t&>(m);
+		struct bcm_msg obj = cm.get_bcm_msg();
 		size_t size = (obj.msg_head.flags & CAN_FD_FRAME) ?
 			(size_t)((char*)&obj.fd_frames[obj.msg_head.nframes] - (char*)&obj):
 			(size_t)((char*)&obj.frames[obj.msg_head.nframes] - (char*)&obj);
 		if (::sendto(socket(), &obj, size, 0, (const struct sockaddr*)&get_tx_address(), sizeof(get_tx_address())) < 0)
-			AFB_API_ERROR(afbBindingV3root, "Error sending : %i %s", errno, ::strerror(errno));
+		{
+			AFB_ERROR("Error sending : %i %s", errno, ::strerror(errno));
+			return -1;
+		}
+		return 0;
 	}
 }