X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=low-can-binding%2Fbinding%2Flow-can-subscription.cpp;h=4bdf3181a0380948ba383a7836b49ad6c7797a6d;hb=475e6c277fd6863545e44fe560b2657ab042ab8b;hp=1e22d260a62888fd72f5019ad80963efbb5c63ad;hpb=bdde88e49b303bb310609eee13e13c8b99a2ab09;p=apps%2Fagl-service-can-low-level.git

diff --git a/low-can-binding/binding/low-can-subscription.cpp b/low-can-binding/binding/low-can-subscription.cpp
index 1e22d260..4bdf3181 100644
--- 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
  *
@@ -364,13 +374,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_bus());
+				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);
 
@@ -394,12 +404,12 @@ int low_can_subscription_t::open_socket(low_can_subscription_t &subscription, co
 					rx = subscription.signal_->get_message()->get_id();
 					tx = subscription.get_tx_id();
 				}
-				ret = socket->open(subscription.signal_->get_message()->get_bus_device_name(),rx,tx);
+				ret = socket->open(subscription.signal_->get_message()->get_bus_device_name(), rx, tx);
 				subscription.socket_ = socket;
 			}
 			else if(! bus_name.empty())
 			{
-				ret = socket->open(bus_name, subscription.get_rx_id(),subscription.get_tx_id());
+				ret = socket->open(bus_name, subscription.get_rx_id(), subscription.get_tx_id());
 				subscription.socket_ = socket;
 			}
 			subscription.index_ = (int)subscription.socket_->socket();
@@ -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;
-			if(subscription.signal_ != nullptr)
+			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
@@ -495,7 +507,7 @@ void low_can_subscription_t::add_one_bcm_frame(struct canfd_frame& cfd, struct b
 void low_can_subscription_t::remove_last_bcm_frame(struct bcm_msg& bcm_msg)
 {
 	struct canfd_frame cf;
-	memset(&cf,0,sizeof(cf));
+	memset(&cf, 0, sizeof(cf));
 	bcm_msg.fd_frames[bcm_msg.msg_head.nframes] = cf;
 	bcm_msg.msg_head.nframes--;
 }
@@ -514,9 +526,8 @@ int low_can_subscription_t::create_rx_filter_j1939(low_can_subscription_t &subsc
 
 	// Make sure that socket is opened.
 	if(open_socket(subscription, "", J1939_PROTOCOL) < 0)
-	{
 			return -1;
-	}
+
 	return 0;
 }
 #endif
@@ -534,9 +545,8 @@ int low_can_subscription_t::create_rx_filter_isotp(low_can_subscription_t &subsc
 
 	// Make sure that socket is opened.
 	if(open_socket(subscription, "", ISOTP_PROTOCOL|ISOTP_RECEIVE) < 0)
-	{
 			return -1;
-	}
+
 	return 0;
 }
 
@@ -624,7 +634,7 @@ int low_can_subscription_t::create_rx_filter(std::shared_ptr<signal_t> sig)
 #ifdef USE_FEATURE_ISOTP
 	else if(sig->get_message()->is_isotp())
 	{
-		return low_can_subscription_t::create_rx_filter_isotp(*this,sig);
+		return low_can_subscription_t::create_rx_filter_isotp(*this, sig);
 	}
 #endif
 #ifdef USE_FEATURE_J1939
@@ -650,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);
@@ -668,21 +677,19 @@ 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)
-		{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.
+	if(subscription.open_socket(subscription, "", CAN_PROTOCOL) < 0)
+		return -1;
 
 	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);
-			if(! subscription.socket_)
-				return -1;
+		if(! subscription.socket_)
+			return -1;
 	}
 	else
 	{
@@ -706,20 +713,16 @@ int low_can_subscription_t::tx_send(low_can_subscription_t &subscription, messag
 {
 	can_message_t *cm = static_cast<can_message_t*>(message);
 
-	struct bcm_msg bcm_msg = subscription.make_bcm_head(TX_SEND, cm->get_id(),cm->get_flags()|TX_CP_CAN_ID); // TX_CP_CAN_ID -> copy in cfd the id of bcm
+	struct bcm_msg bcm_msg = subscription.make_bcm_head(TX_SEND, cm->get_id(), cm->get_flags()|TX_CP_CAN_ID); // TX_CP_CAN_ID -> copy in cfd the id of bcm
 	cm->set_bcm_msg(bcm_msg);
 
 	std::vector<canfd_frame> cfd_vect = cm->convert_to_canfd_frame_vector();
 
-	if(subscription.open_socket(subscription, bus_name, BCM_PROTOCOL) < 0)
-	{
-			return -1;
-	}
+	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");
@@ -742,9 +745,7 @@ int low_can_subscription_t::tx_send(low_can_subscription_t &subscription, messag
 	}
 
 	if(! subscription.socket_.get())
-	{
-			return -1;
-	}
+		return -1;
 
 	return 0;
 }
@@ -764,9 +765,7 @@ int low_can_subscription_t::j1939_send(low_can_subscription_t &subscription, mes
 	//subscription.add_one_bcm_frame(cfd, bcm_msg);
 
 	if(subscription.open_socket(subscription, bus_name, J1939_PROTOCOL) < 0)
-	{
 		return -1;
-	}
 
 	j1939_message_t *jm = static_cast<j1939_message_t*>(message);
 	jm->set_sockname(jm->get_pgn(), J1939_NO_NAME, J1939_NO_ADDR);
@@ -795,9 +794,7 @@ int low_can_subscription_t::isotp_send(low_can_subscription_t &subscription, mes
 	//subscription.add_one_bcm_frame(cfd, bcm_msg);
 
 	if(subscription.open_socket(subscription, bus_name, ISOTP_PROTOCOL|ISOTP_SEND) < 0)
-	{
 		return -1;
-	}
 
 	can_message_t *cm = static_cast<can_message_t*>(message);
 	if(subscription.socket_->write_message(*cm) < 0)