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

Commit f63ca749 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "gd: Pair 2 phones"

parents 731ad67f 34276c4a

system/gd/l2cap/classic/internal/link.cc

+85 −0
Original line number Diff line number Diff line
@@ -237,6 +237,91 @@ bool Link::GetRemoteSupportsFcs() const { 
  return remote_supports_fcs_;

}



void Link::AddChannelPendingingAuthentication(PendingAuthenticateDynamicChannelConnection pending_channel) {

  pending_channel_list_.push_back(std::move(pending_channel));

}



void Link::OnConnectionPacketTypeChanged(uint16_t packet_type) {

  LOG_DEBUG("UNIMPLEMENTED %s", __func__);

}



void Link::OnAuthenticationComplete() {

  if (!pending_channel_list_.empty()) {

    acl_connection_->SetConnectionEncryption(hci::Enable::ENABLED);

  }

}



void Link::OnEncryptionChange(hci::EncryptionEnabled enabled) {

  encryption_enabled_ = enabled;

  if (encryption_enabled_ == hci::EncryptionEnabled::OFF) {

    LOG_DEBUG("Encryption has changed to disabled");

    return;

  }

  LOG_DEBUG("Encryption has changed to enabled .. restarting channels:%zd", pending_channel_list_.size());



  for (auto& channel : pending_channel_list_) {

    local_cid_to_pending_dynamic_channel_connection_map_[channel.cid_] =

        std::move(channel.pending_dynamic_channel_connection_);

    signalling_manager_.SendConnectionRequest(channel.psm_, channel.cid_);

  }

  pending_channel_list_.clear();

}



void Link::OnChangeConnectionLinkKeyComplete() {

  LOG_DEBUG("UNIMPLEMENTED %s", __func__);

}



void Link::OnReadClockOffsetComplete(uint16_t clock_offset) {

  LOG_DEBUG("UNIMPLEMENTED %s", __func__);

}



void Link::OnModeChange(hci::Mode current_mode, uint16_t interval) {

  LOG_DEBUG("UNIMPLEMENTED %s", __func__);

}



void Link::OnQosSetupComplete(hci::ServiceType service_type, uint32_t token_rate, uint32_t peak_bandwidth,

                              uint32_t latency, uint32_t delay_variation) {

  LOG_DEBUG("UNIMPLEMENTED %s", __func__);

}

void Link::OnFlowSpecificationComplete(hci::FlowDirection flow_direction, hci::ServiceType service_type,

                                       uint32_t token_rate, uint32_t token_bucket_size, uint32_t peak_bandwidth,

                                       uint32_t access_latency) {

  LOG_DEBUG("UNIMPLEMENTED %s", __func__);

}

void Link::OnFlushOccurred() {

  LOG_DEBUG("UNIMPLEMENTED %s", __func__);

}

void Link::OnRoleDiscoveryComplete(hci::Role current_role) {

  LOG_DEBUG("UNIMPLEMENTED %s", __func__);

}

void Link::OnReadLinkPolicySettingsComplete(uint16_t link_policy_settings) {

  LOG_DEBUG("UNIMPLEMENTED %s", __func__);

}

void Link::OnReadAutomaticFlushTimeoutComplete(uint16_t flush_timeout) {

  LOG_DEBUG("UNIMPLEMENTED %s", __func__);

}

void Link::OnReadTransmitPowerLevelComplete(uint8_t transmit_power_level) {

  LOG_DEBUG("UNIMPLEMENTED %s", __func__);

}

void Link::OnReadLinkSupervisionTimeoutComplete(uint16_t link_supervision_timeout) {

  LOG_DEBUG("UNIMPLEMENTED %s", __func__);

}

void Link::OnReadFailedContactCounterComplete(uint16_t failed_contact_counter) {

  LOG_DEBUG("UNIMPLEMENTED %s", __func__);

}

void Link::OnReadLinkQualityComplete(uint8_t link_quality) {

  LOG_DEBUG("UNIMPLEMENTED %s", __func__);

}

void Link::OnReadAfhChannelMapComplete(hci::AfhMode afh_mode, std::array<uint8_t, 10> afh_channel_map) {

  LOG_DEBUG("UNIMPLEMENTED %s", __func__);

}

void Link::OnReadRssiComplete(uint8_t rssi) {

  LOG_DEBUG("UNIMPLEMENTED %s", __func__);

}

void Link::OnReadClockComplete(uint32_t clock, uint16_t accuracy) {

  LOG_DEBUG("UNIMPLEMENTED %s", __func__);

}



}  // namespace internal

}  // namespace classic

}  // namespace l2cap

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

+28 −21
Original line number Diff line number Diff line
@@ -58,6 +58,12 @@ class Link : public l2cap::internal::ILink, public hci::ConnectionManagementCall 
    classic::DynamicChannelConfigurationOption configuration_;

  };



  struct PendingAuthenticateDynamicChannelConnection {

    Psm psm_;

    Cid cid_;

    PendingDynamicChannelConnection pending_dynamic_channel_connection_;

  };



  // ACL methods



  virtual void OnAclDisconnected(hci::ErrorCode status);
