Jiang Jiang Jian
46bc9e5dc4
Merge branch 'feature/bt_secure_conn_downgrade_check_v3.3' into 'release/v3.3'
...
Bluedroid: Authentication fixes in Legacy and Secure Connection.
See merge request espressif/esp-idf!9332
2020-06-30 15:12:21 +08:00
lly
9f6375db50
ble_mesh: Check if subnet exists before updating beacon_sent
...
- Before updating the "beacon_sent" of a subnet, we need to check
if the subnet still exists, especially for a Provisioner.
- Fix a bug which will cause Provisioner failed to send Secure
Network Beacon if no device is provisioned
2020-06-30 09:23:28 +08:00
lly
96865524c7
ble_mesh: stack: Copy recv_rssi for other received messages
...
Follow the commit: 2b80cb6883
,
copy the recv_rssi for other mesh messages.
2020-06-30 09:06:42 +08:00
mbroek
86cad8b825
When a generic mesh model message is received "bt_mesh_generic_server_cb_evt_to_btc" copies the
...
ctx values to cb_params for the mesh stack.
recv_rssi was not copied.
This means the rssi could not be read when receiving generic server messages using ble_mesh.
2020-06-30 09:06:31 +08:00
Mahavir Jain
d6a63531ce
Merge branch 'bugfix/http_server_lru_v3.3' into 'release/v3.3'
...
esp_http_server: Update LRU counter on accepting a new connection (v3.3)
See merge request espressif/esp-idf!9353
2020-06-29 12:57:43 +08:00
Island
370bb55f42
Merge branch 'bugfix/ble_mesh_get_node_with_name_v3.3' into 'release/v3.3'
...
ble_mesh: Get node info with pre-configured node name (v3.3)
See merge request espressif/esp-idf!9304
2020-06-28 20:25:13 +08:00
Island
1fb6ffecad
Merge branch 'bugfix/ble_mesh_bt_hex_v3.3' into 'release/v3.3'
...
ble_mesh: Fix wrong log output with bt_hex (v3.3)
See merge request espressif/esp-idf!9311
2020-06-28 20:23:56 +08:00
Island
036828a172
Merge branch 'bugfix/ble_mesh_not_define_bool_v3.3' into 'release/v3.3'
...
Bugfix/ble mesh not define bool (v3.3)
See merge request espressif/esp-idf!9318
2020-06-28 20:22:50 +08:00
Shubham Kulkarni
673e433281
esp_http_server: Update LRU counter on accepting a new connection
...
Closes https://github.com/espressif/esp-idf/issues/3851
2020-06-26 19:25:42 +05:30
Chinmay Chhajed
99d572700d
Bluedroid: Authentication fixes in Legacy and Secure Connection.
...
Prevent a remote device from doing a Bluetooth Impersonation Attack
(BIAS) by:
- Preventing remote device to downgrade secure connection
feature mask. Secure connection feature mask should remain same or
increase to enabled in link key generation and authentication.
- Doing a mutual authentication during Legacy Authentication.
2020-06-25 13:59:14 +00:00
lly
ad970addf0
ble_mesh: Get node info with pre-configured node name
...
Also add a function to get the entry of the nodes table.
Closes https://github.com/espressif/esp-idf/issues/5397
2020-06-24 11:53:59 +00:00
lly
adbc337023
ble_mesh: Fix wrong log output with bt_hex
...
- This issue was introduced in the commit: a788e7cd3d
which updated the bt_hex() function incorrectly.
- And in bt_hex(), we use 2 for the two-dimensional array, because currently
at most two bt_hex() will be used at the same time. Also this will save
some DRAM compared with using 4.
2020-06-24 11:50:58 +00:00
lly
1dbbc55cc0
ble_mesh: Remove boolean type definitions
2020-06-24 11:46:51 +00:00
Nikolaos Strikos
0526de4536
ble_mesh: Do not #define bool when compiling in C++
2020-06-24 11:46:51 +00:00
lly
366dd9759d
ble_mesh: stack: Check model status with variable length
2020-06-24 11:41:58 +00:00
Jiang Jiang Jian
39e5184159
Merge branch 'bugfix/fix_event_bug_in_GAP_API_release_v3.3' into 'release/v3.3'
...
Bugfix/fix event bug in GAP API [backport v3.3]
See merge request espressif/esp-idf!9195
2020-06-23 12:19:04 +08:00
David Čermák
e3f3e0ae0f
Merge branch 'feature/ws_timeout_v3.3' into 'release/v3.3'
...
websocket: add configurable timeout for PONG not received (v3.3)
See merge request espressif/esp-idf!8911
2020-06-19 02:22:08 +08:00
Island
2ea53169ad
Merge branch 'bugfix/blufi_buffer_overflow_report_v3.3' into 'release/v3.3'
...
blufi: When the format of the received data packet is wrong, reply with an error response(backport 3.3)
See merge request espressif/esp-idf!9198
2020-06-18 13:45:34 +08:00
Michael (XIAO Xufeng)
2aaf254d44
Merge branch 'bugfix/fix_fifo_cnt_bug_v3.3' into 'release/v3.3'
...
bugfix(uart): fix esp32 uart fifo_cnt bug(backport v3.3)
See merge request espressif/esp-idf!9042
2020-06-18 01:43:04 +08:00
David Čermák
e25b710a02
Merge branch 'bugfix/ws_send_abort_v3.3' into 'release/v3.3'
...
websocket client: the client now aborts the connection if send fails (v3.3)
See merge request espressif/esp-idf!8903
2020-06-17 15:05:48 +08:00
wangcheng
563c9901ca
blufi: When the format of the received data packet is wrong, reply with an error response
2020-06-17 12:32:57 +08:00
liqigan
02f9eaa31a
components/bt: Adjust the description of esp_bt_gap_start_discovery
and esp_bt_gap_cancel_discovery
.
...
Add some comments to explain why `ESP_BT_GAP_DISC_STATE_CHANGED_EVT` is not reported.
2020-06-17 11:27:37 +08:00
Marius Vikhammer
b478dc4ad6
websocket: add configurable timeout for PONG not received
...
Closes IDF-1744
2020-06-17 11:13:26 +08:00
xiongyu
c9d9545310
bugfix(uart): fix esp32 uart fifo_cnt bug
...
When using DPort to read fifo, fifo_cnt is not credible, we need to calculate the real cnt based on the fifo read and write pointer. When using AHB to read FIFO, we can use fifo_cnt to indicate the data length in fifo.
2020-06-15 12:22:33 +08:00
Angus Gratton
5e84ee108c
Merge branch 'bugfix/bootloader_efuse_build_regression_v3.3' into 'release/v3.3'
...
bootloader: add definition of esp_clk_apb_freq (v3.3)
See merge request espressif/esp-idf!9093
2020-06-10 16:01:35 +08:00
Angus Gratton
f17f59fb54
Merge branch 'bugfix/parttool_get_info_wo_info_option_v3.3' into 'release/v3.3'
...
partition_table: Fix parttool.py crashes when retrieving partition info (v3.3)
See merge request espressif/esp-idf!9065
2020-06-10 15:58:01 +08:00
weitianhua
282433500e
Backport MR from baid proj
2020-06-10 03:53:21 +00:00
Ivan Grokhotkov
618794e1fb
bootloader: add definition of esp_clk_apb_freq
...
Commit 8cd04c80
has added a dependency of efuse component on
esp_clk_apb_freq, however there was no definition of this function in
the bootloader context.
Reported at https://esp32.com/viewtopic.php?f=13&t=12035
Closes: https://github.com/espressif/esp-idf/issues/5396
2020-06-08 16:45:29 +08:00
Jiang Jiang Jian
eaca5a11e4
Merge branch 'bugfix/authmode_degrade_fix_v3.3' into 'release/v3.3'
...
esp_wifi: Remove auth_changed event and fix wpa2_ent authmode threshold (backport 3.3)
See merge request espressif/esp-idf!9058
2020-06-05 13:59:48 +08:00
Jiang Jiang Jian
b4c89c6607
Merge branch 'bugfix/add_so_linger_to_menuconfig_for_3.3' into 'release/v3.3'
...
lw-ip:add LINGER to menuconfig(backport 3.3)
See merge request espressif/esp-idf!9062
2020-06-05 13:54:22 +08:00
Jiang Jiang Jian
a5a6ba895e
Merge branch 'optimization/DNS_get_function_for_3.3' into 'release/v3.3'
...
lw-ip:optimization DNS get function(backport 3.3)
See merge request espressif/esp-idf!9061
2020-06-05 13:54:07 +08:00
Jiang Jiang Jian
b336851479
Merge branch 'workaround/wps_iot_fixes_v3.3' into 'release/v3.3'
...
wpa_supplicant: WPS Inter operatability Fixes ( backport v3.3)
See merge request espressif/esp-idf!9060
2020-06-05 13:49:24 +08:00
Michael (XIAO Xufeng)
ace2cff01a
Merge branch 'bugfix/sdmmc_check_slot_before_pullup_3.3' into 'release/v3.3'
...
sdmmc: Correctly check function parameters before using them (3.3)
See merge request espressif/esp-idf!9057
2020-06-05 07:19:11 +08:00
KonstantinKondrashov
28d3d6daac
partition_table: Fix parttool.py crashes when retrieving partition info
...
Closes: IDFGH-3279
Closes: https://github.com/espressif/esp-idf/issues/5271
2020-06-04 16:43:06 +08:00
kapil.gupta
21395421d1
wpa_supplicant: WPS Inter operatability Fixes
...
Add WPS IOT fixes under config option
Current fixes under this flag.
1. Allow NULL-padded WPS attributes.
2. Bypass WPS-Config method validation
2020-06-04 13:57:20 +05:30
xueyunfei
68d1afb47d
add LINGER to menuconfig
2020-06-04 16:16:03 +08:00
xueyunfei
32b3c255ac
optimization DNS get function
2020-06-04 16:05:17 +08:00
Jiang Jiang Jian
c13b946773
Merge branch 'bugfix/modify_TCP_MSS_range_v3.3' into 'release/v3.3'
...
Change the default value of TCP_MSS (backport v3.3)
See merge request espressif/esp-idf!9050
2020-06-04 15:59:17 +08:00
Jiang Jiang Jian
3838da57f0
Merge branch 'bugfix/compiler_err_when_performance_optimization_enabled_v3.3' into 'release/v3.3'
...
Bugfix/compiler err when performance optimization enabled v3.3
See merge request espressif/esp-idf!7979
2020-06-04 15:58:34 +08:00
kapil.gupta
1625c595ff
esp_wifi: Remove auth_changed event and fix wpa2 authmode threshold
2020-06-04 13:13:21 +05:30
Nachiket Kukade
c6ca42b1e7
wpa_supplicant: Allow NULL-padded WPS attributes
...
Some AP's keep NULL-padding at the end of some variable length WPS
Attributes. This is not as par the WPS2.0 specs, but to avoid interop
issues, ignore the padding by reducing the attribute length by 1.
2020-06-04 12:18:43 +05:30
Alexander Borsuk
cccd679b3e
sdmmc: Correctly check function parameters before using them
...
Closes https://github.com/espressif/esp-idf/pull/5000
2020-06-04 12:07:16 +08:00
xiehang
6f26e72817
Change the default value of TCP_MSS to 1440 and TCP_MSS Range : [536 1460]
2020-06-04 12:04:14 +08:00
Island
ad2447a6ea
Merge branch 'bugfix/ble_mesh_remove_relay_dependency_v3.3' into 'release/v3.3'
...
ble_mesh: Remove relay option dependency (v3.3)
See merge request espressif/esp-idf!9028
2020-06-03 15:20:56 +08:00
Island
686530d373
Merge branch 'bugfix/ble_mesh_example_nvs_store_v3.3' into 'release/v3.3'
...
Bugfix/ble mesh example nvs store (v3.3)
See merge request espressif/esp-idf!9018
2020-06-03 15:12:28 +08:00
Island
c3902be87f
Merge branch 'bugfix/ble_mesh_model_recv_fix_v3.3' into 'release/v3.3'
...
Bugfix/ble mesh model recv fix (v3.3)
See merge request espressif/esp-idf!9009
2020-06-03 15:11:38 +08:00
Island
88937185ac
Merge branch 'bugfix/ble_mesh_rework_prov_pdu_len_check_v3.3' into 'release/v3.3'
...
ble_mesh: Rework prov pdu length check (v3.3)
See merge request espressif/esp-idf!9005
2020-06-03 15:11:11 +08:00
lly
7937a51779
ble_mesh: Remove relay option dependency
...
When the relay functionality of a node is not enabled, this
issue will cause the node failing to send messages to fixed
group.
2020-06-02 19:19:18 +08:00
Jiang Jiang Jian
a94842d8f7
Merge branch 'bugfix/fix_some_wifi_bugs_0525_v3.3' into 'release/v3.3'
...
feature: optimize some wifi API (backport v3.3)
See merge request espressif/esp-idf!8893
2020-06-02 17:39:23 +08:00
weitianhua
afae411857
Remove (x2) varible for BCM_STRNCPY_S and BCM_STRCPY_S
2020-06-02 08:30:02 +00:00
weitianhua
437bee123c
Initialize mem_start and mem_end
2020-06-02 08:30:02 +00:00
lly
cb0288d399
ble_mesh: Config and health client btc fixes
...
Fix an issue which may cause no error code is returned
when sending config client or health client messages
with invalid parameters.
2020-06-02 14:05:26 +08:00
lly
59cdd33dcf
ble_mesh: Add more checks of net_idx & app_idx
2020-06-02 14:05:19 +08:00
lly
36c476833f
ble_mesh: Optimize some send & recv logs
2020-06-02 14:05:12 +08:00
Michael (XIAO Xufeng)
13154fe5c6
Merge branch 'bugfix/fix_gpio_wake_up_disable_invalid_for_rtc_io_v3.3' into 'release/v3.3'
...
bugfix (GPIO): fixed gpio_wake_up_disable not working for RTC IO (release/3.3)
See merge request espressif/esp-idf!7997
2020-06-02 11:16:59 +08:00
Island
bce064e655
Merge branch 'bugfix/ble_mesh_local_model_sub_v3.3' into 'release/v3.3'
...
Bugfix/ble mesh local model sub (v3.3)
See merge request espressif/esp-idf!8985
2020-06-02 10:58:50 +08:00
lly
ac565c97a3
ble_mesh: correct the return type [Zephyr]
2020-06-02 10:33:12 +08:00
lly
8c5a8bef50
ble_mesh: Add net_buf_simple_init_with_data [Zephyr]
2020-06-02 10:33:05 +08:00
lly
ac76870ad7
ble_mesh: Optimize model recv operations [Zephyr]
...
Previously the model recv operation is a littl fuzzy.
With the changes, the model recv operation is splitted into:
- find op
- check app_idx
- check dst
- check length
- update info & handle message
2020-06-02 10:32:57 +08:00
lly
a96e1b80ac
ble_mesh: Rework prov pdu length check
2020-06-02 10:17:20 +08:00
Mahavir Jain
3f57aecabd
Merge branch 'bugfix/httpd_lru_purge_v3.3' into 'release/v3.3'
...
esp_http_server: Fixed a bug which could cause issues with LRU purge (v3.3)
See merge request espressif/esp-idf!8834
2020-06-01 11:23:53 +08:00
houwenxiang
eab88f51e7
driver(GPIO): fixed gpio_wake_up_disable not working for RTC IO (release/3.3)
2020-06-01 11:16:07 +08:00
lly
6abdc9e542
ble_mesh: Local model (un)subscribes group address
2020-06-01 09:13:57 +08:00
lly
0ee9227b45
ble_mesh: Define a macro for invalid company id
2020-06-01 09:13:43 +08:00
ronghulin
8f3209b7b7
feature: optimize some wifi API
...
1. optimization esp_wifi_set_max_tx_power description
2. add API esp_wifi_ap_get_sta_aid
2020-05-29 12:02:24 +08:00
zwj
38e98acca1
:add congest direct callback and modify congest evt triger threshold
2020-05-28 12:06:10 +00:00
wangcheng
340e40abbe
master missing BLE_AUTH_CMPL_EVT after restart
2020-05-28 12:06:10 +00:00
wangcheng
ed3a172df7
fix bta_dm_deinit_cb
2020-05-28 12:06:10 +00:00
Jiang Jiang Jian
27f03b4ac0
Merge branch 'bugfix/ble_mesh_check_timer_init_v3.3' into 'release/v3.3'
...
ble_mesh: Check the result of creating timer (v3.3)
See merge request espressif/esp-idf!8960
2020-05-28 15:26:53 +08:00
Jiang Jiang Jian
706d704c08
Merge branch 'nimble/update_nimble_submodule_v3.3' into 'release/v3.3'
...
NimBLE: Include upstream fixes and use macros for log level filtering (backport v3.3)
See merge request espressif/esp-idf!8798
2020-05-28 15:23:31 +08:00
lly
b5f3f79716
ble_mesh: Check the result of creating timer
2020-05-28 10:28:36 +08:00
Island
5f43d69d21
Merge branch 'bugfix/ble_mesh_sync_zephyr_fixes_v3.3' into 'release/v3.3'
...
Bugfix/ble mesh sync zephyr fixes (v3.3)
See merge request espressif/esp-idf!8950
2020-05-28 10:17:29 +08:00
Island
a70c956a75
Merge branch 'bugfix/ble_mesh_not_use_same_private_key_v3.3' into 'release/v3.3'
...
ble_mesh: Not using pre-initialized private key (v3.3)
See merge request espressif/esp-idf!8947
2020-05-28 10:15:40 +08:00
Piyush Shah
8890fa98c8
esp_http_server: Fixed a bug which could cause issues with LRU purge
...
LRU counter should be started from 1, and not 0, so that all checks
work fine.
Closes https://github.com/espressif/esp-idf/issues/4753
2020-05-27 17:14:12 +00:00
lly
822b20eb40
ble_mesh: Transport tx fields overflow [Zephyr]
...
The transport segmented TX nack and seg_pending fields must be at least
6 bits to avoid overflow for 32 segment messages. This change rearranges
the seg_tx fields to gather all state flag fields in one byte, while
making the counter fields whole bytes.
2020-05-27 17:45:12 +08:00
lly
b381998a23
ble_mesh: Friend with unknown appkey [Zephyr]
...
Ensures that friend messages are enqueued, even if the packet is
received with an appkey is unknown to the friend. Previously, sdu_recv
would return EINVAL if the appkey was unknown, which would prevent the
lower transport layer from adding the packet to the friend queue. This
is irrelevant for the logic in lower transport, and should not be
returned as an error.
2020-05-27 17:44:58 +08:00
lly
393e4e9007
ble_mesh: Not using pre-initialized private key
2020-05-27 17:38:41 +08:00
lly
4b191ac6fb
ble_mesh: Same func for storing/restoring comp data
2020-05-27 17:32:56 +08:00
Jiang Jiang Jian
221ca4b1e5
Merge branch 'bugfix/fix_some_wifi_bugs_0427_v3.3' into 'release/v3.3'
...
Bugfix/fix some wifi bugs 0427 (v3.3)
See merge request espressif/esp-idf!8573
2020-05-26 18:57:43 +08:00
David Čermák
0a558ea3c4
Merge branch 'bugfix/ws_client_fragmented_send_v3.3' into 'release/v3.3'
...
ws_client: fix fragmented send setting proper opcodes (v3.3)
See merge request espressif/esp-idf!8692
2020-05-25 17:22:02 +08:00
Marius Vikhammer
0829b5c5d5
websocket client: the client now aborts the connection if send fails.
...
Closes IDF-1744
2020-05-25 17:11:23 +08:00
Jiang Jiang Jian
19736dbedc
Merge branch 'bugfix/supplicant_general_fixes_33' into 'release/v3.3'
...
wpa_supplicant: Fix some memleaks and invalid memory access(backport V3.3)
See merge request espressif/esp-idf!8741
2020-05-22 21:18:36 +08:00
lly
879bfc608c
ble_mesh: Fix Provisioner failed to publish
2020-05-22 15:49:30 +08:00
David Cermak
612b9e4a58
ws_client: fix fragmented send setting proper opcodes
...
Previous implementation violated the RFC by having both the actual opcode and WS_FIN flag set for all fragments of a message.
Fixed by setting the opcode only for the first fragment and WS_FIN for the last one
Closes IDFGH-2938
Closes https://github.com/espressif/esp-idf/issues/4974
2020-05-22 06:16:29 +00:00
Island
796dc4bb35
Merge branch 'bugfix/ble_mesh_friend_init_flag_v3.3' into 'release/v3.3'
...
Bugfix/ble mesh friend init flag (v3.3)
See merge request espressif/esp-idf!8849
2020-05-22 10:50:55 +08:00
Island
6046e7b26f
Merge branch 'bugfix/ble_mesh_node_old_version_to_new_v3.3' into 'release/v3.3'
...
ble_mesh: Fix mesh node device role restore (v3.3)
See merge request espressif/esp-idf!8725
2020-05-21 15:10:29 +08:00
lly
1b1aea24f0
ble_mesh: Clear two more vars during proxy server deinit
2020-05-21 14:29:04 +08:00
lly
e55c65562c
ble_mesh: Add missing sdkconfig.h
2020-05-21 14:28:57 +08:00
lly
1ad9de1131
ble_mesh: Init device name during proxy server init
...
Device name will be reset when deinit mesh stack. If not
initializing device name during the next mesh stack init,
it will fail to set the device name when using bluedroid.
2020-05-21 14:28:49 +08:00
lly
8e4399bf29
ble_mesh: Add init flag for friend init/deinit
...
Since bt_mesh_friend_init() will only be invoked when
a device is provisioned or Provisioner is enabled, so
we add a flag to indicate if the friend functionality
is initialized in case deinit before initialization.
2020-05-21 14:28:40 +08:00
Island
cb4e8cef87
Merge branch 'bugfix/ble_mesh_fix_typos_v3.3' into 'release/v3.3'
...
ble_mesh: Fix typos (v3.3)
See merge request espressif/esp-idf!8727
2020-05-21 11:47:33 +08:00
Island
f55719522e
Merge branch 'bugfix/ble_mesh_remove_patch_v3.3' into 'release/v3.3'
...
ble_mesh: Remove patch for the bug of an App (v3.3)
See merge request espressif/esp-idf!8780
2020-05-21 11:46:49 +08:00
Prasad Alatkar
04e3cf44bc
NimBLE: Include upstream fixes and use macros for log level filtering (backport v3.3)
...
Change list:
- Reduces the size of the compiled binary, PR: https://github.com/espressif/esp-nimble/pull/6
- Null pointer check, PR: https://github.com/apache/mynewt-nimble/pull/701
- Pairing procedure abort on unexpected req: https://github.com/apache/mynewt-nimble/pull/710
- Fix conn flags after pairing: https://github.com/apache/mynewt-nimble/pull/730
- Remove notification for update process timeout (Vol 6, Part B, section 5.2 ):
https://github.com/apache/mynewt-nimble/pull/782
- CCCD fix : https://github.com/apache/mynewt-nimble/pull/790 and
https://github.com/apache/mynewt-nimble/pull/804
- Host based Privacy (RPA) fix: https://github.com/espressif/esp-nimble/pull/7
Closes https://github.com/espressif/esp-nimble/issues/10
Closes https://github.com/espressif/esp-idf/issues/4413
2020-05-20 16:27:53 +05:30
zhangyanjiao
1a1b3a8538
wifi changes:
...
1. fix the bug for softAP update second channel wrong
2. change wifi_scan_time_t from union to struct
3. query country code wrong when policy change from manual to auto
4. fix the crash issue when fetch peer after delete the cur_peer
5. fix the timeout issue of EAPOL four-way handshake
2020-05-20 17:55:11 +08:00
lly
d6e189927e
ble_mesh: Remove patch for the bug of an App
2020-05-15 20:24:35 +08:00
xiehang
92e4f84ec5
esp_wifi: Fix AP switch to adjacent channel without disconnect
2020-05-15 14:42:03 +08:00
kapil.gupta
b91bba1a07
wpa_supplicant: Fix some memleaks and invalid memory access
...
Add changes to fix issues reported in clang analyzer
2020-05-14 11:28:27 +05:30
lly
8cdaf34430
ble_mesh: Fix typos
2020-05-13 18:33:46 +08:00
lly
4f402486c6
ble_mesh: Fix mesh node device role restore
...
Old version of BLE Mesh has no device role storage, because
previously we only support storing mesh node info.
If the binary of the node is upgraded from old version to a
new version (support storing provisioner info), the mesh info
of the node will not be restored because mesh role does not
exist in the flash.
2020-05-13 18:24:44 +08:00
Island
19893abd04
Merge branch 'bugfix/sync_zephyr_bt_mesh_bugfix_v3.3' into 'release/v3.3'
...
Bugfix/sync zephyr bt mesh bugfix (v3.3)
See merge request espressif/esp-idf!8689
2020-05-13 18:15:22 +08:00