BTA_JvL2capConnect simplification

Test: manual
Change-Id: I18ac5ac451490e0d3c0c9fc5daa9f8d64ff19bd5

diff --git a/bta/include/bta_jv_api.h b/bta/include/bta_jv_api.h
index 9d804c4..39f72fd 100644 (file)
--- a/bta/include/bta_jv_api.h
+++ b/bta/include/bta_jv_api.h
@@ -513,10 +513,7 @@ tBTA_JV_STATUS BTA_JvDeleteRecord(uint32_t handle);
  *                  tBTA_JV_L2CAP_CBACK is called with BTA_JV_L2CAP_OPEN_EVT
  *
  ******************************************************************************/
-void BTA_JvL2capConnectLE(tBTA_SEC sec_mask, tBTA_JV_ROLE role,
-                          const tL2CAP_ERTM_INFO* ertm_info,
-                          uint16_t remote_chan, uint16_t rx_mtu,
-                          tL2CAP_CFG_INFO* cfg, const RawAddress& peer_bd_addr,
+void BTA_JvL2capConnectLE(uint16_t remote_chan, const RawAddress& peer_bd_addr,
                           tBTA_JV_L2CAP_CBACK* p_cback,
                           uint32_t l2cap_socket_id);
 
@@ -533,8 +530,9 @@ void BTA_JvL2capConnectLE(tBTA_SEC sec_mask, tBTA_JV_ROLE role,
  *
  ******************************************************************************/
 void BTA_JvL2capConnect(int conn_type, tBTA_SEC sec_mask, tBTA_JV_ROLE role,
-                        const tL2CAP_ERTM_INFO* ertm_info, uint16_t remote_psm,
-                        uint16_t rx_mtu, tL2CAP_CFG_INFO* cfg,
+                        std::unique_ptr<tL2CAP_ERTM_INFO> ertm_info,
+                        uint16_t remote_psm, uint16_t rx_mtu,
+                        std::unique_ptr<tL2CAP_CFG_INFO> cfg,
                         const RawAddress& peer_bd_addr,
                         tBTA_JV_L2CAP_CBACK* p_cback, uint32_t l2cap_socket_id);
 

diff --git a/bta/jv/bta_jv_api.cc b/bta/jv/bta_jv_api.cc
index 45526ba..74818b6 100644 (file)
--- a/bta/jv/bta_jv_api.cc
+++ b/bta/jv/bta_jv_api.cc
@@ -240,10 +240,7 @@ tBTA_JV_STATUS BTA_JvDeleteRecord(uint32_t handle) {
  *                  tBTA_JV_L2CAP_CBACK is called with BTA_JV_L2CAP_OPEN_EVT
  *
  ******************************************************************************/
-void BTA_JvL2capConnectLE(tBTA_SEC sec_mask, tBTA_JV_ROLE,
-                          const tL2CAP_ERTM_INFO*, uint16_t remote_chan,
-                          uint16_t, tL2CAP_CFG_INFO*,
-                          const RawAddress& peer_bd_addr,
+void BTA_JvL2capConnectLE(uint16_t remote_chan, const RawAddress& peer_bd_addr,
                           tBTA_JV_L2CAP_CBACK* p_cback,
                           uint32_t l2cap_socket_id) {
   VLOG(2) << __func__;
@@ -265,25 +262,19 @@ void BTA_JvL2capConnectLE(tBTA_SEC sec_mask, tBTA_JV_ROLE,
  *
  ******************************************************************************/
 void BTA_JvL2capConnect(int conn_type, tBTA_SEC sec_mask, tBTA_JV_ROLE role,
-                        const tL2CAP_ERTM_INFO* ertm_info, uint16_t remote_psm,
-                        uint16_t rx_mtu, tL2CAP_CFG_INFO* cfg,
+                        std::unique_ptr<tL2CAP_ERTM_INFO> ertm_info,
+                        uint16_t remote_psm, uint16_t rx_mtu,
+                        std::unique_ptr<tL2CAP_CFG_INFO> cfg,
                         const RawAddress& peer_bd_addr,
                         tBTA_JV_L2CAP_CBACK* p_cback,
                         uint32_t l2cap_socket_id) {
   VLOG(2) << __func__;
   CHECK(p_cback);
 
-  std::unique_ptr<tL2CAP_CFG_INFO> cfg_copy;
-  if (cfg) cfg_copy = std::make_unique<tL2CAP_CFG_INFO>(*cfg);
-
-  std::unique_ptr<tL2CAP_ERTM_INFO> ertm_info_copy;
-  if (ertm_info)
-    ertm_info_copy = std::make_unique<tL2CAP_ERTM_INFO>(*ertm_info);
-
-  do_in_bta_thread(
-      FROM_HERE, Bind(&bta_jv_l2cap_connect, conn_type, sec_mask, role,
-                      remote_psm, rx_mtu, peer_bd_addr, base::Passed(&cfg_copy),
-                      base::Passed(&ertm_info_copy), p_cback, l2cap_socket_id));
+  do_in_bta_thread(FROM_HERE,
+                   Bind(&bta_jv_l2cap_connect, conn_type, sec_mask, role,
+                        remote_psm, rx_mtu, peer_bd_addr, base::Passed(&cfg),
+                        base::Passed(&ertm_info), p_cback, l2cap_socket_id));
 }
 
 /*******************************************************************************

diff --git a/btif/src/btif_sock_l2cap.cc b/btif/src/btif_sock_l2cap.cc
index 9dcfd7b..e064a1a 100644 (file)
--- a/btif/src/btif_sock_l2cap.cc
+++ b/btif/src/btif_sock_l2cap.cc
@@ -807,7 +807,7 @@ static void btsock_l2cap_server_listen(l2cap_socket* sock) {
     return;
   }
 
-  /* Setup ETM settings:  mtu will be set below */
+  /* Setup ETM settings: mtu will be set below */
   std::unique_ptr<tL2CAP_CFG_INFO> cfg = std::make_unique<tL2CAP_CFG_INFO>(
       tL2CAP_CFG_INFO{.fcr_present = true, .fcr = obex_l2c_fcr_opts_def});
 
@@ -827,8 +827,6 @@ static bt_status_t btsock_l2cap_listen_or_connect(const char* name,
                                                   int flags, char listen,
                                                   int app_uid) {
   int fixed_chan = 1;
-  l2cap_socket* sock;
-  tL2CAP_CFG_INFO cfg;
   bool is_le_coc = false;
 
   if (!sock_fd) return BT_STATUS_PARM_INVALID;
@@ -847,7 +845,7 @@ static bt_status_t btsock_l2cap_listen_or_connect(const char* name,
   // TODO: This is kind of bad to lock here, but it is needed for the current
   // design.
   std::unique_lock<std::mutex> lock(state_lock);
-  sock = btsock_l2cap_alloc_l(name, addr, listen, flags);
+  l2cap_socket* sock = btsock_l2cap_alloc_l(name, addr, listen, flags);
   if (!sock) {
     return BT_STATUS_NOMEM;
   }
@@ -857,29 +855,29 @@ static bt_status_t btsock_l2cap_listen_or_connect(const char* name,
   sock->app_uid = app_uid;
   sock->is_le_coc = is_le_coc;
 
-  /* Setup ETM settings: mtu will be set below */
-  memset(&cfg, 0, sizeof(tL2CAP_CFG_INFO));
-
-  cfg.fcr_present = true;
-  cfg.fcr = obex_l2c_fcr_opts_def;
-
   /* "role" is never initialized in rfcomm code */
   if (listen) {
     btsock_l2cap_server_listen(sock);
   } else {
     if (fixed_chan) {
-      BTA_JvL2capConnectLE(sock->security, 0, NULL, channel, L2CAP_DEFAULT_MTU,
-                           NULL, sock->addr, btsock_l2cap_cbk, sock->id);
+      BTA_JvL2capConnectLE(channel, sock->addr, btsock_l2cap_cbk, sock->id);
     } else {
-      if (sock->is_le_coc) {
-        BTA_JvL2capConnect(BTA_JV_CONN_TYPE_L2CAP_LE, sock->security, 0, NULL,
-                           channel, L2CAP_MAX_SDU_LENGTH, &cfg, sock->addr,
-                           btsock_l2cap_cbk, sock->id);
-      } else {
-        BTA_JvL2capConnect(BTA_JV_CONN_TYPE_L2CAP, sock->security, 0,
-                           &obex_l2c_etm_opt, channel, L2CAP_MAX_SDU_LENGTH,
-                           &cfg, sock->addr, btsock_l2cap_cbk, sock->id);
+      int connection_type =
+          sock->is_le_coc ? BTA_JV_CONN_TYPE_L2CAP_LE : BTA_JV_CONN_TYPE_L2CAP;
+
+      /* Setup ETM settings: mtu will be set below */
+      std::unique_ptr<tL2CAP_CFG_INFO> cfg = std::make_unique<tL2CAP_CFG_INFO>(
+          tL2CAP_CFG_INFO{.fcr_present = true, .fcr = obex_l2c_fcr_opts_def});
+
+      std::unique_ptr<tL2CAP_ERTM_INFO> ertm_info;
+      if (!sock->is_le_coc) {
+        ertm_info.reset(new tL2CAP_ERTM_INFO(obex_l2c_etm_opt));
       }
+
+      BTA_JvL2capConnect(connection_type, sock->security, 0,
+                         std::move(ertm_info), channel, L2CAP_MAX_SDU_LENGTH,
+                         std::move(cfg), sock->addr, btsock_l2cap_cbk,
+                         sock->id);
     }
   }