From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
Date: Fri, 7 Feb 2014 13:42:51 +0000 (+0200)
Subject: core/service: Return required version in btd_service_get_version
X-Git-Tag: accepted/tizen/common/20140930.092521~21
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d7db30a4efda6c9b076b147d97738772589ec4ee;p=platform%2Fupstream%2Fbluez.git

core/service: Return required version in btd_service_get_version

This makes btd_service_get_version check both local and remote version
and return the required version that the service should operate.
---

diff --git a/src/service.c b/src/service.c
index 529217a..48b0592 100644
--- a/src/service.c
+++ b/src/service.c
@@ -291,6 +291,9 @@ uint16_t btd_service_get_version(const struct btd_service *service)
 	sdp_profile_desc_t *desc;
 	uint16_t version;
 
+	if (!service->profile->version)
+		return 0;
+
 	rec = btd_device_get_record(service->device,
 					service->profile->remote_uuid);
 	if (rec == NULL)
@@ -303,7 +306,7 @@ uint16_t btd_service_get_version(const struct btd_service *service)
 	version = desc->version;
 	sdp_list_free(list, free);
 
-	return version;
+	return MIN(version, service->profile->version);
 }
 
 unsigned int btd_service_add_state_cb(btd_service_state_cb cb, void *user_data)