From: Romain Forlot <romain.forlot@iot.bzh>
Date: Thu, 21 Nov 2019 16:59:07 +0000 (+0100)
Subject: message: Correctly detect extended CAN id.
X-Git-Tag: 8.99.5~59
X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F25%2F23225%2F6;hp=a4b14ff6fbd637f709eb874ee856974a5d764d63;p=apps%2Fagl-service-can-low-level.git

message: Correctly detect extended CAN id.

Previous test was always true. This fix the wrong test and then
add the EFF flag correctly on messages using extended
CAN id.

Bug-AGL: SPEC-2988

Change-Id: I69686fd3d5a39ea3a0d1980b4bfa88fe36fb7fe5
Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
---

diff --git a/low-can-binding/can/message-definition.cpp b/low-can-binding/can/message-definition.cpp
index 63541277..e6fd862f 100644
--- a/low-can-binding/can/message-definition.cpp
+++ b/low-can-binding/can/message-definition.cpp
@@ -72,9 +72,7 @@ const std::string message_definition_t::get_name() const{
 
 uint32_t message_definition_t::get_id() const
 {
-	return id_ & CAN_EFF_MASK ?
-		id_ | CAN_EFF_FLAG :
-		id_;
+	return ((id_ & CAN_SFF_MASK) != id_) ? id_ | CAN_EFF_FLAG : id_;
 }
 
 bool message_definition_t::is_fd() const