diff options
Diffstat (limited to 'CAN-binder/low-can-binding/utils/socketcan-bcm.cpp')
| -rw-r--r-- | CAN-binder/low-can-binding/utils/socketcan-bcm.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/CAN-binder/low-can-binding/utils/socketcan-bcm.cpp b/CAN-binder/low-can-binding/utils/socketcan-bcm.cpp index cab9906..116b4c5 100644 --- a/CAN-binder/low-can-binding/utils/socketcan-bcm.cpp +++ b/CAN-binder/low-can-binding/utils/socketcan-bcm.cpp @@ -17,6 +17,9 @@ #include "socketcan-bcm.hpp" +#include <net/if.h> +#include <sys/ioctl.h> + namespace utils { /// @brief Construct a default, invalid, socket. @@ -24,18 +27,15 @@ namespace utils : socketcan_t{} {} - /// @brief Construct a socket by moving an existing one. - socketcan_bcm_t::socketcan_bcm_t(socketcan_bcm_t&& s) - : socket_{s.socket_} - { - s.socket_ = INVALID_SOCKET; - } - /// @brief Destruct the socket. socketcan_bcm_t::~socketcan_bcm_t() + {} + + /// @brief Connect the socket. + /// @return 0 if success. + int socketcan_bcm_t::connect(const struct sockaddr* addr, socklen_t len) { - if(socket_ != INVALID_SOCKET) - ::close(socket_); + return socket_ != INVALID_SOCKET ? ::connect(socket_, addr, len) : 0; } /// @brief Open a raw socket CAN. @@ -47,7 +47,7 @@ namespace utils close(); struct ifreq ifr; - socket_ = open(PF_CAN, SOCK_DGRAM, CAN_BCM); + socket_ = socketcan_t::open(PF_CAN, SOCK_DGRAM, CAN_BCM); // Attempts to open a socket to CAN bus ::strcpy(ifr.ifr_name, device_name.c_str()); |