Merge pull request #499 from google/gbg/rfcomm-bridge

rfcomm bridge app

apps/bench.py

@@ -899,14 +899,26 @@ async def drain(self):
 # RfcommClient
 # -----------------------------------------------------------------------------
 class RfcommClient(StreamedPacketIO):
- def __init__(self, device, channel, uuid, l2cap_mtu, max_frame_size, window_size):
+ def __init__(
+ self,
+ device,
+ channel,
+ uuid,
+ l2cap_mtu,
+ max_frame_size,
+ initial_credits,
+ max_credits,
+ credits_threshold,
+ ):
  super().__init__()
  self.device = device
  self.channel = channel
  self.uuid = uuid
  self.l2cap_mtu = l2cap_mtu
  self.max_frame_size = max_frame_size
- self.window_size = window_size
+ self.initial_credits = initial_credits
+ self.max_credits = max_credits
+ self.credits_threshold = credits_threshold
  self.rfcomm_session = None
  self.ready = asyncio.Event()
 
@@ -940,12 +952,17 @@ async def on_connection(self, connection):
  logging.info(color(f'### Opening session for channel {channel}...', 'yellow'))
  try:
  dlc_options = {}
- if self.max_frame_size:
+ if self.max_frame_size is not None:
  dlc_options['max_frame_size'] = self.max_frame_size
- if self.window_size:
- dlc_options['window_size'] = self.window_size
+ if self.initial_credits is not None:
+ dlc_options['initial_credits'] = self.initial_credits
  rfcomm_session = await rfcomm_mux.open_dlc(channel, **dlc_options)
  logging.info(color(f'### Session open: {rfcomm_session}', 'yellow'))
+ if self.max_credits is not None:
+ rfcomm_session.rx_max_credits = self.max_credits
+ if self.credits_threshold is not None:
+ rfcomm_session.rx_credits_threshold = self.credits_threshold
+
  except bumble.core.ConnectionError as error:
  logging.info(color(f'!!! Session open failed: {error}', 'red'))
  await rfcomm_mux.disconnect()
@@ -969,8 +986,19 @@ async def drain(self):
 # RfcommServer
 # -----------------------------------------------------------------------------
 class RfcommServer(StreamedPacketIO):
- def __init__(self, device, channel, l2cap_mtu):
+ def __init__(
+ self,
+ device,
+ channel,
+ l2cap_mtu,
+ max_frame_size,
+ initial_credits,
+ max_credits,
+ credits_threshold,
+ ):
  super().__init__()
+ self.max_credits = max_credits
+ self.credits_threshold = credits_threshold
  self.dlc = None
  self.ready = asyncio.Event()
 
@@ -981,7 +1009,12 @@ def __init__(self, device, channel, l2cap_mtu):
  rfcomm_server = bumble.rfcomm.Server(device, **server_options)
 
  # Listen for incoming DLC connections
- channel_number = rfcomm_server.listen(self.on_dlc, channel)
+ dlc_options = {}
+ if max_frame_size is not None:
+ dlc_options['max_frame_size'] = max_frame_size
+ if initial_credits is not None:
+ dlc_options['initial_credits'] = initial_credits
+ channel_number = rfcomm_server.listen(self.on_dlc, channel, **dlc_options)
 
  # Setup the SDP to advertise this channel
  device.sdp_service_records = make_sdp_records(channel_number)
@@ -1004,6 +1037,10 @@ def on_dlc(self, dlc):
  dlc.sink = self.on_packet
  self.io_sink = dlc.write
  self.dlc = dlc
+ if self.max_credits is not None:
+ dlc.rx_max_credits = self.max_credits
+ if self.credits_threshold is not None:
+ dlc.rx_credits_threshold = self.credits_threshold
 
  async def drain(self):
  assert self.dlc
@@ -1321,14 +1358,20 @@ def create_mode(device):
  uuid=ctx.obj['rfcomm_uuid'],
  l2cap_mtu=ctx.obj['rfcomm_l2cap_mtu'],
  max_frame_size=ctx.obj['rfcomm_max_frame_size'],
- window_size=ctx.obj['rfcomm_window_size'],
+ initial_credits=ctx.obj['rfcomm_initial_credits'],
+ max_credits=ctx.obj['rfcomm_max_credits'],
+ credits_threshold=ctx.obj['rfcomm_credits_threshold'],
  )
 
  if mode == 'rfcomm-server':
  return RfcommServer(
  device,
  channel=ctx.obj['rfcomm_channel'],
  l2cap_mtu=ctx.obj['rfcomm_l2cap_mtu'],
+ max_frame_size=ctx.obj['rfcomm_max_frame_size'],
+ initial_credits=ctx.obj['rfcomm_initial_credits'],
+ max_credits=ctx.obj['rfcomm_max_credits'],
+ credits_threshold=ctx.obj['rfcomm_credits_threshold'],
  )
 
  raise ValueError('invalid mode')
@@ -1427,9 +1470,19 @@ def create_role(packet_io):
  help='RFComm maximum frame size',
 )
 @click.option(
- '--rfcomm-window-size',
+ '--rfcomm-initial-credits',
+ type=int,
+ help='RFComm initial credits',
+)
+@click.option(
+ '--rfcomm-max-credits',
+ type=int,
+ help='RFComm max credits',
+)
+@click.option(
+ '--rfcomm-credits-threshold',
  type=int,
- help='RFComm window size',
+ help='RFComm credits threshold',
 )
 @click.option(
  '--l2cap-psm',
@@ -1530,7 +1583,9 @@ def bench(
  rfcomm_uuid,
  rfcomm_l2cap_mtu,
  rfcomm_max_frame_size,
- rfcomm_window_size,
+ rfcomm_initial_credits,
+ rfcomm_max_credits,
+ rfcomm_credits_threshold,
  l2cap_psm,
  l2cap_mtu,
  l2cap_mps,
@@ -1545,7 +1600,9 @@ def bench(
  ctx.obj['rfcomm_uuid'] = rfcomm_uuid
  ctx.obj['rfcomm_l2cap_mtu'] = rfcomm_l2cap_mtu
  ctx.obj['rfcomm_max_frame_size'] = rfcomm_max_frame_size
- ctx.obj['rfcomm_window_size'] = rfcomm_window_size
+ ctx.obj['rfcomm_initial_credits'] = rfcomm_initial_credits
+ ctx.obj['rfcomm_max_credits'] = rfcomm_max_credits
+ ctx.obj['rfcomm_credits_threshold'] = rfcomm_credits_threshold
  ctx.obj['l2cap_psm'] = l2cap_psm
  ctx.obj['l2cap_mtu'] = l2cap_mtu
  ctx.obj['l2cap_mps'] = l2cap_mps