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

Commit 85d02da7 authored by Chris Manton's avatar Chris Manton Committed by Automerger Merge Worker
Browse files

btif::rfcomm: Pretty print socket events am: 067b0be0 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/3008795



Change-Id: I84a1fb3d6eef76d915398284033c9c8f50df5e34
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f7e96a7a 067b0be0

system/bta/include/bta_jv_api.h

+59 −37
Original line number Diff line number Diff line
@@ -30,8 +30,8 @@ 


#include "bta/include/bta_api.h"

#include "bta_sec_api.h"

#include "include/macros.h"

#include "internal_include/bt_target.h"

#include "macros.h"

#include "stack/include/bt_hdr.h"

#include "stack/include/l2c_api.h"

#include "types/bluetooth/uuid.h"
@@ -156,42 +156,64 @@ typedef uint8_t tBTA_JV_CONN_STATE; 
#define BTA_JV_CONN_TYPE_L2CAP_LE 2

typedef int tBTA_JV_CONN_TYPE;



enum tBTA_JV_EVT : uint16_t {

  /* Java I/F callback events */

  /* events received by tBTA_JV_DM_CBACK */

#define BTA_JV_ENABLE_EVT 0         /* JV enabled */

#define BTA_JV_GET_SCN_EVT 6        /* Reserved an SCN */

#define BTA_JV_GET_PSM_EVT 7        /* Reserved a PSM */

#define BTA_JV_DISCOVERY_COMP_EVT 8 /* SDP discovery complete */

#define BTA_JV_CREATE_RECORD_EVT 11 /* the result for BTA_JvCreateRecord */

  BTA_JV_ENABLE_EVT = 0,          // JV enabled

  BTA_JV_GET_SCN_EVT = 6,         // Reserved an SCN

  BTA_JV_GET_PSM_EVT = 7,         // Reserved a PSM

  BTA_JV_DISCOVERY_COMP_EVT = 8,  // SDP discovery complete

  BTA_JV_CREATE_RECORD_EVT = 11,  // the result for BTA_JvCreateRecord

  /* events received by tBTA_JV_L2CAP_CBACK */

#define BTA_JV_L2CAP_OPEN_EVT 16     /* open status of L2CAP connection */

#define BTA_JV_L2CAP_CLOSE_EVT 17    /* L2CAP connection closed */

#define BTA_JV_L2CAP_START_EVT 18    /* L2CAP server started */

#define BTA_JV_L2CAP_CL_INIT_EVT 19  /* L2CAP client initiated a connection */

#define BTA_JV_L2CAP_DATA_IND_EVT 20 /* L2CAP connection received data */

#define BTA_JV_L2CAP_CONG_EVT \

  21 /* L2CAP connection congestion status changed */

#define BTA_JV_L2CAP_READ_EVT 22  /* the result for BTA_JvL2capRead */

#define BTA_JV_L2CAP_WRITE_EVT 24 /* the result for BTA_JvL2capWrite*/

  BTA_JV_L2CAP_OPEN_EVT = 16,      // open status of L2CAP connection

  BTA_JV_L2CAP_CLOSE_EVT = 17,     // L2CAP connection closed

  BTA_JV_L2CAP_START_EVT = 18,     // L2CAP server started

  BTA_JV_L2CAP_CL_INIT_EVT = 19,   // L2CAP client initiated a connection

  BTA_JV_L2CAP_DATA_IND_EVT = 20,  // L2CAP connection received data

  BTA_JV_L2CAP_CONG_EVT = 21,      // L2CAP connection congestion status changed

  BTA_JV_L2CAP_READ_EVT = 22,      // the result for BTA_JvL2capRead

  BTA_JV_L2CAP_WRITE_EVT = 24,     // the result for BTA_JvL2capWrite



  /* events received by tBTA_JV_RFCOMM_CBACK */

#define BTA_JV_RFCOMM_OPEN_EVT                                                \

  26                               /* open status of RFCOMM Client connection \

                                      */

#define BTA_JV_RFCOMM_CLOSE_EVT 27 /* RFCOMM connection closed */

#define BTA_JV_RFCOMM_START_EVT 28 /* RFCOMM server started */

#define BTA_JV_RFCOMM_CL_INIT_EVT                                             \

  29                                  /* RFCOMM client initiated a connection \

                                         */

#define BTA_JV_RFCOMM_DATA_IND_EVT 30 /* RFCOMM connection received data */

#define BTA_JV_RFCOMM_CONG_EVT \

  31 /* RFCOMM connection congestion status changed */

#define BTA_JV_RFCOMM_WRITE_EVT 33 /* the result for BTA_JvRfcommWrite*/

#define BTA_JV_RFCOMM_SRV_OPEN_EVT \

  34                      /* open status of Server RFCOMM connection */

#define BTA_JV_MAX_EVT 35 /* max number of JV events */



typedef uint16_t tBTA_JV_EVT;

  BTA_JV_RFCOMM_OPEN_EVT = 26,      // open status of RFCOMM Client connection

  BTA_JV_RFCOMM_CLOSE_EVT = 27,     // RFCOMM connection closed

  BTA_JV_RFCOMM_START_EVT = 28,     // RFCOMM server started

  BTA_JV_RFCOMM_CL_INIT_EVT = 29,   // RFCOMM client initiated a connection

  BTA_JV_RFCOMM_DATA_IND_EVT = 30,  // RFCOMM connection received data

  BTA_JV_RFCOMM_CONG_EVT = 31,   // RFCOMM connection congestion status changed

  BTA_JV_RFCOMM_WRITE_EVT = 33,  // the result for BTA_JvRfcommWrite

  BTA_JV_RFCOMM_SRV_OPEN_EVT = 34,  // open status of Server RFCOMM connection