@@ -129,31 +135,31 @@ class Link : public l2cap::internal::ILink, public hci::ConnectionManagementCall 


  void SendLeCredit(Cid local_cid, uint16_t credit) override {}



  void AddChannelPendingingAuthentication(PendingAuthenticateDynamicChannelConnection pending_channel);



  // ConnectionManagementCallbacks

  virtual void OnConnectionPacketTypeChanged(uint16_t packet_type) override {}

  virtual void OnAuthenticationComplete() override {}

  virtual void OnEncryptionChange(hci::EncryptionEnabled enabled) override {

    encryption_enabled_ = enabled;

  }

  virtual void OnChangeConnectionLinkKeyComplete() override {}

  virtual void OnReadClockOffsetComplete(uint16_t clock_offset) override {}

  virtual void OnModeChange(hci::Mode current_mode, uint16_t interval) override {}

  virtual void OnConnectionPacketTypeChanged(uint16_t packet_type) override;

  virtual void OnAuthenticationComplete() override;

  virtual void OnEncryptionChange(hci::EncryptionEnabled enabled) override;

  virtual void OnChangeConnectionLinkKeyComplete() override;

  virtual void OnReadClockOffsetComplete(uint16_t clock_offset) override;

  virtual void OnModeChange(hci::Mode current_mode, uint16_t interval) override;

  virtual void OnQosSetupComplete(hci::ServiceType service_type, uint32_t token_rate, uint32_t peak_bandwidth,

                                  uint32_t latency, uint32_t delay_variation) override {}

                                  uint32_t latency, uint32_t delay_variation) override;

  virtual void OnFlowSpecificationComplete(hci::FlowDirection flow_direction, hci::ServiceType service_type,

                                           uint32_t token_rate, uint32_t token_bucket_size, uint32_t peak_bandwidth,

                                           uint32_t access_latency) override {}

  virtual void OnFlushOccurred() override {}

  virtual void OnRoleDiscoveryComplete(hci::Role current_role) override {}

  virtual void OnReadLinkPolicySettingsComplete(uint16_t link_policy_settings) override {}

  virtual void OnReadAutomaticFlushTimeoutComplete(uint16_t flush_timeout) override {}

  virtual void OnReadTransmitPowerLevelComplete(uint8_t transmit_power_level) override {}

  virtual void OnReadLinkSupervisionTimeoutComplete(uint16_t link_supervision_timeout) override {}

  virtual void OnReadFailedContactCounterComplete(uint16_t failed_contact_counter) override {}

  virtual void OnReadLinkQualityComplete(uint8_t link_quality) override {}

  virtual void OnReadAfhChannelMapComplete(hci::AfhMode afh_mode, std::array<uint8_t, 10> afh_channel_map) override {}

  virtual void OnReadRssiComplete(uint8_t rssi) override {}

  virtual void OnReadClockComplete(uint32_t clock, uint16_t accuracy) override {}

                                           uint32_t access_latency) override;

  virtual void OnFlushOccurred() override;

  virtual void OnRoleDiscoveryComplete(hci::Role current_role) override;

  virtual void OnReadLinkPolicySettingsComplete(uint16_t link_policy_settings) override;

  virtual void OnReadAutomaticFlushTimeoutComplete(uint16_t flush_timeout) override;

  virtual void OnReadTransmitPowerLevelComplete(uint8_t transmit_power_level) override;

  virtual void OnReadLinkSupervisionTimeoutComplete(uint16_t link_supervision_timeout) override;

  virtual void OnReadFailedContactCounterComplete(uint16_t failed_contact_counter) override;

  virtual void OnReadLinkQualityComplete(uint8_t link_quality) override;

  virtual void OnReadAfhChannelMapComplete(hci::AfhMode afh_mode, std::array<uint8_t, 10> afh_channel_map) override;

  virtual void OnReadRssiComplete(uint8_t rssi) override;

  virtual void OnReadClockComplete(uint32_t clock, uint16_t accuracy) override;



 private:

  os::Handler* l2cap_handler_;
@@ -171,6 +177,7 @@ class Link : public l2cap::internal::ILink, public hci::ConnectionManagementCall 
  bool remote_supports_ertm_ = false;

  bool remote_supports_fcs_ = false;

  hci::EncryptionEnabled encryption_enabled_ = hci::EncryptionEnabled::OFF;

  std::list<Link::PendingAuthenticateDynamicChannelConnection> pending_channel_list_;

  DISALLOW_COPY_AND_ASSIGN(Link);

};

system/gd/l2cap/classic/internal/link_manager.cc

+7 −0
Original line number Diff line number Diff line
@@ -98,6 +98,13 @@ void LinkManager::ConnectDynamicChannelServices( 
    }

    return;

  }

  if (dynamic_channel_service_manager_->GetService(psm)->GetSecurityPolicy().RequiresAuthentication() &&

      !link->IsAuthenticated()) {

    link->AddChannelPendingingAuthentication(

        {psm, link->ReserveDynamicChannel(), std::move(pending_dynamic_channel_connection)});

    link->Authenticate();

    return;

  }

  link->SendConnectionRequest(psm, link->ReserveDynamicChannel(), std::move(pending_dynamic_channel_connection));

}