use r0 by default

2023-07-12 06:03:04 -07:00
6 changed files with 45 additions and 133 deletions
@@ -562,82 +562,11 @@ class DeviceClass:
        PERIPHERAL_HANDHELD_GESTURAL_INPUT_DEVICE_MINOR_DEVICE_CLASS: 'Handheld gestural input device'
    }

-    WEARABLE_UNCATEGORIZED_MINOR_DEVICE_CLASS = 0x00
-    WEARABLE_WRISTWATCH_MINOR_DEVICE_CLASS    = 0x01
-    WEARABLE_PAGER_MINOR_DEVICE_CLASS         = 0x02
-    WEARABLE_JACKET_MINOR_DEVICE_CLASS        = 0x03
-    WEARABLE_HELMET_MINOR_DEVICE_CLASS        = 0x04
-    WEARABLE_GLASSES_MINOR_DEVICE_CLASS       = 0x05
-
-    WEARABLE_MINOR_DEVICE_CLASS_NAMES = {
-        WEARABLE_UNCATEGORIZED_MINOR_DEVICE_CLASS: 'Uncategorized',
-        WEARABLE_WRISTWATCH_MINOR_DEVICE_CLASS:    'Wristwatch',
-        WEARABLE_PAGER_MINOR_DEVICE_CLASS:         'Pager',
-        WEARABLE_JACKET_MINOR_DEVICE_CLASS:        'Jacket',
-        WEARABLE_HELMET_MINOR_DEVICE_CLASS:        'Helmet',
-        WEARABLE_GLASSES_MINOR_DEVICE_CLASS:       'Glasses',
-    }
-
-    TOY_UNCATEGORIZED_MINOR_DEVICE_CLASS      = 0x00
-    TOY_ROBOT_MINOR_DEVICE_CLASS              = 0x01
-    TOY_VEHICLE_MINOR_DEVICE_CLASS            = 0x02
-    TOY_DOLL_ACTION_FIGURE_MINOR_DEVICE_CLASS = 0x03
-    TOY_CONTROLLER_MINOR_DEVICE_CLASS         = 0x04
-    TOY_GAME_MINOR_DEVICE_CLASS               = 0x05
-
-    TOY_MINOR_DEVICE_CLASS_NAMES = {
-        TOY_UNCATEGORIZED_MINOR_DEVICE_CLASS:      'Uncategorized',
-        TOY_ROBOT_MINOR_DEVICE_CLASS:              'Robot',
-        TOY_VEHICLE_MINOR_DEVICE_CLASS:            'Vehicle',
-        TOY_DOLL_ACTION_FIGURE_MINOR_DEVICE_CLASS: 'Doll/Action figure',
-        TOY_CONTROLLER_MINOR_DEVICE_CLASS:         'Controller',
-        TOY_GAME_MINOR_DEVICE_CLASS:               'Game',
-    }
-
-    HEALTH_UNDEFINED_MINOR_DEVICE_CLASS                 = 0x00
-    HEALTH_BLOOD_PRESSURE_MONITOR_MINOR_DEVICE_CLASS    = 0x01
-    HEALTH_THERMOMETER_MINOR_DEVICE_CLASS               = 0x02
-    HEALTH_WEIGHING_SCALE_MINOR_DEVICE_CLASS            = 0x03
-    HEALTH_GLUCOSE_METER_MINOR_DEVICE_CLASS             = 0x04
-    HEALTH_PULSE_OXIMETER_MINOR_DEVICE_CLASS            = 0x05
-    HEALTH_HEART_PULSE_RATE_MONITOR_MINOR_DEVICE_CLASS  = 0x06
-    HEALTH_HEALTH_DATA_DISPLAY_MINOR_DEVICE_CLASS       = 0x07
-    HEALTH_STEP_COUNTER_MINOR_DEVICE_CLASS              = 0x08
-    HEALTH_BODY_COMPOSITION_ANALYZER_MINOR_DEVICE_CLASS = 0x09
-    HEALTH_PEAK_FLOW_MONITOR_MINOR_DEVICE_CLASS         = 0x0A
-    HEALTH_MEDICATION_MONITOR_MINOR_DEVICE_CLASS        = 0x0B
-    HEALTH_KNEE_PROSTHESIS_MINOR_DEVICE_CLASS           = 0x0C
-    HEALTH_ANKLE_PROSTHESIS_MINOR_DEVICE_CLASS          = 0x0D
-    HEALTH_GENERIC_HEALTH_MANAGER_MINOR_DEVICE_CLASS    = 0x0E
-    HEALTH_PERSONAL_MOBILITY_DEVICE_MINOR_DEVICE_CLASS  = 0x0F
-
-    HEALTH_MINOR_DEVICE_CLASS_NAMES = {
-        HEALTH_UNDEFINED_MINOR_DEVICE_CLASS:                 'Undefined',
-        HEALTH_BLOOD_PRESSURE_MONITOR_MINOR_DEVICE_CLASS:    'Blood Pressure Monitor',
-        HEALTH_THERMOMETER_MINOR_DEVICE_CLASS:               'Thermometer',
-        HEALTH_WEIGHING_SCALE_MINOR_DEVICE_CLASS:            'Weighing Scale',
-        HEALTH_GLUCOSE_METER_MINOR_DEVICE_CLASS:             'Glucose Meter',
-        HEALTH_PULSE_OXIMETER_MINOR_DEVICE_CLASS:            'Pulse Oximeter',
-        HEALTH_HEART_PULSE_RATE_MONITOR_MINOR_DEVICE_CLASS:  'Heart/Pulse Rate Monitor',
-        HEALTH_HEALTH_DATA_DISPLAY_MINOR_DEVICE_CLASS:       'Health Data Display',
-        HEALTH_STEP_COUNTER_MINOR_DEVICE_CLASS:              'Step Counter',
-        HEALTH_BODY_COMPOSITION_ANALYZER_MINOR_DEVICE_CLASS: 'Body Composition Analyzer',
-        HEALTH_PEAK_FLOW_MONITOR_MINOR_DEVICE_CLASS:         'Peak Flow Monitor',
-        HEALTH_MEDICATION_MONITOR_MINOR_DEVICE_CLASS:        'Medication Monitor',
-        HEALTH_KNEE_PROSTHESIS_MINOR_DEVICE_CLASS:           'Knee Prosthesis',
-        HEALTH_ANKLE_PROSTHESIS_MINOR_DEVICE_CLASS:          'Ankle Prosthesis',
-        HEALTH_GENERIC_HEALTH_MANAGER_MINOR_DEVICE_CLASS:    'Generic Health Manager',
-        HEALTH_PERSONAL_MOBILITY_DEVICE_MINOR_DEVICE_CLASS:  'Personal Mobility Device',
-    }
-
    MINOR_DEVICE_CLASS_NAMES = {
        COMPUTER_MAJOR_DEVICE_CLASS:    COMPUTER_MINOR_DEVICE_CLASS_NAMES,
        PHONE_MAJOR_DEVICE_CLASS:       PHONE_MINOR_DEVICE_CLASS_NAMES,
        AUDIO_VIDEO_MAJOR_DEVICE_CLASS: AUDIO_VIDEO_MINOR_DEVICE_CLASS_NAMES,
-        PERIPHERAL_MAJOR_DEVICE_CLASS:  PERIPHERAL_MINOR_DEVICE_CLASS_NAMES,
-        WEARABLE_MAJOR_DEVICE_CLASS:    WEARABLE_MINOR_DEVICE_CLASS_NAMES,
-        TOY_MAJOR_DEVICE_CLASS:         TOY_MINOR_DEVICE_CLASS_NAMES,
-        HEALTH_MAJOR_DEVICE_CLASS:      HEALTH_MINOR_DEVICE_CLASS_NAMES,
+        PERIPHERAL_MAJOR_DEVICE_CLASS:  PERIPHERAL_MINOR_DEVICE_CLASS_NAMES
    }

    # fmt: on
