Angus Gratton
9ff108dcd0
Merge branch 'fix/prov_ble_read_offset_v3.3' into 'release/v3.3'
...
BLE provisioning: Add check for valid ble read offset (v3.3)
See merge request espressif/esp-idf!9747
2020-08-13 16:29:02 +08:00
Michael (XIAO Xufeng)
0a75f2d5f8
Merge branch 'bugfix/fix_adc_dac_conflict_backportv3.3' into 'release/v3.3'
...
Driver(adc): Disable the synchronization operation function of ADC1 and DAC (backport v3.3)
See merge request espressif/esp-idf!9364
2020-08-13 09:51:25 +08:00
Prasad Alatkar
fbdcfc8e4a
BLE provisioning: Add check for valid ble read offset
2020-08-12 08:46:01 +00:00
xiehang
7952bed766
lwip: fix udp tx packet loss issue
2020-08-12 10:38:42 +08:00
ronghulin
cb78c1083f
bugfix: fix IPv6 memory leak issue
2020-08-11 14:19:06 +08:00
Jiang Jiang Jian
7e1c529b00
Merge branch 'bugfix/param_check_instant_tx_octets_adv_ubderrun_v3.3' into 'release/v3.3'
...
component/bt: add connect parameter, fix instant reverse, fix tx default octets, fix assert(1024,0)
See merge request espressif/esp-idf!9484
2020-08-11 14:11:03 +08:00
xueyunfei
68ecc44d34
fix bug for ipv6 fragment
2020-08-11 09:45:02 +08:00
Jiang Jiang Jian
b244afc208
Merge branch 'feature/make_tcp_rto_configurable_v3.3' into 'release/v3.3'
...
make TCP rto time configurable (backport v3.3)
See merge request espressif/esp-idf!9610
2020-08-10 21:17:45 +08:00
Wang Cheng
bfaa14bfdd
component/bt: Fix buffer count deinit crash.
2020-08-10 11:43:54 +08:00
wangcheng
12d476427f
components/bt: Add api to query the number of available buffers for the current connection
2020-08-10 11:43:54 +08:00
baohongde
debda4a63f
Fix ble disconnect due to instant of channel map update is too small
...
Set AFH in time
Fix ble connecting fail in coexist
2020-08-10 11:43:54 +08:00
baohongde
b76f5b2ef2
Coexistence: Add coexist API to enable BLE connection dynamic priority
2020-08-10 11:43:54 +08:00
wangcheng
d674016d64
component/bt: add connect parameter, fix instant reverse, fix tx default octets, fix assert(1024,0), fix assert(512,0)
2020-08-10 11:43:17 +08:00
Piyush Shah
52c089fba7
protocomm_httpd: Restart security session if request is received on a new session
...
This commit fixes a bug as well as changes a behaviour.
Bugfix: During softap/httpd based provisioning, if a session was closed
midway and a new one started, it would never proceed if the http server
assigns same socket number to the new session (which happens almost always).
Now, if a session is closed, using the http callbacks, the older session
data is cleared so that a new one can be created.
Behavioural change: If a client (mobile app particularly) does not use
persistent http session i.e. all provisioning communication on the same
socket, the provisioning may fail. Earlier, since the session context was
not getting cleared, even if the client closed a session and continued
on a new one, it would go through if the socket number assigned was same
(which happens almost always).
Ideally, from a security perspective, all communication related
to secure provisioning must happen on the same socket, and so, this
change is required.
2020-08-06 18:25:53 +00:00
Hou Chen Yao
2e89f963d7
remove auto conn case because we do not support this anymore
2020-08-05 18:04:34 +08:00
Jiang Jiang Jian
593ca2255c
Merge branch 'mesh/bugfix_set_type_v3.3' into 'release/v3.3'
...
Mesh/bugfix (backport v3.3)
See merge request espressif/esp-idf!9179
2020-07-30 21:17:11 +08:00
Jiang Jiang Jian
44791067ec
Merge branch 'nimble/nrpa_support_v3.3' into 'release/v3.3'
...
NimBLE: Add Non-Resolvable private address support and misc fixes (Backport v3.3)
See merge request espressif/esp-idf!9735
2020-07-29 16:35:25 +08:00
Prasad Alatkar
7aab15f33d
NimBLE: Add Non-Resolvable private address support and misc bug fixes (Backport v3.3)
...
- Merges https://github.com/espressif/esp-nimble/pull/12
- Fixes repeated pairing failure in RPA feature
Closes https://github.com/espressif/esp-idf/issues/5530
2020-07-23 11:28:42 +05:30
aleks
b64f4bced8
ci: temporarily disable RS485 related tests
2020-07-22 08:46:57 +00:00
Angus Gratton
bf02206096
Merge branch 'ci/workaround_multiple_ci_failures_v3.3' into 'release/v3.3'
...
CI: workaround multiple ci failures (v3.3)
See merge request espressif/esp-idf!9687
2020-07-22 11:54:45 +08:00
yuanjm
e5066c9969
feat(lwip): make LWIP TCP rto time configurable
2020-07-20 07:58:06 +00:00
Angus Gratton
07942e3991
Merge branch 'bugfix/cmake_bugfixes_v3.3' into 'release/v3.3'
...
CMake-related bugfixes (v3.3)
See merge request espressif/esp-idf!8069
2020-07-20 08:43:52 +08:00
He Yin Ling
858e12a040
CI: do not run cases likely to fail
2020-07-19 15:30:15 +08:00
He Yin Ling
bfb7757feb
CI: disable cases with test env SSC_T5_1
2020-07-19 15:26:29 +08:00
He Yin Ling
9a205c654d
CI: remove incorrect MTU related cases
2020-07-19 15:23:21 +08:00
chenyudong
83fdac780c
mesh/ci: fix MESH_EST_0216
2020-07-10 17:57:36 +08:00
chenyudong
7c95474f6c
mesh: backport some bugfixes
...
1. If the root is specified (FIXED-ROOT) by set type or set parent, change ie.mesh_type to MESH_ROOT before connect to router.
2. Release esp_mesh_recv_toDS when the root becomes non-root.
3. esp_mesh_set_type now supports MESH_IDLE and MESH_STA.
4. Fix ie.rc_rssi is not updated during scan and vote.
5. Fix ie.mesh_type do not match ie.layer caused by parent switch.
6. Fix during root switch, the original root doesn't disconnect from the router after it receives the switch request from the new voted root. (root switch happens by invoking esp_mesh_waive_root).
7. Fix the routing announce timer is not stopped immediately in a new root if the new root is transformed from non-root.
8. Choose the candidate with less ie.assoc when doing parent switch.
2020-07-10 17:57:34 +08:00
lly
28c0673376
ble_mesh: stack: Add two application macros for TTL
2020-07-10 09:15:56 +08:00
lly
9eb66d49e4
ble_mesh: stack: Update send_ttl in btc when recv a msg
...
Update send_ttl mainly for server models. When a server model
receives a message, and the status is required to be replied
by the application, we need to set send_ttl to the msg context.
If send_ttl is not updated in btc, and the applcation does not
set the TTL either, then the status will be replied with TTL=0,
which may cause the client side (e.g. the phone App) failed to
receive the status.
Closes https://github.com/espressif/esp-idf/issues/5300
2020-07-10 09:15:49 +08:00
Shubham Kulkarni
e84ad136b9
esp_https_ota.c: Add fix to return failure if (-1) is returned from esp_http_client_read
...
Closes https://github.com/espressif/esp-idf/issues/4960
2020-07-08 10:00:48 +05:30
Shubham Kulkarni
22926742be
esp_http_client.c: In esp_http_client_read, add fix to return (-1) if esp_transport_read fails
2020-07-08 10:00:48 +05:30
Angus Gratton
9d6c3632e8
bootloader: Fix regression burning efuses late in boot process
...
APB clock get functions not included in iram_loader_seg, meaning
could be overwritten by app depending on app IRAM size and linker
layout.
Regression in dd5190868a
Closes https://github.com/espressif/esp-idf/issues/5456
2020-07-06 16:42:46 +10:00
Jiang Jiang Jian
4891fcea78
Merge branch 'bugfix/beacon_security_downgrade_v3.3' into 'release/v3.3'
...
Avoid parsing RSN/WPA IE's after connection (Backport v3.3)
See merge request espressif/esp-idf!9268
2020-07-03 14:32:04 +08:00
lly
8753fb359a
ble_mesh: stack: Update some fast prov functions
2020-07-03 08:54:59 +08:00
lly
bbf4ce8d18
ble_mesh: stack: Move fast prov functions to a single file
2020-07-03 08:54:51 +08:00
Nachiket Kukade
2edc576419
esp_wifi: Update wifi lib
...
1. Avoid parsing RSN/WPA IE's after connection
2. Remove AUTH_CHANGED reason code logic
2020-07-02 04:06:35 +00:00
lly
d76a3a8372
ble_mesh: ci: Fix failing to compile when using make
2020-07-02 03:38:18 +00:00
lly
e36105156c
ble_mesh: Mark platform related default RNG as 0
2020-07-02 03:38:18 +00:00
lly
9060de827f
ble_mesh: Remove the previously added redundant aes files
2020-07-02 03:38:18 +00:00
lly
8887bd5f3c
ble_mesh: Update CMake and make files for tinycrypt
2020-07-02 03:38:18 +00:00
lly
0940f5b2c3
ble_mesh: Update tinycrypt header file include guards
...
Add BLE_MESH in the macro to make it specific for BLE Mesh.
2020-07-02 03:38:18 +00:00
lly
d690e52993
ble_mesh: Format source and header files of tinycrypt
2020-07-02 03:38:18 +00:00
lly
12b9f59559
ble_mesh: Port full implementation of tinycrypt [Zephyr]
...
- Original code is here: https://github.com/zephyrproject-rtos/tinycrypt
- Also this fixes the compile error when NimBLE and ESP BLE Mesh
both uses the tinycrypt.
2020-07-02 03:38:18 +00:00
fuzhibo
44887f5fde
Driver(adc): Disable the synchronization operation function of ADC1 and DAC
...
Closes IDF-1585
2020-07-01 06:16:35 +00:00
lly
f835011e2f
ble_mesh: stack: Fix compile error when only proxy enabled
...
Also remove some redundant CONFIG_BLE_MESH_PROXY checks, because
when the following options are satisfied, the CONFIG_BLE_MESH_PROXY
option will be selected mandatorily.
2020-07-01 12:32:04 +08:00
Island
021e23ebf7
Merge branch 'bugfix/ble_mesh_check_subnet_before_update_beacon_sent_v3.3' into 'release/v3.3'
...
ble_mesh: Check if subnet exists before updating beacon_sent (v3.3)
See merge request espressif/esp-idf!9398
2020-07-01 11:17:08 +08:00
Island
31b52a5c05
Merge branch 'bugfix/ble_mesh_set_recv_rssi_v3.3' into 'release/v3.3'
...
Bugfix/ble mesh set recv rssi (v3.3)
See merge request espressif/esp-idf!9392
2020-07-01 11:15:48 +08:00
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