fix: test for opened CAN socket.

[apps/agl-service-can-low-level.git] / src / can / can-bus-dev.cpp

diff --git a/src/can/can-bus-dev.cpp b/src/can/can-bus-dev.cpp
index 87d7bf5..5c8673c 100644 (file)
--- a/src/can/can-bus-dev.cpp
+++ b/src/can/can-bus-dev.cpp
@@ -29,13 +29,17 @@
 
 #include "can-bus.hpp"
 #include "can-message.hpp"
-#include "low-can-binding.hpp"
+#include "../low-can-binding.hpp"
 
 /// @brief Class constructor
 /// @param dev_name String representing the device name into the linux /dev tree
-can_bus_dev_t::can_bus_dev_t(const std::string& dev_name)
-       : device_name_{dev_name}
+can_bus_dev_t::can_bus_dev_t(const std::string& dev_name, int32_t address)
+       : device_name_{dev_name}, address_{address}
+{}
+
+std::string can_bus_dev_t::get_device_name() const
 {
+       return device_name_;
 }
 
 /// @brief Open the can socket and returning it
@@ -96,7 +100,7 @@ int can_bus_dev_t::open()
                }
                close();
        }
-       else ERROR(binder_interface, "socket could not be created. Error was : %s", ::strerror(errno));
+       else ERROR(binder_interface, "open: socket could not be created. Error was : %s", ::strerror(errno));
        return -1;
 }
 
@@ -113,9 +117,9 @@ can_message_t can_bus_dev_t::read()
        struct canfd_frame cfd;
 
        // Test that socket is really opened
-       if (can_socket_)
+       if (!can_socket_)
        {
-               ERROR(binder_interface, "read_can: Socket unavailable. Closing thread.");
+               ERROR(binder_interface, "read: Socket unavailable. Closing thread.");
                is_running_ = false;
        }
 
@@ -176,7 +180,7 @@ int can_bus_dev_t::send(can_message_t& can_msg)
 
        f = can_msg.convert_to_canfd_frame();
 
-       if(can_socket_.socket())
+       if(can_socket_)
        {
                nbytes = ::sendto(can_socket_.socket(), &f, sizeof(struct canfd_frame), 0,
                        (struct sockaddr*)&txAddress_, sizeof(txAddress_));
@@ -207,7 +211,7 @@ bool can_bus_dev_t::shims_send(const uint32_t arbitration_id, const uint8_t* dat
        f.len = size;
        ::memcpy(f.data, data, size);
 
-       if(can_socket_.socket())
+       if(can_socket_)
        {
                nbytes = ::sendto(can_socket_.socket(), &f, sizeof(struct canfd_frame), 0,
                        (struct sockaddr*)&txAddress_, sizeof(txAddress_));