/* Introspection data for the service we are exporting */
static const gchar service_introspection_xml[] =
"<node name='/'>"
-" <interface name='org.freedesktop.DBus.ObjectManager'>"
-" <method name='GetManagedObjects'>"
-" <arg type='a{oa{sa{sv}}}' name='object_paths_interfaces_and_properties' direction='out'/>"
-" </method>"
-" </interface>"
-" <interface name='org.bluez.GattService1'>"
+" <interface name='org.freedesktop.DBus.Properties'>"
" <property type='s' name='UUID' access='read'>"
" </property>"
" <property type='b' name='primary' access='read'>"
" </property>"
" <property type='ay' name='Value' access='readwrite'>"
" </property>"
-" <property type='b' name='Notifying' access='read'>"
-" </property>"
+"
<property type='b' name='Notifying' access='read'>"
+" </property>"
" <property type='as' name='Flags' access='read'>"
" </property>"
" <property type='s' name='Unicast' access='read'>"
" </property>"
-" <property type='ao' name='Descriptors' access='read'>"
-" </property>"
+"
<property type='ao' name='Descriptors' access='read'>"
+" </property>"
" </interface>"
"</node>";
" </property>"
" <property type='ay' name='Value' access='read'>"
" </property>"
-" <property type='s' name='Permissions' access='read'>"
+" <property type='as' name='Flags' access='read'>"
" </property>"
" </interface>"
"</node>";
+static const gchar manager_introspection_xml[] =
+"<node name='/'>"
+" <interface name='org.freedesktop.DBus.ObjectManager'>"
+" <method name='GetManagedObjects'>"
+" <arg type='a{oa{sa{sv}}}' name='object_paths_interfaces_and_properties' direction='out'/>"
+" </method>"
+" </interface>"
+"</node>";
+
struct gatt_service_info {
gchar *serv_path;
guint serv_id;
guint desc_id;
gchar *desc_uuid;
gchar *desc_value;
+ gchar *desc_flags[NUMBER_OF_FLAGS];
int value_length;
+ int flags_length;
};
struct gatt_req_info {
static GSList *gatt_services = NULL;
static GSList *gatt_requests = NULL;
+static gchar *app_path = NULL;
#define BT_GATT_SERVICE_NAME "org.frwk.gatt_service"
#define BT_GATT_SERVICE_PATH "/org/frwk/gatt_service"
}
#endif
-static void __bt_gatt_serv_method_call(GDBusConnection *connection,
+static void __bt_gatt_manager_method_call(GDBusConnection *connection,
const gchar *sender,
const gchar *object_path,
const gchar *interface_name,
gpointer user_data)
{
GSList *l1;
+ int len = 0;
+ int i = 0;
if (g_strcmp0(method_name, "GetManagedObjects") == 0) {
BT_DBG("Getting values for service, chars and descriptors");
/* Prepare inner builder for GattService1 interface */
- GVariantBuilder *svc_builder = NULL;
- GVariantBuilder *inner_builder = NULL;
+ len = g_slist_length(gatt_services);
- if (register_pending_cnt > 1) {
- int len = g_slist_length(gatt_services);
- l1 = g_slist_nth(gatt_services, len - register_pending_cnt);
- } else {
- l1 = g_slist_last(gatt_services);
- }
- register_pending_cnt--;
+ for (i = 0; i <= len; i++) {
+ GVariantBuilder *svc_builder = NULL;
+ GVariantBuilder *inner_builder = NULL;
- struct gatt_service_info *serv_info = l1->data;
- if (serv_info == NULL) {
- BT_ERR("service info value is NULL");
- g_dbus_method_invocation_return_value(invocation, NULL);
- return;
- }
+ if (register_pending_cnt > 1) {
+ l1 = g_slist_nth(gatt_services, len - register_pending_cnt);
+ } else {
+ l1 = g_slist_last(gatt_services);
+ }
+ register_pending_cnt--;
- /* Prepare inner builder for GattService1 interface */
- BT_DBG("Creating builder for service");
- svc_builder = g_variant_builder_new(
- G_VARIANT_TYPE("a{sa{sv}}"));
- inner_builder = g_variant_builder_new(G_VARIANT_TYPE("a{sv}"));
+ struct gatt_service_info *serv_info = l1->data;
+ if (serv_info == NULL) {
+ BT_ERR("service info value is NULL");
+ g_dbus_method_invocation_return_value(invocation, NULL);
+ return;
+ }
- g_variant_builder_add(inner_builder, "{sv}", "UUID",
- g_variant_new_string(serv_info->service_uuid));
+ /* Prepare inner builder for GattService1 interface */
+ BT_DBG("Creating builder for service");
+ svc_builder = g_variant_builder_new(
+ G_VARIANT_TYPE("a{sa{sv}}"));
+ inner_builder = g_variant_builder_new(G_VARIANT_TYPE("a{sv}"));
- g_variant_builder_add(inner_builder, "{sv}", "Primary",
- g_variant_new_boolean(serv_info->is_svc_primary));
+ g_variant_builder_add(inner_builder, "{sv}", "UUID",
+ g_variant_new_string(serv_info->service_uuid));
+
+ g_variant_builder_add(inner_builder, "{sv}", "Primary",
+ g_variant_new_boolean(serv_info->is_svc_primary));
+
+ /*Characteristics*/
+ inner_builder1 = g_variant_builder_new(G_VARIANT_TYPE("ao"));
+ BT_DBG("Adding Charatarisitcs list");
+ for (l4 = serv_info->char_data; l4 != NULL; l4 = l4->next) {
+ struct gatt_char_info *char_info = l4->data;
+ g_variant_builder_add(inner_builder1, "o",
+ char_info->char_path);
+ BT_DBG("%s", char_info->char_path);
+ }
- /*Characteristics*/
- inner_builder1 = g_variant_builder_new(G_VARIANT_TYPE("ao"));
- BT_DBG("Adding Charatarisitcs list");
- for (l4 = serv_info->char_data; l4 != NULL; l4 = l4->next) {
- struct gatt_char_info *char_info = l4->data;
- g_variant_builder_add(inner_builder1, "o",
- char_info->char_path);
- BT_DBG("%s", char_info->char_path);
- }
+ svc_char = g_variant_new("ao", inner_builder1);
+ g_variant_builder_add(inner_builder, "{sv}", "Characteristics",
+ svc_char);
- svc_char = g_variant_new("ao", inner_builder1);
- g_variant_builder_add(inner_builder, "{sv}", "Characteristics",
- svc_char);
+ g_variant_builder_add(svc_builder, "{sa{sv}}",
+ GATT_SERV_INTERFACE,
+ inner_builder);
- g_variant_builder_add(svc_builder, "{sa{sv}}",
- GATT_SERV_INTERFACE,
- inner_builder);
+ g_variant_builder_add(builder, "{oa{sa{sv}}}",
+ serv_info->serv_path,
+ svc_builder);
- g_variant_builder_add(builder, "{oa{sa{sv}}}",
- serv_info->serv_path,
- svc_builder);
+ g_variant_builder_unref(inner_builder1);
- g_variant_builder_unref(inner_builder1);
+ /* Prepare inner builder for GattCharacteristic1 interface */
- /* Prepare inner builder for GattCharacteristic1 interface */
+ GSList *l2 = serv_info->char_data;
+ BT_DBG("Creating builder for characteristics \n");
- GSList *l2 = serv_info->char_data;
- BT_DBG("Creating builder for characteristics \n");
+ if (l2 == NULL)
+ BT_DBG("characteristic data is NULL");
- if (l2 == NULL)
- BT_DBG("characteristic data is NULL");
+ for (l2 = serv_info->char_data; l2 != NULL; l2 = l2->next) {
- for (l2 = serv_info->char_data; l2 != NULL; l2 = l2->next) {
+ GVariantBuilder *char_builder = NULL;
+ GVariantBuilder *inner_builder = NULL;
+ GVariantBuilder *builder1 = NULL;
+ GVariantBuilder *builder2 = NULL;
+ GVariantBuilder *builder3 = NULL;
+ GVariant *char_val = NULL;
+ GVariant *flags_val = NULL;
+ GVariant *char_desc = NULL;
+ char *unicast = NULL;
+ gboolean notify = FALSE;
+ int i = 0;
+
+ char_builder = g_variant_builder_new(
+ G_VARIANT_TYPE(
+ "a{sa{sv}}"));
+ inner_builder = g_variant_builder_new(
+ G_VARIANT_TYPE(
+ "a{sv}"));
- GVariantBuilder *char_builder = NULL;
- GVariantBuilder *inner_builder = NULL;
- GVariantBuilder *builder1 = NULL;
- GVariantBuilder *builder2 = NULL;
- GVariantBuilder *builder3 = NULL;
- GVariant *char_val = NULL;
- GVariant *flags_val = NULL;
- GVariant *char_desc = NULL;
- char *unicast = NULL;
- gboolean notify = FALSE;
- int i = 0;
-
- char_builder = g_variant_builder_new(
- G_VARIANT_TYPE(
- "a{sa{sv}}"));
- inner_builder = g_variant_builder_new(
- G_VARIANT_TYPE(
- "a{sv}"));
+ struct gatt_char_info *char_info = l2->data;
+ if (char_info == NULL) {
+ BT_ERR("char_info is NULL");
+ continue;
+ }
- struct gatt_char_info *char_info = l2->data;
- if (char_info == NULL) {
- BT_ERR("char_info is NULL");
- continue;
- }
+ /*Uuid*/
+ g_variant_builder_add(inner_builder, "{sv}", "UUID",
+ g_variant_new_string(char_info->char_uuid));
+ /*Service*/
+ g_variant_builder_add(inner_builder, "{sv}", "Service",
+ g_variant_new("o", serv_info->serv_path));
+ /*Value*/
+ builder1 = g_variant_builder_new(G_VARIANT_TYPE_ARRAY);
- /*Uuid*/
- g_variant_builder_add(inner_builder, "{sv}", "UUID",
- g_variant_new_string(char_info->char_uuid));
- /*Service*/
- g_variant_builder_add(inner_builder, "{sv}", "Service",
- g_variant_new("o", serv_info->serv_path));
- /*Value*/
- builder1 = g_variant_builder_new(G_VARIANT_TYPE_ARRAY);
-
- if(char_info->char_value != NULL) {
- for (i = 0; i < char_info->value_length; i++) {
- g_variant_builder_add(builder1, "y",
- char_info->char_value[i]);
+ if(char_info->char_value != NULL) {
+ for (i = 0; i < char_info->value_length; i++) {
+ g_variant_builder_add(builder1, "y",
+ char_info->char_value[i]);
+ }
+ char_val = g_variant_new("ay", builder1);
+ g_variant_builder_add(inner_builder, "{sv}",
+ "Value", char_val);
}
- char_val = g_variant_new("ay", builder1);
- g_variant_builder_add(inner_builder, "{sv}",
- "Value", char_val);
- }
- /*Flags*/
- builder2 = g_variant_builder_new(G_VARIANT_TYPE("as"));
+ /*Flags*/
+ builder2 = g_variant_builder_new(G_VARIANT_TYPE("as"));
- for (i = 0; i < char_info->flags_length; i++) {
- g_variant_builder_add(builder2, "s",
- char_info->char_flags[i]);
- }
+ for (i = 0; i < char_info->flags_length; i++) {
+ g_variant_builder_add(builder2, "s",
+ char_info->char_flags[i]);
+ }
- flags_val = g_variant_new("as", builder2);
- g_variant_builder_add(inner_builder, "{sv}", "Flags",
- flags_val);
+ flags_val = g_variant_new("as", builder2);
+ g_variant_builder_add(inner_builder, "{sv}", "Flags",
+ flags_val);
- /* Notifying */
- g_variant_builder_add(inner_builder, "{sv}", "Notifying",
- g_variant_new("b", notify));
+ /* Notifying */
+ g_variant_builder_add(inner_builder, "{sv}", "Notifying",
+ g_variant_new("b", notify));
- /* Unicast */
- unicast = g_strdup("00:00:00:00:00:00");
- g_variant_builder_add(inner_builder, "{sv}", "Unicast",
- g_variant_new("s", unicast));
+ /* Unicast */
+ unicast = g_strdup("00:00:00:00:00:00");
+ g_variant_builder_add(inner_builder, "{sv}", "Unicast",
+ g_variant_new("s", unicast));
- /*Descriptors*/
- builder3 = g_variant_builder_new(G_VARIANT_TYPE("ao"));
- BT_DBG("Adding Descriptors list");
+ /*Descriptors*/
+ builder3 = g_variant_builder_new(G_VARIANT_TYPE("ao"));
+ BT_DBG("Adding Descriptors list");
- for (l4 = char_info->desc_data; l4 != NULL; l4 = l4->next) {
- struct gatt_desc_info *desc_info = l4->data;
- g_variant_builder_add(builder3, "o",
- desc_info->desc_path);
- BT_DBG("%s", desc_info->desc_path);
- }
+ for (l4 = char_info->desc_data; l4 != NULL; l4 = l4->next) {
+ struct gatt_desc_info *desc_info = l4->data;
+ g_variant_builder_add(builder3, "o",
+ desc_info->desc_path);
+ BT_DBG("%s", desc_info->desc_path);
+ }
- char_desc = g_variant_new("ao", builder3);
- g_variant_builder_add(inner_builder, "{sv}", "Descriptors",
- char_desc);
+ char_desc = g_variant_new("ao", builder3);
+ g_variant_builder_add(inner_builder, "{sv}", "Descriptors",
+ char_desc);
- g_variant_builder_add(char_builder, "{sa{sv}}",
- GATT_CHAR_INTERFACE , inner_builder);
- g_variant_builder_add(builder, "{oa{sa{sv}}}",
- char_info->char_path, char_builder);
+ g_variant_builder_add(char_builder, "{sa{sv}}",
+ GATT_CHAR_INTERFACE , inner_builder);
+ g_variant_builder_add(builder, "{oa{sa{sv}}}",
+ char_info->char_path, char_builder);
- /*Prepare inner builder for GattDescriptor1 interface*/
+ /*Prepare inner builder for GattDescriptor1 interface*/
- GSList *l3 = char_info->desc_data;
+ GSList *l3 = char_info->desc_data;
- if (l3 == NULL)
- BT_DBG("descriptor data is NULL");
+ if (l3 == NULL)
+ BT_DBG("descriptor data is NULL");
- for (l3 = char_info->desc_data; l3 != NULL; l3 = l3->next) {
+ for (l3 = char_info->desc_data; l3 != NULL; l3 = l3->next) {
- BT_DBG("Creating builder for descriptor \n");
+ BT_DBG("Creating builder for descriptor \n");
- GVariantBuilder *desc_builder = NULL;
- GVariantBuilder *inner_builder = NULL;
- GVariantBuilder *builder1 = NULL;
- GVariant *desc_val = NULL;
+ GVariantBuilder *desc_builder = NULL;
+ GVariantBuilder *inner_builder = NULL;
+ GVariantBuilder *builder1 = NULL;
+ GVariantBuilder *builder2 = NULL;
+ GVariant *desc_val = NULL;
- desc_builder = g_variant_builder_new(
- G_VARIANT_TYPE(
- "a{sa{sv}}"));
- inner_builder = g_variant_builder_new(
- G_VARIANT_TYPE(
- "a{sv}"));
+ desc_builder = g_variant_builder_new(
+ G_VARIANT_TYPE(
+ "a{sa{sv}}"));
+ inner_builder = g_variant_builder_new(
+ G_VARIANT_TYPE(
+ "a{sv}"));
- struct gatt_desc_info *desc_info = l3->data;
- if (desc_info == NULL) {
- BT_ERR("desc_info is NULL");
- continue;
- }
+ struct gatt_desc_info *desc_info = l3->data;
+ if (desc_info == NULL) {
+ BT_ERR("desc_info is NULL");
+ continue;
+ }
- /*Uuid*/
- g_variant_builder_add(inner_builder,
- "{sv}", "UUID",
- g_variant_new_string(
- desc_info->desc_uuid));
+ /*Uuid*/
+ g_variant_builder_add(inner_builder,
+ "{sv}", "UUID",
+ g_variant_new_string(
+ desc_info->desc_uuid));
- /*Characteristic*/
- g_variant_builder_add(inner_builder, "{sv}",
- "Characteristic",
- g_variant_new("o",
- char_info->char_path));
+ /*Characteristic*/
+ g_variant_builder_add(inner_builder, "{sv}",
+ "Characteristic",
+ g_variant_new("o",
+ char_info->char_path));
- /*Value*/
- builder1 = g_variant_builder_new(G_VARIANT_TYPE_ARRAY);
+ /*Value*/
+ builder1 = g_variant_builder_new(G_VARIANT_TYPE_ARRAY);
- if(desc_info->desc_value != NULL) {
- for (i = 0; i < desc_info->value_length; i++) {
- g_variant_builder_add(builder1, "y",
- desc_info->desc_value[i]);
+ if(desc_info->desc_value != NULL) {
+ for (i = 0; i < desc_info->value_length; i++) {
+ g_variant_builder_add(builder1, "y",
+ desc_info->desc_value[i]);
+ }
+ desc_val = g_variant_new("ay", builder1);
+ g_variant_builder_add(inner_builder, "{sv}",
+ "Value", desc_val);
}
- desc_val = g_variant_new("ay", builder1);
- g_variant_builder_add(inner_builder, "{sv}",
- "Value", desc_val);
- }
- g_variant_builder_add(desc_builder, "{sa{sv}}",
- GATT_DESC_INTERFACE,
- inner_builder);
+ /*Flags*/
+ builder2 = g_variant_builder_new(G_VARIANT_TYPE("as"));
- g_variant_builder_add(builder, "{oa{sa{sv}}}",
- desc_info->desc_path,
- desc_builder);
+ for (i = 0; i < desc_info->flags_length; i++) {
+ g_variant_builder_add(builder2, "s",
+ desc_info->desc_flags[i]);
+ }
- /*unref descriptor builder pointers*/
+ flags_val = g_variant_new("as", builder2);
+ g_variant_builder_add(inner_builder, "{sv}", "Flags",
+ flags_val);
+
+ g_variant_builder_add(desc_builder, "{sa{sv}}",
+ GATT_DESC_INTERFACE,
+ inner_builder);
+
+ g_variant_builder_add(builder, "{oa{sa{sv}}}",
+ desc_info->desc_path,
+ desc_builder);
+
+ /*unref descriptor builder pointers*/
+ g_variant_builder_unref(builder1);
+ g_variant_builder_unref(builder2);
+ g_variant_builder_unref(inner_builder);
+ g_variant_builder_unref(desc_builder);
+ }
+
+ if (unicast)
+ g_free(unicast);
+ /*unref char builder pointers*/
g_variant_builder_unref(builder1);
+ g_variant_builder_unref(builder2);
+ g_variant_builder_unref(builder3);
g_variant_builder_unref(inner_builder);
- g_variant_builder_unref(desc_builder);
+ g_variant_builder_unref(char_builder);
}
- if (unicast)
- g_free(unicast);
- /*unref char builder pointers*/
- g_variant_builder_unref(builder1);
- g_variant_builder_unref(builder2);
- g_variant_builder_unref(builder3);
+ /*unref service builder pointers*/
g_variant_builder_unref(inner_builder);
- g_variant_builder_unref(char_builder);
+ g_variant_builder_unref(svc_builder);
}
- /*unref service builder pointers*/
- g_variant_builder_unref(inner_builder);
- g_variant_builder_unref(svc_builder);
-
/* Return builder as method reply */
BT_DBG("Sending gatt service builder values to Bluez");
g_dbus_method_invocation_return_value(invocation,
if (user_info != NULL) {
_bt_common_event_cb(
- BLUETOOTH_EVENT_GATT_SERVER_INDICATE_CONFIRMED,
+ BLUETOOTH_EVENT_GATT_SERVER_NOTIFICATION_COMPLETED,
BLUETOOTH_ERROR_NONE, &confirm,
user_info->cb, user_info->user_data);
}
};
static const GDBusInterfaceVTable serv_interface_vtable = {
- __bt_gatt_serv_method_call,
+ NULL,
NULL,
NULL,
};
+static const GDBusInterfaceVTable manager_interface_vtable = {
+ __bt_gatt_manager_method_call,
+ NULL,
+ NULL
+};
static GDBusNodeInfo *__bt_gatt_create_method_node_info(
const gchar *introspection_data)
char_properties[flag_count] = g_strdup("authenticated-signed-writes");
flag_count++;
}
+ if (properties & BLUETOOTH_GATT_CHARACTERISTIC_PROPERTY_RELIABLE_WRITE) {
+ char_properties[flag_count] = g_strdup("reliable-write");
+ flag_count++;
+ }
+ if (properties & BLUETOOTH_GATT_CHARACTERISTIC_PROPERTY_WRITABLE_AUXILIARIES) {
+ char_properties[flag_count] = g_strdup("writable-auxiliaries");
+ flag_count++;
+ }
+ if (properties & BLUETOOTH_GATT_CHARACTERISTIC_PROPERTY_ENCRYPT_READ) {
+ char_properties[flag_count] = g_strdup("encrypt-read");
+ flag_count++;
+ }
+ if (properties & BLUETOOTH_GATT_CHARACTERISTIC_PROPERTY_ENCRYPT_WRITE) {
+ char_properties[flag_count] = g_strdup("encrypt-write");
+ flag_count++;
+ }
+ if (properties & BLUETOOTH_GATT_CHARACTERISTIC_PROPERTY_ENCRYPT_AUTHENTICATED_READ) {
+ char_properties[flag_count] = g_strdup("encrypt-authenticated-read");
+ flag_count++;
+ }
+ if (properties & BLUETOOTH_GATT_CHARACTERISTIC_PROPERTY_ENCRYPT_AUTHENTICATED_WRITE) {
+ char_properties[flag_count] = g_strdup("encrypt-authenticated-write");
+ flag_count++;
+ }
+
+ if (flag_count == 0) {
+ char_properties[flag_count] = g_strdup("read");
+ flag_count++;
+ }
+
+ return flag_count;
+}
+
+int bluetooth_gatt_convert_perm2string(
+ bt_gatt_permission_t properties,
+ char *char_properties[])
+{
+ int flag_count = 0;
+
+ if (properties & BLUETOOTH_GATT_PERMISSION_READ) {
+ char_properties[flag_count] = g_strdup("read");
+ flag_count++;
+ }
+ if (properties & BLUETOOTH_GATT_PERMISSION_WRITE) {
+ char_properties[flag_count] = g_strdup("write");
+ flag_count++;
+ }
+ if (properties & BLUETOOTH_GATT_PERMISSION_ENCRYPT_READ) {
+ char_properties[flag_count] = g_strdup("encrypt-read");
+ flag_count++;
+ }
+ if (properties & BLUETOOTH_GATT_PERMISSION_ENCRYPT_WRITE) {
+ char_properties[flag_count] = g_strdup("encrypt-write");
+ flag_count++;
+ }
+ if (properties & BLUETOOTH_GATT_PERMISSION_ENCRYPT_AUTHENTICATED_READ) {
+ char_properties[flag_count] = g_strdup("encrypt-authenticated-read");
+ flag_count++;
+ }
+ if (properties & BLUETOOTH_GATT_PERMISSION_ENCRYPT_AUTHENTICATED_WRITE) {
+ char_properties[flag_count] = g_strdup("encrypt-authenticated-write");
+ flag_count++;
+ }
if (flag_count == 0) {
char_properties[flag_count] = g_strdup("read");
g_free(char_cmp);
}
}
-void register_service_cb(GObject *object, GAsyncResult *res, gpointer user_data)
+void register_application_cb(GObject *object, GAsyncResult *res, gpointer user_data)
{
- BT_DBG("register_service_cb\n");
+ BT_INFO("RegisterApplication is completed");
GError *error = NULL;
GVariant *result;
}
}
-void unregister_service_cb(GObject *object, GAsyncResult *res,
+void unregister_application_cb(GObject *object, GAsyncResult *res,
gpointer user_data)
{
- BT_DBG("unregister_service_cb\n");
+ BT_INFO("UnregisterApplication is completed");
GError *error = NULL;
GVariant *result;
return BLUETOOTH_ERROR_NOT_FOUND;
}
+ return BLUETOOTH_ERROR_NONE;
+}
+
+BT_EXPORT_API int bluetooth_gatt_unregister_application(void)
+{
GDBusProxy *proxy = NULL;
proxy = __bt_gatt_gdbus_get_manager_proxy("org.bluez",
"/org/bluez/hci0", GATT_MNGR_INTERFACE);
- if (proxy == NULL)
+ if (proxy == NULL || app_path == NULL)
return BLUETOOTH_ERROR_INTERNAL;
+ BT_INFO("UnregisterApplication");
+
/* Async Call to Unregister Service */
g_dbus_proxy_call(proxy,
- "UnregisterService",
+ "UnregisterApplication",
g_variant_new("(o)",
- service_path),
+ app_path),
G_DBUS_CALL_FLAGS_NONE, -1,
NULL,
- (GAsyncReadyCallback) unregister_service_cb,
+ (GAsyncReadyCallback) unregister_application_cb,
NULL);
- __bt_gatt_set_service_state(service_path, FALSE);
-
return BLUETOOTH_ERROR_NONE;
}
BT_EXPORT_API int bluetooth_gatt_init(void)
{
GDBusConnection *conn;
+ GDBusNodeInfo *obj_info;
+ GError *error = NULL;
owner_id = g_bus_own_name(G_BUS_TYPE_SYSTEM,
BT_GATT_SERVICE_NAME,
NULL, NULL, NULL, NULL, NULL);
BT_DBG("owner_id is [%d]", owner_id);
+ app_path = g_strdup_printf("/com/%d", getpid());
serv_id = 1;
return BLUETOOTH_ERROR_INTERNAL;
}
+ /* Register ObjectManager interface */
+ obj_info = __bt_gatt_create_method_node_info(
+ manager_introspection_xml);
+
+ if (obj_info == NULL) {
+ BT_ERR("failed to get node info");
+ return BLUETOOTH_ERROR_INTERNAL;
+ }
+
+ manager_id = g_dbus_connection_register_object(g_conn, app_path,
+ obj_info->interfaces[0],
+ &manager_interface_vtable,
+ NULL, NULL, &error);
+
+ if (manager_id == 0) {
+ BT_ERR("failed to register: %s", error->message);
+ g_error_free(error);
+ return BLUETOOTH_ERROR_INTERNAL;
+ }
+
return BLUETOOTH_ERROR_NONE;
}
BT_EXPORT_API int bluetooth_gatt_deinit()
{
+ int ret = BLUETOOTH_ERROR_NONE;
/* Unown gdbus bus */
if (owner_id) {
g_bus_unown_name(owner_id);
+ /* unregister the exported interface for object manager */
+ g_dbus_connection_unregister_object(g_conn,
+ manager_id);
+
BT_DBG("Gatt service deinitialized \n");
g_slist_free(gatt_services);
gatt_services = NULL;
- return BLUETOOTH_ERROR_NONE;
+ ret = bluetooth_gatt_unregister_application();
+
+ if (ret == BLUETOOTH_ERROR_NONE) {
+ g_free(app_path);
+ app_path = NULL;
+ }
+
+ return ret;
}
return BLUETOOTH_ERROR_NOT_FOUND;
if (node_info == NULL)
return BLUETOOTH_ERROR_INTERNAL;
- path = g_strdup_printf(GATT_SERV_OBJECT_PATH"%d", serv_id++);
+ path = g_strdup_printf("%s"GATT_SERV_OBJECT_PATH"%d", app_path, serv_id++);
BT_DBG("gatt service path is [%s]", path);
object_id = g_dbus_connection_register_object(g_conn, path,
BT_EXPORT_API int bluetooth_gatt_add_new_characteristic(
const char *svc_path, const char *char_uuid,
+ bt_gatt_permission_t permissions,
bt_gatt_characteristic_property_t properties,
char **char_path)
{
return BLUETOOTH_ERROR_INTERNAL;
}
+ if (permissions & BLUETOOTH_GATT_PERMISSION_ENCRYPT_READ)
+ properties |= BLUETOOTH_GATT_CHARACTERISTIC_PROPERTY_ENCRYPT_READ;
+ if (permissions & BLUETOOTH_GATT_PERMISSION_ENCRYPT_AUTHENTICATED_READ)
+ properties |= BLUETOOTH_GATT_CHARACTERISTIC_PROPERTY_ENCRYPT_AUTHENTICATED_READ;
+ if (permissions & BLUETOOTH_GATT_PERMISSION_ENCRYPT_WRITE)
+ properties |= BLUETOOTH_GATT_CHARACTERISTIC_PROPERTY_ENCRYPT_WRITE;
+ if (permissions & BLUETOOTH_GATT_PERMISSION_ENCRYPT_AUTHENTICATED_WRITE)
+ properties |= BLUETOOTH_GATT_CHARACTERISTIC_PROPERTY_ENCRYPT_AUTHENTICATED_WRITE;
+
flag_count = bluetooth_gatt_convert_prop2string(properties, char_flags);
char_info = g_new0(struct gatt_char_info, 1);
int res = BLUETOOTH_ERROR_NONE;
line_argv = g_strsplit_set(characteristic, "/", 0);
- serv_path = g_strdup_printf("/%s", line_argv[1]);
+ serv_path = g_strdup_printf("/%s/%s/%s", line_argv[1], line_argv[2], line_argv[3]);
char_info = __bt_gatt_find_gatt_char_info(serv_path, characteristic);
BT_EXPORT_API int bluetooth_gatt_add_descriptor(
const char *char_path, const char *desc_uuid,
+ bt_gatt_permission_t permissions,
char **desc_path)
{
static int desc_id = 1;
struct gatt_desc_info *desc_info = NULL;
gchar **line_argv = NULL;
char *serv_path;
+ GVariantBuilder *builder2 = NULL;
+ GVariant *flags_val = NULL;
+ int i = 0;
+ char *desc_flags[NUMBER_OF_FLAGS];
+ int flag_count = 0;
if (new_char) {
desc_id = 1;
}
line_argv = g_strsplit_set(char_path, "/", 0);
- serv_path = g_strdup_printf("/%s", line_argv[1]);
+ serv_path = g_strdup_printf("/%s/%s/%s", line_argv[1], line_argv[2], line_argv[3]);
char_info = __bt_gatt_find_gatt_char_info(serv_path, char_path);
if (char_info == NULL) {
return BLUETOOTH_ERROR_INTERNAL;
}
+ flag_count = bluetooth_gatt_convert_perm2string(permissions, desc_flags);
+
desc_info = g_new0(struct gatt_desc_info, 1);
desc_info->desc_path = g_strdup(path);
desc_info->desc_id = object_id;
desc_info->desc_uuid = g_strdup(desc_uuid);
+ for (i = 0; i < flag_count; i++) {
+ desc_info->desc_flags[i] = desc_flags[i];
+ }
+
+ desc_info->flags_length = flag_count;
+
char_info->desc_data = g_slist_append(char_info->desc_data, desc_info);
builder = g_variant_builder_new(G_VARIANT_TYPE("a{sa{sv}}"));
g_variant_builder_add(inner_builder, "{sv}", "Characteristic",
g_variant_new("o", char_path));
+ builder2 = g_variant_builder_new(G_VARIANT_TYPE("as"));
+
+ for (i = 0; i < flag_count; i++) {
+ g_variant_builder_add(builder2, "s", desc_flags[i]);
+ }
+
+ flags_val = g_variant_new("as", builder2);
+ g_variant_builder_add(inner_builder, "{sv}", "Flags",
+ flags_val);
+
g_variant_builder_add(builder, "{sa{sv}}",
GATT_DESC_INTERFACE,
inner_builder);
int i ;
line_argv = g_strsplit_set(desc_path, "/", 0);
- serv_path = g_strdup_printf("/%s", line_argv[1]);
- char_path = g_strdup_printf("%s/%s", serv_path, line_argv[2]);
+ serv_path = g_strdup_printf("/%s/%s/%s", line_argv[1], line_argv[2], line_argv[3]);
+ char_path = g_strdup_printf("%s/%s", serv_path, line_argv[4]);
desc_info = __bt_gatt_find_gatt_desc_info(serv_path, char_path, desc_path);
BT_EXPORT_API int bluetooth_gatt_register_service(
const char *svc_path)
{
- GDBusProxy *proxy = NULL;
- gchar *path = NULL;
-
register_pending_cnt++;
if (__bt_gatt_get_service_state(svc_path)) {
return BLUETOOTH_ERROR_NONE;
}
+ __bt_gatt_set_service_state(svc_path, TRUE);
+
+ return BLUETOOTH_ERROR_NONE;
+}
+
+BT_EXPORT_API int bluetooth_gatt_register_application(void)
+{
+ GDBusProxy *proxy = NULL;
+
proxy = __bt_gatt_gdbus_get_manager_proxy("org.bluez",
"/org/bluez/hci0", GATT_MNGR_INTERFACE);
- if (proxy == NULL)
+ if (proxy == NULL || app_path == NULL)
return BLUETOOTH_ERROR_INTERNAL;
- path = g_strdup(svc_path);
+ BT_INFO("RegisterApplication");
g_dbus_proxy_call(proxy,
- "RegisterService",
+ "RegisterApplication",
g_variant_new("(oa{sv})",
- path, NULL),
+ app_path, NULL),
G_DBUS_CALL_FLAGS_NONE, -1,
NULL,
- (GAsyncReadyCallback) register_service_cb,
+ (GAsyncReadyCallback) register_application_cb,
NULL);
- __bt_gatt_set_service_state(svc_path, TRUE);
-
- g_free(path);
-
return BLUETOOTH_ERROR_NONE;
}
gchar *serv_path = NULL;
line_argv = g_strsplit_set(char_path, "/", 0);
- serv_path = g_strdup_printf("/%s", line_argv[1]);
+ serv_path = g_strdup_printf("/%s/%s/%s", line_argv[1], line_argv[2], line_argv[3]);
if (!__bt_gatt_get_service_state(serv_path)) {
BT_DBG("service not registered for this characteristic \n");
char addr[20] = { 0 };
line_argv = g_strsplit_set(char_path, "/", 0);
- serv_path = g_strdup_printf("/%s", line_argv[1]);
+ serv_path = g_strdup_printf("/%s/%s/%s", line_argv[1], line_argv[2], line_argv[3]);
if (!__bt_gatt_get_service_state(serv_path)) {
BT_DBG("service not registered for this characteristic \n");
typedef enum
{
+ BLUETOOTH_GATT_PERMISSION_READ = 0x01,
+ BLUETOOTH_GATT_PERMISSION_WRITE = 0x02,
+ BLUETOOTH_GATT_PERMISSION_ENCRYPT_READ = 0x04,
+ BLUETOOTH_GATT_PERMISSION_ENCRYPT_WRITE = 0x08,
+ BLUETOOTH_GATT_PERMISSION_ENCRYPT_AUTHENTICATED_READ = 0x10,
+ BLUETOOTH_GATT_PERMISSION_ENCRYPT_AUTHENTICATED_WRITE = 0x20,
+} bt_gatt_permission_t;
+
+typedef enum
+{
BLUETOOTH_GATT_CHARACTERISTIC_PROPERTY_BROADCAST = 0x01,
BLUETOOTH_GATT_CHARACTERISTIC_PROPERTY_READ = 0x02,
BLUETOOTH_GATT_CHARACTERISTIC_PROPERTY_WRITE_NO_RESPONSE = 0x04,
BLUETOOTH_GATT_CHARACTERISTIC_PROPERTY_NOTIFY = 0x10,
BLUETOOTH_GATT_CHARACTERISTIC_PROPERTY_INDICATE = 0x20,
BLUETOOTH_GATT_CHARACTERISTIC_PROPERTY_SIGNED_WRITE = 0x40,
- BLUETOOTH_GATT_CHARACTERISTIC_PROPERTY_EXTENDED_PROPS = 0x80
+ BLUETOOTH_GATT_CHARACTERISTIC_PROPERTY_RELIABLE_WRITE = 0x80,
+ BLUETOOTH_GATT_CHARACTERISTIC_PROPERTY_WRITABLE_AUXILIARIES = 0x100,
+ BLUETOOTH_GATT_CHARACTERISTIC_PROPERTY_ENCRYPT_READ = 0x200,
+ BLUETOOTH_GATT_CHARACTERISTIC_PROPERTY_ENCRYPT_WRITE = 0x400,
+ BLUETOOTH_GATT_CHARACTERISTIC_PROPERTY_ENCRYPT_AUTHENTICATED_READ = 0x800,
+ BLUETOOTH_GATT_CHARACTERISTIC_PROPERTY_ENCRYPT_AUTHENTICATED_WRITE = 0x1000,
+ BLUETOOTH_GATT_CHARACTERISTIC_PROPERTY_EXTENDED_PROPS = 0xffff,
}bt_gatt_characteristic_property_t;
/**
BLUETOOTH_EVENT_GATT_SERVER_READ_REQUESTED, /** <GATT Characteristic/Descriptor Read Request event */
BLUETOOTH_EVENT_GATT_SERVER_VALUE_CHANGED, /** <GATT Characteristic/Descriptor Value change event */
BLUETOOTH_EVENT_GATT_SERVER_NOTIFICATION_STATE_CHANGED, /** <GATT Characteristic Notification change event */
- BLUETOOTH_EVENT_GATT_SERVER_INDICATE_CONFIRMED, /** <GATT Characteristic Notification change event */
+ BLUETOOTH_EVENT_GATT_SERVER_NOTIFICATION_COMPLETED, /** <GATT Characteristic Notification or Indication completed event */
BLUETOOTH_EVENT_AG_CONNECTED = BLUETOOTH_EVENT_AUDIO_BASE, /**<AG service connected event*/
BLUETOOTH_EVENT_AG_DISCONNECTED, /**<AG service disconnected event*/
/* @fn int bluetooth_gatt_add_new_characteristic(
const char *svc_path, const char *char_uuid,
- bt_gatt_characteristic_property_t *properties,
+ bt_gatt_permission_t permissions,
+ bt_gatt_characteristic_property_t properties,
int flags_length, char **char_path);;
*
* @brief Exports a new gatt characteristic to the characteristic interface.
*/
int bluetooth_gatt_add_new_characteristic(
const char *svc_path, const char *char_uuid,
+ bt_gatt_permission_t permissions,
bt_gatt_characteristic_property_t properties,
char **char_path);
const char *characteristic, const char *char_value,
int value_length);
-/* @fn int bluetooth_gatt_add_descriptor(const char *desc_uuid,
- const char *desc_value, int value_length,
- const char *permissions, const char *char_path,
+/* @fn int bluetooth_gatt_add_descriptor(
+ const char *char_path, const char *desc_uuid,
+ bt_gatt_permission_t permissions,
char **desc_path);
*
* @brief Exports a new gatt descriptor to the descriptor interface.
* @param[in] desc_value GATT descriptor value.
* @param[in] value_length Length of GATT descriptor value.
* @param[in] permissions descriptor permissions.
+* @param[in] properties GATT descriptor properties.
* @param[in] char_path characteristics object path of the exported character.
*
* @remark Adapter should be enabled
* @see bluetooth_gatt_add_service()
* @see bluetooth_gatt_add_characteristics()
*/
-int bluetooth_gatt_add_descriptor(const char *char_path,
- const char *desc_uuid,
+int bluetooth_gatt_add_descriptor(
+ const char *char_path, const char *desc_uuid,
+ bt_gatt_permission_t permissions,
char **desc_path);
/* @fn int bluetooth_gatt_set_descriptor_value(
* @see bluetooth_gatt_add_service()
* @see bluetooth_gatt_add_characteristics()
* @see bluetooth_gatt_add_descriptor()
+* @see bluetooth_gatt_register_application()
*/
int bluetooth_gatt_register_service(const char *svc_path);
+/* @fn int bluetooth_gatt_register_application(void)
+*
+* @brief Registers the application with the bluez gatt server.
+*
+* This function is a synchronous call.
+*
+* @return BLUETOOTH_ERROR_NONE - Success \n
+* BLUETOOTH_ERROR_INTERNAL - Internal Error \n
+* BLUETOOTH_ERROR_INVALID_PARAM -Invalid Parameters \n
+* BLUETOOTH_ERROR_DEVICE_NOT_ENABLED - Adapter is disabled \n
+*
+* @exception None
+*
+* @remark Adapter should be enabled
+* @see bluetooth_gatt_init()
+* @see bluetooth_gatt_add_service()
+* @see bluetooth_gatt_add_characteristics()
+* @see bluetooth_gatt_add_descriptor()
+* @see bluetooth_gatt_register_service()
+*/
+int bluetooth_gatt_register_application(void);
+
/* @fn int bluetooth_gatt_unregister_service(const char *svc_path)
*
* @brief Removes(unregister) service from the bluez gatt server db.
*/
int bluetooth_gatt_unregister_service(const char *svc_path);
+/* @fn int bluetooth_gatt_unregister_application(void)
+*
+* @brief Removes(unregister) the application with the bluez gatt server,
+* and deletes all the service registered.
+*
+* This function is a synchronous call.
+*
+* @return BLUETOOTH_ERROR_NONE - Success \n
+* BLUETOOTH_ERROR_INTERNAL - Internal Error \n
+* BLUETOOTH_ERROR_INVALID_PARAM -Invalid Parameters \n
+* BLUETOOTH_ERROR_DEVICE_NOT_ENABLED - Adapter is disabled \n
+*
+* @exception None
+*
+* @remark Adapter should be enabled
+* @see bluetooth_gatt_init()
+* @see bluetooth_gatt_add_service()
+* @see bluetooth_gatt_add_characteristics()
+* @see bluetooth_gatt_add_descriptor()
+* @see bluetooth_gatt_register_service()
+* @see bluetooth_gatt_unregister_service()
+*/
+int bluetooth_gatt_unregister_application(void);
+
/* @fn int bluetooth_gatt_send_response(int request_id,
* int offset, char *value, int value_length)
*
projects / platform / core / connectivity / bluetooth-frwk.git / commitdiff