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

Commit 65cb0ced authored by Hui Peng's avatar Hui Peng Committed by Gerrit Code Review
Browse files

Merge "Log l2cap cmd names instead of integer value" into main

parents f4dc7933 b3b7e810

system/stack/include/l2cdefs.h

+31 −0
Original line number Diff line number Diff line
@@ -188,6 +188,37 @@ inline std::string l2cap_result_code_text(const tL2CAP_CONN& result) { 
             std::string("]");

  }

}



static inline std::string l2cap_command_code_text(uint8_t cmd) {

  switch (cmd) {

    CASE_RETURN_TEXT(L2CAP_CMD_REJECT);

    CASE_RETURN_TEXT(L2CAP_CMD_CONN_REQ);

    CASE_RETURN_TEXT(L2CAP_CMD_CONN_RSP);

    CASE_RETURN_TEXT(L2CAP_CMD_CONFIG_REQ);

    CASE_RETURN_TEXT(L2CAP_CMD_CONFIG_RSP);

    CASE_RETURN_TEXT(L2CAP_CMD_DISC_REQ);

    CASE_RETURN_TEXT(L2CAP_CMD_DISC_RSP);

    CASE_RETURN_TEXT(L2CAP_CMD_ECHO_REQ);

    CASE_RETURN_TEXT(L2CAP_CMD_ECHO_RSP);

    CASE_RETURN_TEXT(L2CAP_CMD_INFO_REQ);

    CASE_RETURN_TEXT(L2CAP_CMD_INFO_RSP);

    CASE_RETURN_TEXT(L2CAP_CMD_AMP_CONN_REQ);

    CASE_RETURN_TEXT(L2CAP_CMD_AMP_MOVE_REQ);

    CASE_RETURN_TEXT(L2CAP_CMD_BLE_UPDATE_REQ);

    CASE_RETURN_TEXT(L2CAP_CMD_BLE_UPDATE_RSP);

    CASE_RETURN_TEXT(L2CAP_CMD_BLE_CREDIT_BASED_CONN_REQ);

    CASE_RETURN_TEXT(L2CAP_CMD_BLE_CREDIT_BASED_CONN_RES);

    CASE_RETURN_TEXT(L2CAP_CMD_BLE_FLOW_CTRL_CREDIT);

    CASE_RETURN_TEXT(L2CAP_CMD_CREDIT_BASED_CONN_REQ);

    CASE_RETURN_TEXT(L2CAP_CMD_CREDIT_BASED_CONN_RES);

    CASE_RETURN_TEXT(L2CAP_CMD_CREDIT_BASED_RECONFIG_REQ);

    CASE_RETURN_TEXT(L2CAP_CMD_CREDIT_BASED_RECONFIG_RES);

    default:

      return std::string("UNKNOWN L2CAP CMD[") + std::to_string(cmd) +

             std::string("]");

  }

}



#undef CASE_RETURN_TEXT



inline tL2CAP_CONN to_l2cap_result_code(uint16_t result) {

system/stack/l2cap/l2c_main.cc

+2 −1
Original line number Diff line number Diff line
@@ -287,7 +287,8 @@ static void process_l2cap_cmd(tL2C_LCB* p_lcb, uint8_t* p, uint16_t pkt_len) { 
      break;

    }



    LOG_DEBUG("cmd_code: %d, id:%d, cmd_len:%d", cmd_code, id, cmd_len);

    LOG_DEBUG("cmd: %s, id:%d, cmd_len:%d",

              l2cap_command_code_text(cmd_code).c_str(), id, cmd_len);



    /* Bad L2CAP packet length, look for cmd to reject */

    if (pkt_size_rej) {