Bluetooth: Host: Fix duplicate whitelist entries issue

If the whitelist already exists in the controller then the controller
should not add the device tot the whitelist and should return success.
In that case the counting of entries in the whitelist in the host will
be wrong.

Remove all whitelist counting in the host, and instead rely on the error
reported by the controller for this.
The controller should return error if the whitelist is full.
The controller should return error if use of whitelist was requested but
the whitelist was empty.

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

Author: joerchan

subsys/bluetooth/host/conn.c

@@ -2053,10 +2053,6 @@ int bt_conn_create_auto_le(const struct bt_le_conn_param *param)
 		return -EALREADY;
 	}
 
-	if (!bt_dev.le.wl_entries) {
-		return -EINVAL;
-	}
-
 	/* Don't start initiator if we have general discovery procedure. */
 	conn = bt_conn_lookup_state_le(NULL, BT_CONN_CONNECT_SCAN);
 	if (conn) {

subsys/bluetooth/host/hci_core.c

@@ -208,15 +208,6 @@ static inline void handle_event(u8_t event, struct net_buf *buf,
 		buf->len, bt_hex(buf->data, buf->len));
 }
 
-static inline bool is_wl_empty(void)
-{
-#if defined(CONFIG_BT_WHITELIST)
-	return !bt_dev.le.wl_entries;
-#else
-	return true;
-#endif /* defined(CONFIG_BT_WHITELIST) */
-}
-
 #if defined(CONFIG_BT_HCI_ACL_FLOW_CONTROL)
 static void report_completed_packet(struct net_buf *buf)
 {
@@ -4097,18 +4088,6 @@ static void le_read_resolving_list_size_complete(struct net_buf *buf)
 }
 #endif /* defined(CONFIG_BT_SMP) */
 
-#if defined(CONFIG_BT_WHITELIST)
-static void le_read_wl_size_complete(struct net_buf *buf)
-{
-	struct bt_hci_rp_le_read_wl_size *rp =
-		(struct bt_hci_rp_le_read_wl_size *)buf->data;
-
-	BT_DBG("Whitelist size %u", rp->wl_size);
-
-	bt_dev.le.wl_size = rp->wl_size;
-}
-#endif
-
 static int common_init(void)
 {
 	struct net_buf *rsp;
@@ -4370,17 +4349,6 @@ static int le_init(void)
 	}
 #endif
 
-#if defined(CONFIG_BT_WHITELIST)
-	err = bt_hci_cmd_send_sync(BT_HCI_OP_LE_READ_WL_SIZE, NULL,
-				   &rsp);
-	if (err) {
-		return err;
-	}
-
-	le_read_wl_size_complete(rsp);
-	net_buf_unref(rsp);
-#endif /* defined(CONFIG_BT_WHITELIST) */
-
 	return  le_set_event_mask();
 }
 
@@ -5554,13 +5522,6 @@ static bool valid_adv_param(const struct bt_le_adv_param *param, bool dir_adv)
 		}
 	}
 
-	if (is_wl_empty() &&
-	    ((param->options & BT_LE_ADV_OPT_FILTER_SCAN_REQ) ||
-	     (param->options & BT_LE_ADV_OPT_FILTER_CONN))) {
-		return false;
-	}
-
-
 	if ((param->options & BT_LE_ADV_OPT_DIR_MODE_LOW_DUTY) || !dir_adv) {
 		if (param->interval_min > param->interval_max ||
 		    param->interval_min < 0x0020 ||
@@ -5880,11 +5841,6 @@ static bool valid_le_scan_param(const struct bt_le_scan_param *param)
 		return false;
 	}
 
-	if (is_wl_empty() &&
-	    param->filter_dup & BT_LE_SCAN_FILTER_WHITELIST) {
-		return false;
-	}
-
 	if (param->interval < 0x0004 || param->interval > 0x4000) {
 		return false;
 	}
@@ -5965,10 +5921,6 @@ int bt_le_whitelist_add(const bt_addr_le_t *addr)
 	struct net_buf *buf;
 	int err;
 
-	if (!(bt_dev.le.wl_entries < bt_dev.le.wl_size)) {
-		return -ENOMEM;
-	}
-
 	buf = bt_hci_cmd_create(BT_HCI_OP_LE_ADD_DEV_TO_WL, sizeof(*cp));
 	if (!buf) {
 		return -ENOBUFS;
@@ -5984,8 +5936,6 @@ int bt_le_whitelist_add(const bt_addr_le_t *addr)
 		return err;
 	}
 
-	bt_dev.le.wl_entries++;
-
 	return 0;
 }
 
@@ -6009,7 +5959,6 @@ int bt_le_whitelist_rem(const bt_addr_le_t *addr)
 		return err;
 	}
 
-	bt_dev.le.wl_entries--;
 	return 0;
 }
 
@@ -6022,7 +5971,6 @@ int bt_le_whitelist_clear(void)
 		return err;
 	}
 
-	bt_dev.le.wl_entries = 0;
 	return 0;
 }
 #endif /* defined(CONFIG_BT_WHITELIST) */

subsys/bluetooth/host/hci_core.h

@@ -84,13 +84,6 @@ struct bt_dev_le {
 	 */
 	u8_t                    rl_entries;
 #endif /* CONFIG_BT_SMP */
-
-#if defined(CONFIG_BT_WHITELIST)
-	/* Size of the controller whitelist. */
-	u8_t			wl_size;
-	/* Number of entries in the resolving list. */
-	u8_t			wl_entries;
-#endif /* CONFIG_BT_WHITELIST */
 };
 
 #if defined(CONFIG_BT_BREDR)