X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=low-can-binding%2Fbinding%2Flow-can-subscription.cpp;h=8b5f302eedbc44df04a70564563e2d7b006cb6c7;hb=64691cf96f9c4d7ff59dbd49e1fe01d26c1a00f6;hp=e9ee198b373a19cb3d7642449109274bd2146314;hpb=c9f3b54ab16992bf4cd878618ccbf3e77891299a;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 e9ee198b..8b5f302e 100644
--- a/low-can-binding/binding/low-can-subscription.cpp
+++ b/low-can-binding/binding/low-can-subscription.cpp
@@ -366,27 +366,21 @@ int low_can_subscription_t::open_socket(low_can_subscription_t &subscription, co
 	{
 		if(flags & BCM_PROTOCOL)
 		{
-			if( subscription.signal_ != nullptr)
-			{
-					subscription.socket_ = std::make_shared<utils::socketcan_bcm_t>();
-					ret = subscription.socket_->open(subscription.signal_->get_message()->get_bus_device_name());
-			}
-			else if (! subscription.diagnostic_message_ .empty())
-			{
-					subscription.socket_ = std::make_shared<utils::socketcan_bcm_t>();
-					ret = subscription.socket_->open(application_t::instance().get_diagnostic_manager().get_bus_device_name());
-			}
-			else if ( !bus_name.empty())
-			{
-					subscription.socket_ = std::make_shared<utils::socketcan_bcm_t>();
-					ret = subscription.socket_->open(bus_name);
-			}
+			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());
+			else if(! bus_name.empty())
+				ret = subscription.socket_->open(bus_name);
+
 			subscription.index_ = (int)subscription.socket_->socket();
 		}
 #ifdef USE_FEATURE_ISOTP
 		else if(flags & ISOTP_PROTOCOL)
 		{
-			if(subscription.signal_ != nullptr)
+			std::shared_ptr<utils::socketcan_isotp_t> socket = std::make_shared<utils::socketcan_isotp_t>();
+			if(subscription.signal_ )
 			{
 				canid_t rx = NO_CAN_ID;
 				canid_t tx = NO_CAN_ID;
@@ -400,13 +394,11 @@ 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();
 				}
-				std::shared_ptr<utils::socketcan_isotp_t> socket = std::make_shared<utils::socketcan_isotp_t>();
 				ret = socket->open(subscription.signal_->get_message()->get_bus_device_name(),rx,tx);
 				subscription.socket_ = socket;
 			}
-			else if(!bus_name.empty())
+			else if(! bus_name.empty())
 			{
-				std::shared_ptr<utils::socketcan_isotp_t> socket = std::make_shared<utils::socketcan_isotp_t>();
 				ret = socket->open(bus_name, subscription.get_rx_id(),subscription.get_tx_id());
 				subscription.socket_ = socket;
 			}
@@ -522,9 +514,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
@@ -542,9 +533,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;
 }
 
@@ -632,7 +622,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
@@ -677,7 +667,7 @@ int low_can_subscription_t::create_rx_filter_bcm(low_can_subscription_t &subscri
 {
 	// Make sure that socket is opened.
 	if(subscription.open_socket(subscription, "", BCM_PROTOCOL) < 0)
-		{return -1;}
+		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.
@@ -689,8 +679,8 @@ int low_can_subscription_t::create_rx_filter_bcm(low_can_subscription_t &subscri
 	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
 	{
@@ -720,9 +710,7 @@ 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)
-	{
-			return -1;
-	}
+		return -1;
 
 	struct bcm_msg &bcm_cm = cm->get_bcm_msg();
 
@@ -750,9 +738,7 @@ int low_can_subscription_t::tx_send(low_can_subscription_t &subscription, messag
 	}
 
 	if(! subscription.socket_.get())
-	{
-			return -1;
-	}
+		return -1;
 
 	return 0;
 }
@@ -772,9 +758,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);
@@ -803,9 +787,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)