  BTA_JV_MAX_EVT = 35,              // max number of JV events

};



inline std::string bta_jv_event_text(const tBTA_JV_EVT& event) {

  switch (event) {

    CASE_RETURN_TEXT(BTA_JV_ENABLE_EVT);

    CASE_RETURN_TEXT(BTA_JV_GET_SCN_EVT);

    CASE_RETURN_TEXT(BTA_JV_GET_PSM_EVT);

    CASE_RETURN_TEXT(BTA_JV_DISCOVERY_COMP_EVT);

    CASE_RETURN_TEXT(BTA_JV_CREATE_RECORD_EVT);

    CASE_RETURN_TEXT(BTA_JV_L2CAP_OPEN_EVT);

    CASE_RETURN_TEXT(BTA_JV_L2CAP_CLOSE_EVT);

    CASE_RETURN_TEXT(BTA_JV_L2CAP_START_EVT);

    CASE_RETURN_TEXT(BTA_JV_L2CAP_CL_INIT_EVT);

    CASE_RETURN_TEXT(BTA_JV_L2CAP_DATA_IND_EVT);

    CASE_RETURN_TEXT(BTA_JV_L2CAP_CONG_EVT);

    CASE_RETURN_TEXT(BTA_JV_L2CAP_READ_EVT);

    CASE_RETURN_TEXT(BTA_JV_L2CAP_WRITE_EVT);

    CASE_RETURN_TEXT(BTA_JV_RFCOMM_OPEN_EVT);

    CASE_RETURN_TEXT(BTA_JV_RFCOMM_CLOSE_EVT);

    CASE_RETURN_TEXT(BTA_JV_RFCOMM_START_EVT);

    CASE_RETURN_TEXT(BTA_JV_RFCOMM_CL_INIT_EVT);

    CASE_RETURN_TEXT(BTA_JV_RFCOMM_DATA_IND_EVT);

    CASE_RETURN_TEXT(BTA_JV_RFCOMM_CONG_EVT);

    CASE_RETURN_TEXT(BTA_JV_RFCOMM_WRITE_EVT);

    CASE_RETURN_TEXT(BTA_JV_RFCOMM_SRV_OPEN_EVT);

    CASE_RETURN_TEXT(BTA_JV_MAX_EVT);

    default:

      return base::StringPrintf("UNKNOWN[%hu]", event);

  }

}



/* data associated with BTA_JV_SET_DISCOVER_EVT */

typedef struct {

system/btif/src/btif_sock_l2cap.cc

+2 −2
Original line number Diff line number Diff line
@@ -769,8 +769,8 @@ static void btsock_l2cap_cbk(tBTA_JV_EVT event, tBTA_JV* p_data, 
      break;



    default:

      log::error("Unhandled event:{} l2cap_socket_id:{}", event,

                 l2cap_socket_id);

      log::error("Unhandled event:{} l2cap_socket_id:{}",

                 bta_jv_event_text(event), l2cap_socket_id);

      break;

  }

}

system/btif/src/btif_sock_rfc.cc

+13 −7
Original line number Diff line number Diff line
@@ -682,9 +682,11 @@ static uint32_t rfcomm_cback(tBTA_JV_EVT event, tBTA_JV* p_data, 


  // Write events are too frequent to log at info level

  if (event != BTA_JV_RFCOMM_WRITE_EVT) {

    log::info("handling event:{} id:{}", event, rfcomm_slot_id);

    log::info("handling event:{} id:{}", bta_jv_event_text(event),

              rfcomm_slot_id);

  } else {

    log::verbose("handling event:{} id:{}", event, rfcomm_slot_id);

    log::verbose("handling event:{} id:{}", bta_jv_event_text(event),

                 rfcomm_slot_id);

  }



  switch (event) {
@@ -727,20 +729,22 @@ static uint32_t rfcomm_cback(tBTA_JV_EVT event, tBTA_JV* p_data, 
      break;



    default:

      log::error("unhandled event {}, slot id: {}", event, rfcomm_slot_id);

      log::error("unhandled event {}, slot id: {}", bta_jv_event_text(event),

                 rfcomm_slot_id);

      break;

  }

  return id;

}



static void jv_dm_cback(tBTA_JV_EVT event, tBTA_JV* p_data, uint32_t id) {

  log::info("handling event:{}, id:{}", event, id);

  log::info("handling event:{}, id:{}", bta_jv_event_text(event), id);

  switch (event) {

    case BTA_JV_GET_SCN_EVT: {

      std::unique_lock<std::recursive_mutex> lock(slot_lock);

      rfc_slot_t* rs = find_rfc_slot_by_id(id);

      if (!rs) {

        log::error("RFCOMM slot with id {} not found. event:{}", id, event);

        log::error("RFCOMM slot with id {} not found. event:{}", id,

                   bta_jv_event_text(event));

        break;

      }

      if (p_data->scn == 0) {
@@ -789,7 +793,8 @@ static void jv_dm_cback(tBTA_JV_EVT event, tBTA_JV* p_data, uint32_t id) { 
      rfc_slot_t* slot = find_rfc_slot_by_id(id);



      if (!slot) {

        log::error("RFCOMM slot with id {} not found. event:{}", id, event);

        log::error("RFCOMM slot with id {} not found. event:{}", id,

                   bta_jv_event_text(event));

        break;

      }
@@ -820,7 +825,8 @@ static void jv_dm_cback(tBTA_JV_EVT event, tBTA_JV* p_data, uint32_t id) { 
    }



    default:

      log::debug("unhandled event:{}, slot id:{}", event, id);

      log::debug("unhandled event:{}, slot id:{}", bta_jv_event_text(event),

                 id);

      break;

  }

}