pstruebi/bumble_fork
1
0
Fork 0
forked from auracaster/bumble_mirror
Code Pull Requests Activity

fix linter errors

Browse Source
This commit is contained in:
Gilles Boccon-Gibod
2023-09-22 15:08:10 -07:00
parent 64937c3f77
commit 1ad84ad51c
2 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
bumble/transport/android_emulator.py
View File

@@ -103,8 +103,7 @@ async def open_android_emulator_transport(spec: Optional[str]) -> Transport:
await channel.close() await channel.close()
transport = EmulatorTransport( transport = EmulatorTransport(
PumpedPacketSource(hci_device.read), PumpedPacketSource(hci_device.read), PumpedPacketSink(hci_device.write)
PumpedPacketSink(hci_device.write)
) )
transport.start() transport.start()

17
bumble/transport/android_netsim.py
View File

@@ -22,7 +22,7 @@ import grpc.aio
import os import os
import pathlib import pathlib
import sys import sys
from typing import Optional from typing import Dict, Optional
from .common import ( from .common import (
ParserSource, ParserSource,
@@ -130,7 +130,7 @@ def publish_grpc_port(grpc_port: int, instance_number: int = 0) -> bool:
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
async def open_android_netsim_controller_transport( async def open_android_netsim_controller_transport(
server_host: Optional[str], server_port: int server_host: Optional[str], server_port: int, options: Dict[str, str]
) -> Transport: ) -> Transport:
if not server_port: if not server_port:
raise ValueError('invalid port') raise ValueError('invalid port')
@@ -273,7 +273,9 @@ async def open_android_netsim_controller_transport(
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
async def open_android_netsim_host_transport(server_host, server_port, options): async def open_android_netsim_host_transport(
server_host: Optional[str], server_port: int, options: Dict[str, str]
):
# Wrapper for I/O operations # Wrapper for I/O operations
class HciDevice: class HciDevice:
def __init__(self, name, manufacturer, hci_device): def __init__(self, name, manufacturer, hci_device):
@@ -354,7 +356,7 @@ async def open_android_netsim_host_transport(server_host, server_port, options):
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
async def open_android_netsim_transport(spec): async def open_android_netsim_transport(spec: Optional[str]) -> Transport:
''' '''
Open a transport connection as a client or server, implementing Android's `netsim` Open a transport connection as a client or server, implementing Android's `netsim`
simulator protocol over gRPC. simulator protocol over gRPC.
@@ -401,14 +403,15 @@ async def open_android_netsim_transport(spec):
params = spec.split(',') if spec else [] params = spec.split(',') if spec else []
if params and ':' in params[0]: if params and ':' in params[0]:
# Explicit <host>:<port> # Explicit <host>:<port>
host, port = params[0].split(':') host, port_str = params[0].split(':')
port = int(port_str)
params_offset = 1 params_offset = 1
else: else:
host = None host = None
port = 0 port = 0
params_offset = 0 params_offset = 0
options = {} options: Dict[str, str] = {}
for param in params[params_offset:]: for param in params[params_offset:]:
if '=' not in param: if '=' not in param:
raise ValueError('invalid parameter, expected <name>=<value>') raise ValueError('invalid parameter, expected <name>=<value>')
@@ -421,6 +424,6 @@ async def open_android_netsim_transport(spec):
if mode == 'controller': if mode == 'controller':
if host is None: if host is None:
raise ValueError('<host>:<port> missing') raise ValueError('<host>:<port> missing')
return await open_android_netsim_controller_transport(host, port) return await open_android_netsim_controller_transport(host, port, options)
raise ValueError('invalid mode option') raise ValueError('invalid mode option')