Bluetooth: Host: Rename API function to initiate bluetooth security.

Rename bt_conn_security to bt_conn_set_security, this makes the API
naming more consistent.

Signed-off-by: Joakim Andersson <[email protected]>

include/bluetooth/conn.h

@@ -321,7 +321,13 @@ typedef enum __packed {
  *
  *  @return 0 on success or negative error
  */
-int bt_conn_security(struct bt_conn *conn, bt_security_t sec);
+int bt_conn_set_security(struct bt_conn *conn, bt_security_t sec);
+
+static inline int __deprecated bt_conn_security(struct bt_conn *conn,
+						bt_security_t sec)
+{
+	return bt_conn_set_security(conn, sec);
+}
 
 /** @brief Get encryption key size.
  *

samples/bluetooth/peripheral_hids/src/main.c

@@ -44,7 +44,7 @@ static void connected(struct bt_conn *conn, u8_t err)
 
 	printk("Connected %s\n", addr);
 
-	if (bt_conn_security(conn, BT_SECURITY_L2)) {
+	if (bt_conn_set_security(conn, BT_SECURITY_L2)) {
 		printk("Failed to set security\n");
 	}
 }

samples/bluetooth/peripheral_sc_only/src/main.c

@@ -37,7 +37,7 @@ static void connected(struct bt_conn *conn, u8_t err)
 
 	printk("Connected %s\n", addr);
 
-	if (bt_conn_security(conn, BT_SECURITY_L4)) {
+	if (bt_conn_set_security(conn, BT_SECURITY_L4)) {
 		printk("Failed to set security\n");
 	}
 }

subsys/bluetooth/host/att.c

@@ -1639,7 +1639,7 @@ static int att_change_security(struct bt_conn *conn, u8_t err)
 		return -EINVAL;
 	}
 
-	return bt_conn_security(conn, sec);
+	return bt_conn_set_security(conn, sec);
 }
 #endif /* CONFIG_BT_SMP */
 

subsys/bluetooth/host/conn.c

@@ -1040,7 +1040,7 @@ static int start_security(struct bt_conn *conn)
 	}
 }
 
-int bt_conn_security(struct bt_conn *conn, bt_security_t sec)
+int bt_conn_set_security(struct bt_conn *conn, bt_security_t sec)
 {
 	int err;
 

subsys/bluetooth/host/l2cap.c

@@ -967,7 +967,8 @@ static int l2cap_change_security(struct bt_l2cap_le_chan *chan, u16_t err)
 		return -EINVAL;
 	}
 
-	return bt_conn_security(chan->chan.conn, chan->chan.required_sec_level);
+	return bt_conn_set_security(chan->chan.conn,
+				    chan->chan.required_sec_level);
 }
 
 static void le_conn_rsp(struct bt_l2cap *l2cap, u8_t ident,

subsys/bluetooth/host/l2cap_br.c

@@ -555,7 +555,7 @@ enum l2cap_br_conn_security_result {
  * - channel connection process is on hold since there were valid security
  *   conditions triggering authentication indirectly in subcall.
  * Returns L2CAP_CONN_SECURITY_REJECT if:
- * - bt_conn_security API returns < 0.
+ * - bt_conn_set_security API returns < 0.
  */
 
 static enum l2cap_br_conn_security_result
@@ -595,13 +595,13 @@ l2cap_br_conn_security(struct bt_l2cap_chan *chan, const u16_t psm)
 		break;
 	}
 
-	check = bt_conn_security(chan->conn, chan->required_sec_level);
+	check = bt_conn_set_security(chan->conn, chan->required_sec_level);
 
 	/*
 	 * Check case when on existing connection security level already covers
 	 * channel (service) security requirements against link security and
-	 * bt_conn_security API returns 0 what implies also there was no need to
-	 * trigger authentication.
+	 * bt_conn_set_security API returns 0 what implies also there was no
+	 * need to trigger authentication.
 	 */
 	if (check == 0 &&
 	    chan->conn->sec_level >= chan->required_sec_level) {

subsys/bluetooth/host/rfcomm.c

@@ -785,7 +785,7 @@ static enum security_result rfcomm_dlc_security(struct bt_rfcomm_dlc *dlc)
 		return RFCOMM_SECURITY_PASSED;
 	}
 
-	if (!bt_conn_security(conn, dlc->required_sec_level)) {
+	if (!bt_conn_set_security(conn, dlc->required_sec_level)) {
 		/* If Security elevation is initiated or in progress */
 		return RFCOMM_SECURITY_PENDING;
 	}

subsys/bluetooth/shell/bt.c

@@ -1096,7 +1096,7 @@ static int cmd_security(const struct shell *shell, size_t argc, char *argv[])
 		}
 	}
 
-	err = bt_conn_security(default_conn, sec);
+	err = bt_conn_set_security(default_conn, sec);
 	if (err) {
 		shell_error(shell, "Setting security failed (err %d)", err);
 	}

tests/bluetooth/bsim_bt/bsim_test_app/src/test_connect1.c

@@ -225,9 +225,9 @@ static void connected(struct bt_conn *conn, u8_t conn_err)
 	if (encrypt_link) {
 		k_sleep(500);
 		bt_conn_auth_cb_register(&auth_cb_success);
-		err = bt_conn_security(conn, BT_SECURITY_L2);
+		err = bt_conn_set_security(conn, BT_SECURITY_L2);
 		if (err) {
-			FAIL("bt_conn_security failed (err %d)\n", err);
+			FAIL("bt_conn_set_security failed (err %d)\n", err);
 			return;
 		}
 	} else {

tests/bluetooth/tester/src/gap.c

@@ -596,7 +596,7 @@ static void pair(const u8_t *data, u16_t len)
 		goto rsp;
 	}
 
-	if (bt_conn_security(conn, BT_SECURITY_L2)) {
+	if (bt_conn_set_security(conn, BT_SECURITY_L2)) {
 		status = BTP_STATUS_FAILED;
 		bt_conn_unref(conn);
 		goto rsp;