Improve log message.

[apps/agl-service-can-low-level.git] / CAN-binder / low-can-binding / utils / socketcan.cpp

diff --git a/CAN-binder/low-can-binding/utils/socketcan.cpp b/CAN-binder/low-can-binding/utils/socketcan.cpp
index 841c7ba..4d22654 100644 (file)
--- a/CAN-binder/low-can-binding/utils/socketcan.cpp
+++ b/CAN-binder/low-can-binding/utils/socketcan.cpp
@@ -83,20 +83,6 @@ namespace utils
                return socket_ != INVALID_SOCKET ? ::setsockopt(socket_, level, optname, optval, optlen) : 0;
        }
 
-       /// @brief Bind the socket.
-       /// @return 0 if success.
-       int socketcan_t::bind(const struct sockaddr* addr, socklen_t len)
-       {
-               return socket_ != INVALID_SOCKET ? ::bind(socket_, addr, len) : 0;
-       }
-
-       /// @brief Connect the socket.
-       /// @return 0 if success.
-       int socketcan_t::connect(const struct sockaddr* addr, socklen_t len)
-       {
-               return socket_ != INVALID_SOCKET ? ::connect(socket_, addr, len) : 0;
-       }
-
        /// @brief Get the file descriptor.
        /// @return The socket's file descriptor
        int socketcan_t::socket() const
@@ -104,39 +90,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 {