init: Fix wrong diagnostic bus name returned.

[apps/agl-service-can-low-level.git] / low-can-binding / binding / low-can-subscription.cpp

diff --git a/low-can-binding/binding/low-can-subscription.cpp b/low-can-binding/binding/low-can-subscription.cpp
index 73ca279..3cbcb6c 100644 (file)
--- a/low-can-binding/binding/low-can-subscription.cpp
+++ b/low-can-binding/binding/low-can-subscription.cpp
@@ -364,13 +364,13 @@ int low_can_subscription_t::open_socket(low_can_subscription_t &subscription, co
        int ret = -1;
        if(! subscription.socket_)
        {
-               if(flags & BCM_PROTOCOL)
+               if(flags & CAN_PROTOCOL)
                {
                        subscription.socket_ = std::make_shared<utils::socketcan_bcm_t>();
                        if( subscription.signal_ )
                                ret = subscription.socket_->open(subscription.signal_->get_message()->get_bus_device_name());
                        else if(! subscription.diagnostic_message_.empty())
-                               ret = subscription.socket_->open(application_t::instance().get_diagnostic_manager().get_bus_name());
+                               ret = subscription.socket_->open(application_t::instance().get_diagnostic_manager().get_bus_device_name());
                        else if(! bus_name.empty())
                                ret = subscription.socket_->open(bus_name);
 
@@ -648,7 +648,6 @@ int low_can_subscription_t::create_rx_filter(std::shared_ptr<diagnostic_message_
        diagnostic_message_.push_back(sig);
 
        struct timeval freq = frequency_clock_t(event_filter_.frequency).get_timeval_from_period();
-       //struct timeval timeout = frequency_clock_t(10).get_timeval_from_period();
        struct timeval timeout = {0, 0};
 
        struct bcm_msg bcm_msg =  make_bcm_head(RX_SETUP, OBD2_FUNCTIONAL_BROADCAST_ID, SETTIMER | RX_NO_AUTOTIMER | RX_FILTER_ID, timeout, freq);
@@ -666,16 +665,14 @@ int low_can_subscription_t::create_rx_filter(std::shared_ptr<diagnostic_message_
 int low_can_subscription_t::create_rx_filter_bcm(low_can_subscription_t &subscription, struct bcm_msg& bcm_msg)
 {
        // Make sure that socket is opened.
-       if(subscription.open_socket(subscription, "", BCM_PROTOCOL) < 0)
+       if(subscription.open_socket(subscription, "", CAN_PROTOCOL) < 0)
                return -1;
 
-       // If it's not an OBD2 CAN ID then just add a simple RX_SETUP job
-       // else monitor all standard 8 CAN OBD2 ID response.
-
        can_message_t msg = can_message_t();
-
        msg.set_bcm_msg(bcm_msg);
 
+       // If it's not an OBD2 CAN ID then just add a simple RX_SETUP job
+       // else monitor all standard 8 CAN OBD2 ID response.
        if(bcm_msg.msg_head.can_id != OBD2_FUNCTIONAL_BROADCAST_ID)
        {
                subscription.socket_->write_message(msg);
@@ -709,13 +706,11 @@ int low_can_subscription_t::tx_send(low_can_subscription_t &subscription, messag
 
        std::vector<canfd_frame> cfd_vect = cm->convert_to_canfd_frame_vector();
 
-       if(subscription.open_socket(subscription, bus_name, BCM_PROTOCOL) < 0)
+       if(subscription.open_socket(subscription, bus_name, CAN_PROTOCOL) < 0)
                return -1;
 
        struct bcm_msg &bcm_cm = cm->get_bcm_msg();
 
-
-
        if(cfd_vect.size() > 1)
        {
                AFB_ERROR("Multi frame BCM not implemented");
@@ -738,9 +733,7 @@ int low_can_subscription_t::tx_send(low_can_subscription_t &subscription, messag
        }
 
        if(! subscription.socket_.get())
-       {
-                       return -1;
-       }
+               return -1;
 
        return 0;
 }