fix sequencing logic broken by earlier merge

Merge pull request #76 from mogenson/connection-error-params
Swap arguments to ConnectionError in RFCOMM Multiplexer
2022-11-21 21:07:47 -08:00 · 2022-11-18 10:48:02 -05:00 · 2022-11-18 10:02:40 -05:00 · 2022-11-15 10:49:55 -08:00 · 2022-11-14 17:16:47 -08:00 · 2022-11-14 20:05:12 +00:00
4 changed files with 22 additions and 15 deletions
@@ -1753,7 +1753,10 @@ class Address:
        '''
        String representation of the address, MSB first
        '''
-        return ':'.join([f'{x:02X}' for x in reversed(self.address_bytes)])
+        str = ':'.join([f'{x:02X}' for x in reversed(self.address_bytes)])
+        if not self.is_public:
+            return str
+        return str + '/P'


 # -----------------------------------------------------------------------------
@@ -121,24 +121,28 @@ class Host(EventEmitter):
            self.hc_acl_data_packet_length     = response.return_parameters.hc_acl_data_packet_length
            self.hc_total_num_acl_data_packets = response.return_parameters.hc_total_num_acl_data_packets

+            logger.debug(
+                f'HCI ACL flow control: hc_acl_data_packet_length={self.hc_acl_data_packet_length},'
+                f'hc_total_num_acl_data_packets={self.hc_total_num_acl_data_packets}'
+            )
+
        if self.supports_command(HCI_LE_READ_BUFFER_SIZE_COMMAND):
            response = await self.send_command(HCI_LE_Read_Buffer_Size_Command(), check_result=True)
            self.hc_le_acl_data_packet_length     = response.return_parameters.hc_le_acl_data_packet_length
            self.hc_total_num_le_acl_data_packets = response.return_parameters.hc_total_num_le_acl_data_packets

-        if response.return_parameters.hc_le_acl_data_packet_length == 0 or response.return_parameters.hc_total_num_le_acl_data_packets == 0:
-            # LE and Classic share the same values
-            self.hc_le_acl_data_packet_length     = self.hc_acl_data_packet_length
-            self.hc_total_num_le_acl_data_packets = self.hc_total_num_acl_data_packets
+            logger.debug(
+                f'HCI LE ACL flow control: hc_le_acl_data_packet_length={self.hc_le_acl_data_packet_length},'
+                f'hc_total_num_le_acl_data_packets={self.hc_total_num_le_acl_data_packets}'
+            )

-        logger.debug(
-            f'HCI ACL flow control: hc_acl_data_packet_length={self.hc_acl_data_packet_length},'
-            f'hc_total_num_acl_data_packets={self.hc_total_num_acl_data_packets}'
-        )
-        logger.debug(
-            f'HCI LE ACL flow control: hc_le_acl_data_packet_length={self.hc_le_acl_data_packet_length},'
-            f'hc_total_num_le_acl_data_packets={self.hc_total_num_le_acl_data_packets}'
-        )
+            if (
+                response.return_parameters.hc_le_acl_data_packet_length == 0 or
+                response.return_parameters.hc_total_num_le_acl_data_packets == 0
+            ):
+                # LE and Classic share the same values
+                self.hc_le_acl_data_packet_length     = self.hc_acl_data_packet_length
+                self.hc_total_num_le_acl_data_packets = self.hc_total_num_acl_data_packets

        if (
            self.supports_command(HCI_LE_READ_SUGGESTED_DEFAULT_DATA_LENGTH_COMMAND) and
@@ -636,8 +636,8 @@ class Multiplexer(EventEmitter):
            if self.open_result:
                self.open_result.set_exception(ConnectionError(
                    ConnectionError.CONNECTION_REFUSED,
-                    self.l2cap_channel.connection.peer_address,
                    BT_BR_EDR_TRANSPORT,
+                    self.l2cap_channel.connection.peer_address,
                    'rfcomm'
                ))
        else:
@@ -59,7 +59,7 @@ def test_HCI_LE_Connection_Complete_Event():

 # -----------------------------------------------------------------------------
 def test_HCI_LE_Advertising_Report_Event():
-    address = Address('00:11:22:33:44:55')
+    address = Address('00:11:22:33:44:55/P')
    report = HCI_LE_Advertising_Report_Event.Report(
        HCI_LE_Advertising_Report_Event.Report.FIELDS,
        event_type   = HCI_LE_Advertising_Report_Event.ADV_IND,
Author	SHA1	Message	Date
Gilles Boccon-Gibod	22218627f6	fix sequencing logic broken by earlier merge	2022-11-21 21:07:47 -08:00
Michael Mogenson	4988a31487	Merge pull request #76 from mogenson/connection-error-params Swap arguments to ConnectionError in RFCOMM Multiplexer	2022-11-18 10:48:02 -05:00
Michael Mogenson	e6c062117f	Swap arguments to ConnectionError in RFCOMM Multiplexer Minor fixup. Change the order of arguments to ConnectionError to set the transport and address correctly in rfcomm.py on_dm_frame().	2022-11-18 10:02:40 -05:00
Gilles Boccon-Gibod	f2133235d5	Merge pull request #73 from google/gbg/faster-l2cap-test lower the number of test cases for l2cap in order to speed up the test	2022-11-15 10:49:55 -08:00
Lucas Abel	25ce38c3f5	Merge pull request #72 from google/uael/public-str-address address: add public information to the stringified value	2022-11-14 17:16:47 -08:00
Abel Lucas	c0810230a6	address: add public information to the stringified value This affect the way security keys are stored. For instance the same key can be used both as public and random, and it need to be stored separately one from each other.	2022-11-14 20:05:12 +00:00