Tim Cook
eb408e50c4
n btm_sec_save_le_key() set BTM_SEC_LE_LINK_KEY_KNOWN (and BTM_SEC_LE_LINK_KEY_AUTHED if MITM was used) when process a local Long Term Key (key type BTM_LE_KEY_LENC). This is because these flags share bits with the BTM_SEC_FLAG_LKEY_KNOWN (and BTM_SEC_FLAG_LKEY_AUTHED) flag in btm_api.h. Without this code a link that is encrypted via SM pairing where only the local device exchanges the LTK (peer does not send its LTK) will not allow GATT operations that require encryption (request will be incorrectly rejected with insufficient authentication reason, regardless of if MITM is required).
...
Merges https://github.com/espressif/esp-idf/pull/1320
2018-01-08 10:37:19 +11:00
Jiang Jiang Jian
38d58f1c2e
Merge branch 'bugfix/btdm_error_when_white_list_is_full' into 'master'
...
component/bt: Fix bug of adding device to white list has no callback when while list is full
See merge request !1689
2017-12-27 18:04:25 +08:00
zhiweijian
031ab556a9
component/bt: fix memory leak in SMP
...
- fix memory leak in smp
- fix log error in config_parse
2017-12-20 10:28:04 +08:00
Jiang Jiang Jian
b5942dc400
Merge branch 'bugfix/btdm_send_data_length_req_after_read_feature_complete_for_V3.0' into 'release/v3.0'
...
component/bt: send data length req after read feature complete for v3.0
See merge request !1665
2017-12-19 17:38:45 +08:00
Yulong
7e488b0c6b
component/bt: Optimized broadcast callback function, send the callback function to the application after the controller confirms receipt of the broadcast start.
...
1. optimiz the ble stop adv callback function.
2. added the osi_mutex_unlock in the bta_gattc_wait4_service_change_ccc_cback function when the p_timer_param == NULL || p_conn == NULL.
2017-12-15 18:17:02 +08:00
zhiweijian
3a70e61477
Component/bt: send data length request by host after read feature complete
2017-12-12 20:02:36 +08:00
Yulong
177c92f15e
component/bt: Change the code format.
2017-11-23 06:42:04 -05:00
Yulong
2458d15d2d
component/bt: recovery the scan parameter to the controller before start scan.
2017-11-23 06:36:00 -05:00
Yulong
f14699068d
component/bt: Fixed the bug when stop scan if not set back the scan params will lead to connection request sent the empty packet to the peer device.
2017-11-23 03:54:29 -05:00
Jiang Jiang Jian
1de3fc4a2c
Merge branch 'bugfix/btdm_master_dont_send_pair_req_#13686' into 'master'
...
component/bt: Fix the bug of master don't send pair request to the slave when the sec_act set to the value of ESP_BLE_SEC_ENCRYPT.
See merge request !1376
2017-11-02 15:49:27 +08:00
island
4e7de126dc
component/bt: Fix scan problem of bonded device using public address
2017-10-25 11:52:03 +08:00
yulong
a9a423a025
component/bt: Added the sec_act != BTM_BLE_SEC_ENCRYPT check in the btm_ble_set_encryption function when the sec_act is BTM_BLE_SEC_ENCRYPT_NO_MITM or BTM_BLE_SEC_ENCRYPT_MITM.
2017-10-23 15:12:36 +08:00
Yulong
da32fbce7a
component/bt: Fix the bug of can't pair if master send pair req but slave don't send sec req.
2017-10-23 15:12:36 +08:00
Jiang Jiang Jian
244e947beb
Merge branch 'bugfix/btdm_fix_add_whitelist_failed' into 'master'
...
Component/bt: fix add whitelist failed
See merge request !1326
2017-10-12 19:01:01 +08:00
zhiweijian
cd3d9715bb
Component/bt: fix add whitelist failed
...
- fix add whitelist failed
- add add whitelist callback func
2017-10-11 15:30:09 +08:00
zhiweijian
c75da555af
Component/bt: fix set scan params and start scan action
2017-09-30 17:01:57 +08:00
Yulong
8925a90d40
squash again
...
squash the commit.
component/bt:Added the update_white_list & set_prefer_conn_params API to the bt project.
component/bt: Added the get white list size API & delete the read adv tx power API.
component/bt: Change the esp_gap_ble_api.h esp_ble_gap_set_prefer_conn_params API docs.
changed btm_find_dev to btm_find_or_alloc_dev
component/bt: Change the rssi API deep copy method.
component/bt: Change the code as comment in the gitlab.
squash the commit.
component/bt:Added the update_white_list & set_prefer_conn_params API to the bt project.
component/bt: Added the get white list size API & delete the read adv tx power API.
component/bt: Change the esp_gap_ble_api.h esp_ble_gap_set_prefer_conn_params API docs.
changed btm_find_dev to btm_find_or_alloc_dev
component/bt: Change the rssi API deep copy method.
component/bt: Change the code as comment in the gitlab.
component/bt: change the ESP_BLE_CONN_PARAM_UNDEF redefinition error.
component/bt: Change the ESP_BLE_IS_VALID_PARAM function with the compile error.
2017-09-18 05:39:26 -04:00
Yulong
875ba996d5
component/bt: fix the bug when close the SMP module in the menuconfig will lead to compile error.
2017-09-15 10:32:28 +08:00
Jiang Jiang Jian
574daad1c4
Merge branch 'feature/btdm_update_to_bluedroid7.1_l2cap' into 'master'
...
component/bt: Added the new feature of the l2cap layer from the bluedroid new version 7.1.1
See merge request !1087
2017-09-13 20:39:38 +08:00
Tian Hao
00a7cdbb0b
component/bt : support adv & scan simultaneously
...
1. Occupy conn[9] for adv. The max connection number of bluetooth controller decrease to 9. (Previously, it is 10)
2. modify the enum of setting BLE TX power corresponding to connection's.
3. fix libbtdm_app.a cwitch jump table
2017-09-12 16:10:30 +08:00
Yulong
371c55138e
component/bt: Added the new feature of the l2cap layer from the bluedroid new version 7.1.1
2017-09-06 04:25:57 -04:00
zhiweijian
1a9b02ccbc
component/bt: fix connection parameters update
...
- update connection parameters timeout due to master update illegal connection parameters
- slave returns error status when slave check the connection parameters
- slave connection parameters update callback get that interval_max is equal to interval_min
2017-08-30 11:29:25 +08:00
Jiang Jiang Jian
258480822b
Merge branch 'bugfix/btdm_config_local_privacy_func' into 'master'
...
component/bt: bugfix config local privacy
See merge request !1137
2017-08-24 10:48:57 +08:00
zhiweijian
19bf8cef1f
Component/bt: bugifx config local privacy
2017-08-23 17:42:38 +08:00
Tian Hao
e4f63819a1
component/bt : remove all GKI reference
...
1. remove GKI(not use osi_free_and_reset)
2. modify mutex/semaphore to individual directory
3. set osi_malloc as malloc(previously use calloc)
4. change osi allocator debug osi_free
5. fix rebase of remove GKI
2017-08-23 15:29:30 +08:00
zhiweijian
fc05851b05
Component/bt: add set local privacy func callback
2017-07-26 17:29:10 +08:00
zhiweijian
eec989f026
Component /bt: modify some log infor
2017-06-21 10:54:51 +08:00
Jiang Jiang Jian
e045253883
Merge branch 'bugfix/btdm_conn_enhanecd_issue' into 'master'
...
component/bt: added the temp enhanced to solve the conn_interval not collect issues.
See merge request !881
2017-06-16 13:18:41 +08:00
Yulong
1739216787
component/bt: added the temp enhanced to solve the conn_interval not collect issues.
2017-06-15 10:15:49 -04:00
Jiang Jiang Jian
fd12a6c706
Merge branch 'bugfix/btdm_add_set_pkt_data_length_evt_cback' into 'master'
...
component / bt: add set pkt data length event callback
See merge request !869
2017-06-15 19:51:22 +08:00
zhiweijian
58b65291d9
component / bt: add set pkt data length event callback
2017-06-15 16:02:03 +08:00
Jiang Jiang Jian
ac5040a7c2
Merge branch 'bugfix/btdm_ll_get_remote_feature' into 'master'
...
component/bt: Fix can't get remote's feature bug
See merge request !871
2017-06-15 15:10:52 +08:00
Yulong
83b7144207
component/bt: Added the lmp_verion default value to 4.0.
2017-06-15 02:13:31 -04:00
island
e2e5f4caae
component/bt: Fix can't get remote's feature bug
...
- Slave send version_ind cause some Android 7.0 devices can't encrypt correctly
2017-06-14 21:56:59 +08:00
Yulong
a03e5f95be
component/bt: Added the judgment to check the address is public or not.
2017-06-14 09:01:29 -04:00
island
c5debed621
component/bt: Fix bug while writing slave's service change characteristic
...
- Fix slave initiate service discovery procedure
- Fix master re-discovery every time connection established
- Optimize service discovery char ccc write procedure
- Optimize esp_log_buffer function
- Modify default supervision timeout from 20s to 2s
2017-06-14 13:12:38 +08:00
Jiang Jiang Jian
82b8b1db1f
Merge branch 'bugfix/bt_ble_separation' into 'master'
...
component/bt: fix the build error when using classic BT, with GATTC, GATTS and SMP disabled
See merge request !822
2017-06-06 20:56:05 +08:00
wangmengyang
ca4506fba9
component/bt: fix the build error when using classic BT, with GATTC, GATTS and SMP disabled
2017-06-05 21:01:58 +08:00
Yulong
a42bf640bc
component/bt: Change the duration type from UINT8 to UINT32
2017-06-03 01:00:10 -04:00
Jiang Jiang Jian
b5e2bcbb2c
Merge branch 'bugfix/ble_add_adv_state_bug_#12301' into 'master'
...
component/bt: Fix the bug that sometimes received a ble connection & the adv wil…
…l stop, can not send adv again.
See merge request !759
2017-05-18 15:03:41 +08:00
Yulong
d13c083397
component/bt:fix the bug of uild error if switch off BLE GATTS. Bug number is #12659 .
2017-05-17 07:17:22 -04:00
Yulong
e797cd03f0
component/bt: Fix the bug that sometimes received a ble connection & the adv will stop, can not send adv again.
2017-05-16 03:10:16 -04:00
island
da67773b02
component/bt: fix adv stop event bug and add attribute table create
...
error
- Fix bug that advertising stop event produced while calling start_adv function
- Modify gatt server adv data and scan rsp data raw setting
- add create attribute table error msg
- Delete redundant printf in previous commits
2017-05-08 15:44:36 +08:00
Yulong
834d980e39
compoent/bt:Fixed the BT/BLE statck bug from bluedroid7.1.1
2017-04-28 05:31:57 -04:00
Jiang Jiang Jian
0759897bfb
Merge branch 'bugfix/btdm_gattc_adv_bug' into 'master'
...
component/bt: Fix memory leakage, connection fail bugs
- Fix memory leakage while deregisting gatt app
- Fix Android connection failed problem
- Fix service_uuid_len error in adv data
See merge request !706
2017-04-27 21:13:16 +08:00
Yulong
c31953a005
component/bt:Fixted the bug of HCI comment timeout error.
...
1. remove the SMP_INCLUDED == TRUE insite the btm_find_dev_by_handle function.
2. change the Kconfig with BT_ACL_CONNECTIONS
2017-04-26 04:23:45 -04:00
island
a3717515a2
component/bt: Fix memory leakage, connection fail bugs
...
- Fix memory leakage while deregisting gatt app
- Fix Android connection failed problem
- Fix service_uuid_len error in adv data
2017-04-26 16:07:56 +08:00
Yulong
5544f98add
component/bt:separate the SMP, GATT module set the macro output the function.
...
1. close classic bt, can save 233k code size;
2. close smp module, can save 136k code size;
3. close gattc module, can save 24k code size;
4. close gatts module, can save 16k code size;
4. close the bluedroid stack log, can save 120k code size.
2017-04-25 04:55:29 -04:00
Yulong
45999b69d6
component/bt: Set the style to the same, output the macro in the function.
...
1.After the separate, can save 15k~25k ram & 240k~460k code size(depending on the menuconfig).
2017-04-24 23:46:37 -04:00
Yulong
b5989a6b26
component/bt:Recovery the btm_establish_continue when created the acl connection
2017-04-21 02:43:35 -04:00