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

Commit a1fb9564 authored by Hansong Zhang's avatar Hansong Zhang
Browse files

L2CAP: Separate Classic and LE dynamic channel API 

Test: run_cert.sh
Bug: 144503952
Change-Id: Ifbbcd7a90fcd71aa0cee6d9b455c23e489d53e21
parent f01495a5

system/gd/l2cap/classic/dynamic_channel.h

0 → 100644
+29 −0
Original line number Diff line number Diff line 
/*

 * Copyright 2019 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



#pragma once



#include "l2cap/dynamic_channel.h"



namespace bluetooth {

namespace l2cap {

namespace classic {



using DynamicChannel = l2cap::DynamicChannel;



}  // namespace classic

}  // namespace l2cap

}  // namespace bluetooth

system/gd/l2cap/classic/dynamic_channel_manager.h

+1 −1
Original line number Diff line number Diff line
@@ -19,9 +19,9 @@ 


#include "hci/acl_manager.h"

#include "hci/address.h"

#include "l2cap/classic/dynamic_channel.h"

#include "l2cap/classic/dynamic_channel_configuration_option.h"

#include "l2cap/classic/dynamic_channel_service.h"

#include "l2cap/dynamic_channel.h"

#include "l2cap/l2cap_packets.h"

#include "l2cap/psm.h"

#include "l2cap/security_policy.h"

system/gd/l2cap/classic/internal/dynamic_channel_service_impl.h

+1 −1
Original line number Diff line number Diff line
@@ -18,10 +18,10 @@ 


#include "common/bind.h"



#include "l2cap/classic/dynamic_channel.h"

#include "l2cap/classic/dynamic_channel_configuration_option.h"

#include "l2cap/classic/dynamic_channel_manager.h"

#include "l2cap/classic/dynamic_channel_service.h"

#include "l2cap/dynamic_channel.h"



namespace bluetooth {

namespace l2cap {

system/gd/l2cap/le/dynamic_channel.h

0 → 100644
+29 −0
Original line number Diff line number Diff line 
/*

 * Copyright 2019 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



#pragma once



#include "l2cap/dynamic_channel.h"



namespace bluetooth {

namespace l2cap {

namespace le {



using DynamicChannel = l2cap::DynamicChannel;



}  // namespace le

}  // namespace l2cap

}  // namespace bluetooth

system/gd/shim/l2cap.cc

+9 −7
Original line number Diff line number Diff line
@@ -50,7 +50,8 @@ static const ConnectionInterfaceDescriptor kMaxConnections = UINT16_MAX - kStart 


using ServiceInterfaceCallback =

    std::function<void(l2cap::Psm psm, l2cap::classic::DynamicChannelManager::RegistrationResult result)>;

using ConnectionInterfaceCallback = std::function<void(l2cap::Psm psm, std::unique_ptr<l2cap::DynamicChannel>)>;

using ConnectionInterfaceCallback =

    std::function<void(l2cap::Psm psm, std::unique_ptr<l2cap::classic::DynamicChannel>)>;



std::unique_ptr<packet::RawBuilder> MakeUniquePacket(const uint8_t* data, size_t len) {

  packet::RawBuilder builder;
@@ -62,7 +63,7 @@ std::unique_ptr<packet::RawBuilder> MakeUniquePacket(const uint8_t* data, size_t 


class ConnectionInterface {

 public:

  ConnectionInterface(ConnectionInterfaceDescriptor cid, std::unique_ptr<l2cap::DynamicChannel> channel,

  ConnectionInterface(ConnectionInterfaceDescriptor cid, std::unique_ptr<l2cap::classic::DynamicChannel> channel,

                      os::Handler* handler)

      : cid_(cid), channel_(std::move(channel)), handler_(handler), on_data_ready_callback_(nullptr),

        on_connection_closed_callback_(nullptr), address_(channel_->GetDevice()) {
@@ -138,7 +139,7 @@ class ConnectionInterface { 


 private:

  const ConnectionInterfaceDescriptor cid_;

  const std::unique_ptr<l2cap::DynamicChannel> channel_;

  const std::unique_ptr<l2cap::classic::DynamicChannel> channel_;

  os::Handler* handler_;



  ReadDataReadyCallback on_data_ready_callback_;
@@ -154,7 +155,7 @@ class ConnectionInterface { 


struct ConnectionInterfaceManager {

 public:

  ConnectionInterfaceDescriptor AddChannel(std::unique_ptr<l2cap::DynamicChannel> channel);

  ConnectionInterfaceDescriptor AddChannel(std::unique_ptr<l2cap::classic::DynamicChannel> channel);

  void RemoveConnection(ConnectionInterfaceDescriptor cid);



  void SetReadDataReadyCallback(ConnectionInterfaceDescriptor cid, ReadDataReadyCallback on_data_ready);
@@ -217,7 +218,8 @@ ConnectionInterfaceDescriptor ConnectionInterfaceManager::AllocateConnectionInte 
  return current_connection_interface_descriptor_++;

}



ConnectionInterfaceDescriptor ConnectionInterfaceManager::AddChannel(std::unique_ptr<l2cap::DynamicChannel> channel) {

ConnectionInterfaceDescriptor ConnectionInterfaceManager::AddChannel(

    std::unique_ptr<l2cap::classic::DynamicChannel> channel) {

  if (!HasResources()) {

    return kInvalidConnectionInterfaceDescriptor;

  }
@@ -265,7 +267,7 @@ class PendingConnection { 
      : connection_interface_manager_(connection_interface_manager), psm_(psm), address_(address),

        on_open_(std::move(on_open)), completed_(std::move(completed)) {}



  void OnConnectionOpen(std::unique_ptr<l2cap::DynamicChannel> channel) {

  void OnConnectionOpen(std::unique_ptr<l2cap::classic::DynamicChannel> channel) {

    LOG_DEBUG("Local initiated connection is open to device:%s for psm:%hd", address_.ToString().c_str(), psm_);

    ConnectionInterfaceDescriptor cid = connection_interface_manager_->AddChannel(std::move(channel));

    completed_.set_value(cid);
@@ -320,7 +322,7 @@ class ServiceInterface { 
    completed_.set_value();

  }



  void OnConnectionOpen(std::unique_ptr<l2cap::DynamicChannel> channel) {

  void OnConnectionOpen(std::unique_ptr<l2cap::classic::DynamicChannel> channel) {

    LOG_DEBUG("Remote initiated connection is open from device:%s for psm:%hd", channel->GetDevice().ToString().c_str(),

              psm_);

    hci::Address address = channel->GetDevice();