From: Romain Forlot <romain.forlot@iot.bzh>
Date: Mon, 12 Aug 2019 15:58:50 +0000 (+0200)
Subject: Fix: only one subscription could be made
X-Git-Tag: 8.99.1~26
X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=commitdiff_plain;ds=sidebyside;h=refs%2Fchanges%2F42%2F22142%2F3;hp=f846986ed6159030e5ddb3827d9f1c5e2a82742f;p=apps%2Fagl-service-can-low-level.git

Fix: only one subscription could be made

Only one subscription could be made and then only one subscriber
could receive associated events. As the relationship between events
and subscriber is not 1-1 but 1-N, so this was the mistake. Now 1 event
is created for N subscriber where before there was 1 event for 1
subscriber and subsequent subscribers could not receive same events
than the ones already subscribed.

Bug-AGL: SPEC-2726

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

diff --git a/low-can-binding/binding/low-can-cb.cpp b/low-can-binding/binding/low-can-cb.cpp
index 5fdd961e..2b630845 100644
--- a/low-can-binding/binding/low-can-cb.cpp
+++ b/low-can-binding/binding/low-can-cb.cpp
@@ -151,8 +151,7 @@ static int subscribe_unsubscribe_signal(afb_req_t request,
 		}
 
 		// Event doesn't exist , so let's create it
-		if (! subscription_exists &&
-		    (ret = can_subscription->subscribe(request)) < 0)
+		if ((ret = can_subscription->subscribe(request)) < 0)
 			return ret;
 
 		if(! subscription_exists)
diff --git a/low-can-binding/binding/low-can-subscription.cpp b/low-can-binding/binding/low-can-subscription.cpp
index bb488887..736e034a 100644
--- a/low-can-binding/binding/low-can-subscription.cpp
+++ b/low-can-binding/binding/low-can-subscription.cpp
@@ -95,8 +95,13 @@ int low_can_subscription_t::set_event()
  */
 int low_can_subscription_t::subscribe(afb_req_t request)
 {
-	if(set_event() < 0)
-		return -1;
+	if(! afb_event_is_valid(event_))
+	{
+		if(set_event() < 0)
+		{
+			return -1;
+		}
+	}
 	return afb_req_subscribe(request, event_);
 }