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

Commit 04df12e8 authored by Chris Manton's avatar Chris Manton
Browse files

Re-log stack/btm/btm_ble::btm_ble_start_sec_check 

Toward readable code

Bug: 163134718
Tag: #refactor
Test: compile & verify basic functions working

Change-Id: I083d8a4af4af47b9a78f61d4618342abb76acbec
parent b7499d4d

system/stack/btm/btm_ble.cc

+15 −13
Original line number Diff line number Diff line
@@ -898,7 +898,7 @@ tL2CAP_LE_RESULT_CODE btm_ble_start_sec_check(const RawAddress& bd_addr, 
  /* If there is no application registered with this PSM do not allow connection

   */

  if (!p_serv_rec) {

    BTM_TRACE_WARNING("%s PSM: %d no application registerd", __func__, psm);

    LOG_WARN("PSM: %d no application registered", psm);

    (*p_callback)(&bd_addr, BT_TRANSPORT_LE, p_ref_data, BTM_MODE_UNSUPPORTED);

    return L2CAP_LE_RESULT_NO_PSM;

  }
@@ -909,17 +909,17 @@ tL2CAP_LE_RESULT_CODE btm_ble_start_sec_check(const RawAddress& bd_addr, 


  if (!is_originator) {

    if ((p_serv_rec->security_flags & BTM_SEC_IN_ENCRYPT) && !is_encrypted) {

      BTM_TRACE_ERROR(

          "%s: L2CAP_LE_RESULT_INSUFFICIENT_ENCRYP. service "

      LOG_ERROR(

          "L2CAP_LE_RESULT_INSUFFICIENT_ENCRYP. service "

          "security_flags=0x%x, ",

          __func__, p_serv_rec->security_flags);

          p_serv_rec->security_flags);

      return L2CAP_LE_RESULT_INSUFFICIENT_ENCRYP;

    } else if ((p_serv_rec->security_flags & BTM_SEC_IN_AUTHENTICATE) &&

               !(is_link_key_authed || is_authenticated)) {

      BTM_TRACE_ERROR(

          "%s: L2CAP_LE_RESULT_INSUFFICIENT_AUTHENTICATION. service "

      LOG_ERROR(

          "L2CAP_LE_RESULT_INSUFFICIENT_AUTHENTICATION. service "

          "security_flags=0x%x, ",

          __func__, p_serv_rec->security_flags);

          p_serv_rec->security_flags);

      return L2CAP_LE_RESULT_INSUFFICIENT_AUTHENTICATION;

    }

    /* TODO: When security is required, then must check that the key size of our
@@ -934,32 +934,34 @@ tL2CAP_LE_RESULT_CODE btm_ble_start_sec_check(const RawAddress& bd_addr, 


  switch (sec_act) {

    case BTM_SEC_OK:

      BTM_TRACE_DEBUG("%s Security met", __func__);

      LOG_DEBUG("Security met");

      p_callback(&bd_addr, BT_TRANSPORT_LE, p_ref_data, BTM_SUCCESS);

      result = L2CAP_LE_RESULT_CONN_OK;

      break;



    case BTM_SEC_ENCRYPT:

      BTM_TRACE_DEBUG("%s Encryption needs to be done", __func__);

      LOG_DEBUG("Encryption needs to be done");

      ble_sec_act = BTM_BLE_SEC_ENCRYPT;

      break;



    case BTM_SEC_ENCRYPT_MITM:

      BTM_TRACE_DEBUG("%s Pairing with MITM needs to be done", __func__);

      LOG_DEBUG("Pairing with MITM needs to be done");

      ble_sec_act = BTM_BLE_SEC_ENCRYPT_MITM;

      break;



    case BTM_SEC_ENCRYPT_NO_MITM:

      BTM_TRACE_DEBUG("%s Pairing with No MITM needs to be done", __func__);

      LOG_DEBUG("Pairing with No MITM needs to be done");

      ble_sec_act = BTM_BLE_SEC_ENCRYPT_NO_MITM;

      break;



    case BTM_SEC_ENC_PENDING:

      BTM_TRACE_DEBUG("%s Ecryption pending", __func__);

      LOG_DEBUG("Ecryption pending");

      break;

  }



  if (ble_sec_act == BTM_BLE_SEC_NONE) return result;

  if (ble_sec_act == BTM_BLE_SEC_NONE) {

    return result;

  }



  l2cble_update_sec_act(bd_addr, sec_act);

  BTM_SetEncryption(bd_addr, BT_TRANSPORT_LE, p_callback, p_ref_data,