j1939: Follow updates of the kernel

[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 05367b7..4bdf318 100644 (file)
--- a/low-can-binding/binding/low-can-subscription.cpp
+++ b/low-can-binding/binding/low-can-subscription.cpp
@@ -254,6 +254,11 @@ float low_can_subscription_t::get_max() const
        return event_filter_.max;
 }
 
+bool low_can_subscription_t::get_promisc() const
+{
+       return event_filter_.promisc;
+}
+
 /**
  * @brief Getter of the rx_id of the event_filter
  *
@@ -314,6 +319,11 @@ void low_can_subscription_t::set_max(float max)
        event_filter_.max = max;
 }
 
+void low_can_subscription_t::set_promisc(bool promisc)
+{
+       event_filter_.promisc = promisc;
+}
+
 /**
  * @brief Setter for the rx_id of the event_filter
  *
@@ -370,7 +380,7 @@ int low_can_subscription_t::open_socket(low_can_subscription_t &subscription, co
                        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);
 
@@ -409,30 +419,32 @@ int low_can_subscription_t::open_socket(low_can_subscription_t &subscription, co
                else if(flags & J1939_ADDR_CLAIM_PROTOCOL)
                {
                        pgn_t pgn = J1939_NO_PGN;
+                       std::shared_ptr<utils::socketcan_j1939_addressclaiming_t> socket = std::make_shared<utils::socketcan_j1939_addressclaiming_t>();
                        if(!bus_name.empty())
                        {
-                               std::shared_ptr<utils::socketcan_j1939_addressclaiming_t> socket = std::make_shared<utils::socketcan_j1939_addressclaiming_t>();
                                ret = socket->open(bus_name, pgn);
-                               subscription.socket_ = socket;
                        }
+                       subscription.socket_ = socket;
                        subscription.index_ = (int)subscription.socket_->socket();
                }
                else if(flags & J1939_PROTOCOL)
                {
                        pgn_t pgn = J1939_NO_PGN;
+                       std::shared_ptr<utils::socketcan_j1939_data_t> socket = std::make_shared<utils::socketcan_j1939_data_t>();
                        if(subscription.signal_)
                        {
                                pgn = subscription.signal_->get_message()->get_id();
-                               std::shared_ptr<utils::socketcan_j1939_data_t> socket = std::make_shared<utils::socketcan_j1939_data_t>();
                                ret = socket->open(subscription.signal_->get_message()->get_bus_device_name(), pgn);
-                               subscription.socket_ = socket;
                        }
                        else if(!bus_name.empty())
                        {
-                               std::shared_ptr<utils::socketcan_j1939_data_t> socket = std::make_shared<utils::socketcan_j1939_data_t>();
                                ret = socket->open(bus_name, pgn);
-                               subscription.socket_ = socket;
                        }
+
+                       if(ret)
+                               socket->define_opt(!j1939_pgn_is_pdu1(pgn),subscription.event_filter_.promisc);
+
+                       subscription.socket_ = socket;
                        subscription.index_ = (int)subscription.socket_->socket();
                }
 #endif
@@ -648,7 +660,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);
@@ -669,13 +680,11 @@ int low_can_subscription_t::create_rx_filter_bcm(low_can_subscription_t &subscri
        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);
@@ -714,8 +723,6 @@ int low_can_subscription_t::tx_send(low_can_subscription_t &subscription, messag
 
        struct bcm_msg &bcm_cm = cm->get_bcm_msg();
 
-
-
        if(cfd_vect.size() > 1)
        {
                AFB_ERROR("Multi frame BCM not implemented");