@@ -58,7 +58,7 @@ from .hci import (
    HCI_MITM_REQUIRED_GENERAL_BONDING_AUTHENTICATION_REQUIREMENTS,
    HCI_MITM_REQUIRED_NO_BONDING_AUTHENTICATION_REQUIREMENTS,
    HCI_NO_INPUT_NO_OUTPUT_IO_CAPABILITY,
-    HCI_R2_PAGE_SCAN_REPETITION_MODE,
+    HCI_R0_PAGE_SCAN_REPETITION_MODE,
    HCI_REMOTE_USER_TERMINATED_CONNECTION_ERROR,
    HCI_SUCCESS,
    HCI_WRITE_LE_HOST_SUPPORT_COMMAND,
@@ -1842,7 +1842,7 @@ class Device(CompositeEventEmitter):
                    HCI_Create_Connection_Command(
                        bd_addr=peer_address,
                        packet_type=0xCC18,  # FIXME: change
-                        page_scan_repetition_mode=HCI_R2_PAGE_SCAN_REPETITION_MODE,
+                        page_scan_repetition_mode=HCI_R0_PAGE_SCAN_REPETITION_MODE,
                        clock_offset=0x0000,
                        allow_role_switch=0x01,
                        reserved=0,
@@ -2851,22 +2851,18 @@ class Device(CompositeEventEmitter):
        method = methods[peer_io_capability][io_capability]

        async def reply() -> None:
-            try:
-                if await connection.abort_on('disconnection', method()):
-                    await self.host.send_command(
-                        HCI_User_Confirmation_Request_Reply_Command(  # type: ignore[call-arg]
-                            bd_addr=connection.peer_address
-                        )
+            if await connection.abort_on('disconnection', method()):
+                await self.host.send_command(
+                    HCI_User_Confirmation_Request_Reply_Command(  # type: ignore[call-arg]
+                        bd_addr=connection.peer_address
+                    )
+                )
+            else:
+                await self.host.send_command(
+                    HCI_User_Confirmation_Request_Negative_Reply_Command(  # type: ignore[call-arg]
+                        bd_addr=connection.peer_address
                    )
-                    return
-            except Exception as error:
-                logger.warning(f'exception while confirming: {error}')
-
-            await self.host.send_command(
-                HCI_User_Confirmation_Request_Negative_Reply_Command(  # type: ignore[call-arg]
-                    bd_addr=connection.peer_address
                )
-            )

        AsyncRunner.spawn(reply())

@@ -2878,25 +2874,21 @@ class Device(CompositeEventEmitter):
        pairing_config = self.pairing_config_factory(connection)

        async def reply() -> None:
-            try:
-                number = await connection.abort_on(
-                    'disconnection', pairing_config.delegate.get_number()
-                )
-                if number is not None:
-                    await self.host.send_command(
-                        HCI_User_Passkey_Request_Reply_Command(  # type: ignore[call-arg]
-                            bd_addr=connection.peer_address, numeric_value=number
-                        )
-                    )
-                    return
-            except Exception as error:
-                logger.warning(f'exception while asking for pass-key: {error}')
-
-            await self.host.send_command(
-                HCI_User_Passkey_Request_Negative_Reply_Command(  # type: ignore[call-arg]
-                    bd_addr=connection.peer_address
-                )
+            number = await connection.abort_on(
+                'disconnection', pairing_config.delegate.get_number()
            )
+            if number is not None:
+                await self.host.send_command(
+                    HCI_User_Passkey_Request_Reply_Command(  # type: ignore[call-arg]
+                        bd_addr=connection.peer_address, numeric_value=number
+                    )
+                )
+            else:
+                await self.host.send_command(
+                    HCI_User_Passkey_Request_Negative_Reply_Command(  # type: ignore[call-arg]
+                        bd_addr=connection.peer_address
+                    )
+                )

        AsyncRunner.spawn(reply())

@@ -858,13 +858,10 @@ class Session:
            self.tk = self.passkey.to_bytes(16, byteorder='little')
            logger.debug(f'TK from passkey = {self.tk.hex()}')

-        try:
-            self.connection.abort_on(
-                'disconnection',
-                self.pairing_config.delegate.display_number(self.passkey, digits=6),
-            )
-        except Exception as error:
-            logger.warning(f'exception while displaying number: {error}')
+        self.connection.abort_on(
+            'disconnection',
+            self.pairing_config.delegate.display_number(self.passkey, digits=6),
+        )

    def input_passkey(self, next_steps: Optional[Callable[[], None]] = None) -> None:
        # Prompt the user for the passkey displayed on the peer
@@ -1303,11 +1300,7 @@ class Session:
        self, command: SMP_Pairing_Request_Command
    ) -> None:
        # Check if the request should proceed
-        try:
-            accepted = await self.pairing_config.delegate.accept()
-        except Exception as error:
-            logger.warning(f'exception while accepting: {error}')
-            accepted = False
+        accepted = await self.pairing_config.delegate.accept()
        if not accepted:
            logger.debug('pairing rejected by delegate')
            self.send_pairing_failed(SMP_PAIRING_NOT_SUPPORTED_ERROR)
@@ -1,11 +1,11 @@
-WEBSOCKET CLIENT TRANSPORT
-==========================
+UDP TRANSPORT
+=============

-The WebSocket Client transport is WebSocket connection to a WebSocket server over which HCI packets
-are sent and received.
+The UDP transport is a UDP socket, receiving packets on a specified port number, and sending packets to a specified host and port number.

 ## Moniker
-The moniker syntax for a WebSocket Client transport is: `ws-client:<ws-url>`
+The moniker syntax for a UDP transport is: `udp:<local-host>:<local-port>,<remote-host>:<remote-port>`.

 !!! example
-    `ws-client:ws://localhost:1234/some/path`
+    `udp:0.0.0.0:9000,127.0.0.1:9001`
+    UDP transport where packets are received on port `9000` and sent to `127.0.0.1` on port `9001`
@@ -1,13 +1,11 @@
-WEBSOCKET SERVER TRANSPORT
-==========================
+UDP TRANSPORT
+=============

-The WebSocket Server transport is WebSocket server that accepts connections from a WebSocket
-client. HCI packets are sent and received over the connection.
+The UDP transport is a UDP socket, receiving packets on a specified port number, and sending packets to a specified host and port number.

 ## Moniker
-The moniker syntax for a WebSocket Server transport is: `ws-server:<host>:<port>`,
-where `<host>` may be the address of a local network interface, or `_`to accept connections on all local network interfaces. `<port>` is the TCP port number on which to accept connections.
-
+The moniker syntax for a UDP transport is: `udp:<local-host>:<local-port>,<remote-host>:<remote-port>`.

 !!! example
-    `ws-server:_:9001`
+    `udp:0.0.0.0:9000,127.0.0.1:9001`
+    UDP transport where packets are received on port `9000` and sent to `127.0.0.1` on port `9001`
@@ -62,7 +62,7 @@ async def main():
            print(
                f'>>> {color(advertisement.address, address_color)} '
                f'[{color(address_type_string, type_color)}]'
-                f'{address_qualifier}:{separator}RSSI: {advertisement.rssi}'
+                f'{address_qualifier}:{separator}RSSI:{advertisement.rssi}'
                f'{separator}'
                f'{advertisement.data.to_string(separator)}'
            )