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

Commit 45a72344 authored by Jakub Pawlowski's avatar Jakub Pawlowski
Browse files

GATT: improve logs around disconnection 

It's worth knowing what device disconnected. Either conn_id or bda with
transport is fine.

Bug: 355654051
Test: mma -j32
Flag: exempt, log only change
Change-Id: I9dfa207fcccc6436b930c32b02c151c06fc2a136
parent 36b07f16

system/stack/gatt/gatt_main.cc

+0 −1
Original line number Diff line number Diff line
@@ -294,7 +294,6 @@ bool gatt_disconnect(tGATT_TCB* p_tcb) { 
  tGATT_CH_STATE ch_state = gatt_get_ch_state(p_tcb);

  if (ch_state == GATT_CH_CLOSING) {

    log::debug("Device already in closing state peer:{}", p_tcb->peer_bda);

    log::verbose("already in closing state");

    return true;

  }

system/stack/gatt/gatt_utils.cc

+3 −3
Original line number Diff line number Diff line
@@ -758,10 +758,10 @@ void gatt_rsp_timeout(void* data) { 
  auto eatt_channel =

          EattExtension::GetInstance()->FindEattChannelByCid(p_clcb->p_tcb->peer_bda, p_clcb->cid);

  if (eatt_channel) {

    log::warn("disconnecting EATT cid: {}", p_clcb->cid);

    log::warn("conn_id: 0x{:04x} disconnecting EATT cid: {}", p_clcb->conn_id, p_clcb->cid);

    EattExtension::GetInstance()->Disconnect(p_clcb->p_tcb->peer_bda, p_clcb->cid);

  } else {

    log::warn("disconnecting GATT...");

    log::warn("conn_id: 0x{:04x} disconnecting GATT...", p_clcb->conn_id);

    gatt_disconnect(p_clcb->p_tcb);

  }

}
@@ -801,7 +801,7 @@ void gatt_indication_confirmation_timeout(void* data) { 
    return;

  }



  log::warn("disconnecting...");

  log::warn("disconnecting... bda:{} transport:{}", p_tcb->peer_bda, p_tcb->transport);

  gatt_disconnect(p_tcb);

}