X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=CAN-binder%2Flow-can-binding%2Futils%2Fsocketcan.cpp;h=5a711c3468c338c87efcc3c90005bfc1ab1bbfd1;hb=71798df5325efe6005fb87dad8a3489e656021f0;hp=486c34f658128d742bccd051f11ee719e825bb13;hpb=fdcc36f1b9dbc0cb95cf4b968823c2be4d7227d0;p=apps%2Fagl-service-can-low-level.git diff --git a/CAN-binder/low-can-binding/utils/socketcan.cpp b/CAN-binder/low-can-binding/utils/socketcan.cpp index 486c34f6..5a711c34 100644 --- a/CAN-binder/low-can-binding/utils/socketcan.cpp +++ b/CAN-binder/low-can-binding/utils/socketcan.cpp @@ -22,7 +22,6 @@ #include #include "socketcan.hpp" -#include "can-message.hpp" namespace utils { @@ -105,39 +104,6 @@ namespace utils return socket_; } - /// @brief Open a raw socket CAN. - /// @param[in] device_name is the kernel network device name of the CAN interface. - /// - /// @return Upon successful completion, shall return a non-negative integer, the socket file descriptor. Otherwise, a value of -1 shall be returned and errno set to indicate the error. - int socketcan_t::open(std::string device_name) - { - close(); - - struct ifreq ifr; - socket_ = ::socket(PF_CAN, SOCK_DGRAM, CAN_BCM); - - // Attempts to open a socket to CAN bus - ::strcpy(ifr.ifr_name, device_name.c_str()); - DEBUG(binder_interface, "%s: ifr_name is : %s", __FUNCTION__, ifr.ifr_name); - if(::ioctl(socket_, SIOCGIFINDEX, &ifr) < 0) - { - ERROR(binder_interface, "%s: ioctl failed. Error was : %s", __FUNCTION__, strerror(errno)); - close(); - } - else - { - tx_address_.can_family = AF_CAN; - tx_address_.can_ifindex = ifr.ifr_ifindex; - - if(connect((struct sockaddr *)&tx_address_, sizeof(tx_address_)) < 0) - { - ERROR(binder_interface, "%s: Connect failed. %s", __FUNCTION__, strerror(errno)); - close(); - } - } - return socket_; - } - socketcan_t& operator>>(socketcan_t& s, can_message_t& cm) { struct { @@ -161,18 +127,4 @@ namespace utils return s; } - - socketcan_t& operator<<(socketcan_t& s, const struct basic_bcm_msg& obj) - { - s << obj.msg_head; - s << obj.frames; - return s; - } - - socketcan_t& operator<<(socketcan_t& s, const struct canfd_bcm_msg& obj) - { - s << obj.msg_head; - s << obj.frames; - return s; - } } \ No newline at end of file