Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c68a22c6 authored by Sarvesh Kalwit's avatar Sarvesh Kalwit
Browse files

floss: Complete Floss to BTIF GATT attribute type conversions 

Fix previously incomplete GATT attribute type conversions from Floss to
the Bluetooth Interface, including adding key size in GATT attributes,
and properly excluding included GATT Services.

Bug: 328812649
Test: m -j && manually via btclient:
Add a basic service, then add another service with the previous one as
an included service. Verify this works, and that using an incorrect
instance_id does not.
Flag: Exempt, Floss-only change

Change-Id: I62acf2124f5551eb6e4e3807796fd64b6b1818a5
parent a8a4b199

system/gd/rust/linux/stack/src/bluetooth_gatt.rs

+27 −10
Original line number Diff line number Diff line
@@ -855,7 +855,10 @@ impl BluetoothGattService { 
        db_out

    }



    fn into_db(service: BluetoothGattService) -> Vec<BtGattDbElement> {

    fn into_db(

        service: BluetoothGattService,

        services: &Vec<BluetoothGattService>,

    ) -> Vec<BtGattDbElement> {

        let mut db_out: Vec<BtGattDbElement> = vec![];

        db_out.push(BtGattDbElement {

            id: service.instance_id as u16,
@@ -879,7 +882,7 @@ impl BluetoothGattService { 
                end_handle: 0,

                properties: char.properties as u8,

                extended_properties: 0,

                permissions: char.permissions as u16,

                permissions: (((char.key_size - 7) << 12) + char.permissions) as u16,

            });



            for desc in char.descriptors {
@@ -892,12 +895,22 @@ impl BluetoothGattService { 
                    end_handle: 0,

                    properties: 0,

                    extended_properties: 0,

                    permissions: desc.permissions as u16,

                    permissions: (((char.key_size - 7) << 12) + desc.permissions) as u16,

                });

            }

        }



        for included_service in service.included_services {

            if !services.iter().any(|s| {

                s.instance_id == included_service.instance_id && s.uuid == included_service.uuid

            }) {

                log::error!(

                    "Included service with uuid {} not found",

                    Uuid::from(included_service.uuid)

                );

                continue;

            }



            db_out.push(BtGattDbElement {

                id: included_service.instance_id as u16,

                uuid: Uuid::from(included_service.uuid),
@@ -2650,13 +2663,17 @@ impl IBluetoothGatt for BluetoothGatt { 
    }



    fn add_service(&self, server_id: i32, service: BluetoothGattService) {

        if let Some(server) = self.server_context_map.get_by_server_id(server_id) {

            self.gatt

                .as_ref()

                .unwrap()

                .lock()

                .unwrap()

                .server

            .add_service(server_id, &BluetoothGattService::into_db(service));

                .add_service(server_id, &BluetoothGattService::into_db(service, &server.services));

        } else {

            log::error!("Server id {} is not valid", server_id);

        }

    }



    fn remove_service(&self, server_id: i32, handle: i32) {