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

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

stack::rfcomm::api Decl/init p_port when used am: 38f1bfb5 

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



Change-Id: I2fb7415898312c009b86046791d292ea3b0b3af7
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7fef449e 38f1bfb5

system/stack/rfcomm/port_api.cc

+12 −29
Original line number Diff line number Diff line
@@ -136,7 +136,7 @@ int RFCOMM_CreateConnectionWithSecurity(uint16_t uuid, uint8_t scn, 


  // On the client side, do not allow the same (dlci, bd_addr) to be opened

  // twice by application

  tPORT* p_port;

  tPORT* p_port{nullptr};

  if (!is_server) {

    p_port = port_find_port(dlci, bd_addr);

    if (p_port != nullptr) {
@@ -293,8 +293,6 @@ int RFCOMM_ControlReqFromBTSOCK(uint8_t dlci, const RawAddress& bd_addr, 
 *

 ******************************************************************************/

int RFCOMM_RemoveConnection(uint16_t handle) {

  tPORT* p_port;



  log::verbose("RFCOMM_RemoveConnection() handle:{}", handle);



  /* Check if handle is valid to avoid crashing */
@@ -302,7 +300,7 @@ int RFCOMM_RemoveConnection(uint16_t handle) { 
    log::error("RFCOMM_RemoveConnection() BAD handle:{}", handle);

    return (PORT_BAD_HANDLE);

  }

  p_port = &rfc_cb.port.port[handle - 1];

  tPORT* p_port = &rfc_cb.port.port[handle - 1];



  if (!p_port->in_use || (p_port->state == PORT_CONNECTION_STATE_CLOSED)) {

    log::verbose("RFCOMM_RemoveConnection() Not opened:{}", handle);
@@ -383,14 +381,12 @@ int RFCOMM_RemoveServer(uint16_t handle) { 
 *

 ******************************************************************************/

int PORT_SetEventCallback(uint16_t port_handle, tPORT_CALLBACK* p_port_cb) {

  tPORT* p_port;



  /* Check if handle is valid to avoid crashing */

  if ((port_handle == 0) || (port_handle > MAX_RFC_PORTS)) {

    return (PORT_BAD_HANDLE);

  }



  p_port = &rfc_cb.port.port[port_handle - 1];

  tPORT* p_port = &rfc_cb.port.port[port_handle - 1];



  if (!p_port->in_use || (p_port->state == PORT_CONNECTION_STATE_CLOSED)) {

    return (PORT_NOT_OPENED);
@@ -413,14 +409,12 @@ int PORT_SetEventCallback(uint16_t port_handle, tPORT_CALLBACK* p_port_cb) { 
 ******************************************************************************/



int PORT_ClearKeepHandleFlag(uint16_t port_handle) {

  tPORT* p_port;



  /* Check if handle is valid to avoid crashing */

  if ((port_handle == 0) || (port_handle > MAX_RFC_PORTS)) {

    return (PORT_BAD_HANDLE);

  }



  p_port = &rfc_cb.port.port[port_handle - 1];

  tPORT* p_port = &rfc_cb.port.port[port_handle - 1];

  p_port->keep_port_handle = 0;

  return (PORT_SUCCESS);

}
@@ -440,8 +434,6 @@ int PORT_ClearKeepHandleFlag(uint16_t port_handle) { 
 ******************************************************************************/

int PORT_SetDataCOCallback(uint16_t port_handle,

                           tPORT_DATA_CO_CALLBACK* p_port_cb) {

  tPORT* p_port;



  log::verbose("PORT_SetDataCOCallback() handle:{} cb 0x{}", port_handle,

               fmt::ptr(p_port_cb));
@@ -450,7 +442,7 @@ int PORT_SetDataCOCallback(uint16_t port_handle, 
    return (PORT_BAD_HANDLE);

  }



  p_port = &rfc_cb.port.port[port_handle - 1];

  tPORT* p_port = &rfc_cb.port.port[port_handle - 1];



  if (!p_port->in_use || (p_port->state == PORT_CONNECTION_STATE_CLOSED)) {

    return (PORT_NOT_OPENED);
@@ -472,8 +464,6 @@ int PORT_SetDataCOCallback(uint16_t port_handle, 
 *

 ******************************************************************************/

int PORT_SetEventMask(uint16_t port_handle, uint32_t mask) {

  tPORT* p_port;



  log::verbose("PORT_SetEventMask() handle:{} mask:0x{:x}", port_handle, mask);



  /* Check if handle is valid to avoid crashing */
@@ -481,7 +471,7 @@ int PORT_SetEventMask(uint16_t port_handle, uint32_t mask) { 
    return (PORT_BAD_HANDLE);

  }



  p_port = &rfc_cb.port.port[port_handle - 1];

  tPORT* p_port = &rfc_cb.port.port[port_handle - 1];



  if (!p_port->in_use || (p_port->state == PORT_CONNECTION_STATE_CLOSED)) {

    return (PORT_NOT_OPENED);
@@ -598,7 +588,6 @@ bool PORT_IsOpening(RawAddress* bd_addr) { 
 *

 ******************************************************************************/

int PORT_SetState(uint16_t handle, tPORT_STATE* p_settings) {

  tPORT* p_port;

  uint8_t baud_rate;



  log::verbose("PORT_SetState() handle:{}", handle);
@@ -608,7 +597,7 @@ int PORT_SetState(uint16_t handle, tPORT_STATE* p_settings) { 
    return (PORT_BAD_HANDLE);

  }



  p_port = &rfc_cb.port.port[handle - 1];

  tPORT* p_port = &rfc_cb.port.port[handle - 1];



  if (!p_port->in_use || (p_port->state == PORT_CONNECTION_STATE_CLOSED)) {

    return (PORT_NOT_OPENED);
@@ -644,8 +633,6 @@ int PORT_SetState(uint16_t handle, tPORT_STATE* p_settings) { 
 *

 ******************************************************************************/

int PORT_GetState(uint16_t handle, tPORT_STATE* p_settings) {

  tPORT* p_port;



  log::verbose("PORT_GetState() handle:{}", handle);



  /* Check if handle is valid to avoid crashing */
@@ -653,7 +640,7 @@ int PORT_GetState(uint16_t handle, tPORT_STATE* p_settings) { 
    return (PORT_BAD_HANDLE);

  }



  p_port = &rfc_cb.port.port[handle - 1];

  tPORT* p_port = &rfc_cb.port.port[handle - 1];



  if (!p_port->in_use || (p_port->state == PORT_CONNECTION_STATE_CLOSED)) {

    return (PORT_NOT_OPENED);
@@ -682,7 +669,6 @@ int PORT_GetState(uint16_t handle, tPORT_STATE* p_settings) { 
 ******************************************************************************/



int PORT_FlowControl_MaxCredit(uint16_t handle, bool enable) {

  tPORT* p_port;

  bool old_fc;

  uint32_t events;
@@ -693,7 +679,7 @@ int PORT_FlowControl_MaxCredit(uint16_t handle, bool enable) { 
    return (PORT_BAD_HANDLE);

  }



  p_port = &rfc_cb.port.port[handle - 1];

  tPORT* p_port = &rfc_cb.port.port[handle - 1];



  if (!p_port->in_use || (p_port->state == PORT_CONNECTION_STATE_CLOSED)) {

    return (PORT_NOT_OPENED);
@@ -750,7 +736,6 @@ int PORT_FlowControl_MaxCredit(uint16_t handle, bool enable) { 
 ******************************************************************************/

int PORT_ReadData(uint16_t handle, char* p_data, uint16_t max_len,

                  uint16_t* p_len) {

  tPORT* p_port;

  BT_HDR* p_buf;

  uint16_t count;
@@ -764,7 +749,7 @@ int PORT_ReadData(uint16_t handle, char* p_data, uint16_t max_len, 
    return (PORT_BAD_HANDLE);

  }



  p_port = &rfc_cb.port.port[handle - 1];

  tPORT* p_port = &rfc_cb.port.port[handle - 1];



  if (!p_port->in_use || (p_port->state == PORT_CONNECTION_STATE_CLOSED)) {

    return (PORT_NOT_OPENED);
@@ -910,7 +895,6 @@ static int port_write(tPORT* p_port, BT_HDR* p_buf) { 
 *

 ******************************************************************************/

int PORT_WriteDataCO(uint16_t handle, int* p_len) {

  tPORT* p_port;

  BT_HDR* p_buf;

  uint32_t event = 0;

  int rc = 0;
@@ -923,7 +907,7 @@ int PORT_WriteDataCO(uint16_t handle, int* p_len) { 
  if ((handle == 0) || (handle > MAX_RFC_PORTS)) {

    return (PORT_BAD_HANDLE);

  }

  p_port = &rfc_cb.port.port[handle - 1];

  tPORT* p_port = &rfc_cb.port.port[handle - 1];



  if (!p_port->in_use || (p_port->state == PORT_CONNECTION_STATE_CLOSED)) {

    log::warn("PORT_WriteDataByFd() no port state:{}", p_port->state);
@@ -1067,7 +1051,6 @@ int PORT_WriteDataCO(uint16_t handle, int* p_len) { 
 ******************************************************************************/

int PORT_WriteData(uint16_t handle, const char* p_data, uint16_t max_len,

                   uint16_t* p_len) {

  tPORT* p_port;

  BT_HDR* p_buf;

  uint32_t event = 0;

  int rc = 0;
@@ -1081,7 +1064,7 @@ int PORT_WriteData(uint16_t handle, const char* p_data, uint16_t max_len, 
  if ((handle == 0) || (handle > MAX_RFC_PORTS)) {

    return (PORT_BAD_HANDLE);

  }

  p_port = &rfc_cb.port.port[handle - 1];

  tPORT* p_port = &rfc_cb.port.port[handle - 1];



  if (!p_port->in_use || (p_port->state == PORT_CONNECTION_STATE_CLOSED)) {

    log::warn("PORT_WriteData() no port state:{}", p_port->state);