Michael (XIAO Xufeng)
10f16c5d72
Merge branch 'bugfix/soc_caps_implicit_inc_v4.2' into 'release/v4.2'
...
HAL: explicitly include soc_caps.h (v4.2)
See merge request espressif/esp-idf!11896
2021-01-27 10:33:42 +08:00
Mahavir Jain
c4d0a384b0
Merge branch 'fix/esp_tls_fix_memory_leak_v4.2' into 'release/v4.2'
...
Fix/esp tls fix memory leak v4.2
See merge request espressif/esp-idf!12085
2021-01-22 21:37:58 +08:00
Mahavir Jain
be26d45d78
Merge branch 'bugfix/httpd_session_close_lru_v4.2' into 'release/v4.2'
...
esp_http_server: Add flag in sock_db to identify httpd_sess_close is called from httpd_session_close_lru (v4.2)
See merge request espressif/esp-idf!12112
2021-01-22 21:22:11 +08:00
Shubham Kulkarni
6b054fb4a6
Enable lru_purge_enable in simple HTTP server example
2021-01-22 15:33:57 +05:30
Mahavir Jain
ecbf436de4
Merge branch 'bugfix/http_client_buffer_overread_v4.2' into 'release/v4.2'
...
esp_http_client: Fix buffer overread, update https_request example to use HTTP/1.1 (v4.2)
See merge request espressif/esp-idf!12108
2021-01-22 17:45:31 +08:00
Mahavir Jain
4d1ada8ab5
Merge branch 'bugfix/misc_secure_boot_v4.2' into 'release/v4.2'
...
Bugfix/misc secure boot v2 (v4.2)
See merge request espressif/esp-idf!11743
2021-01-22 16:27:10 +08:00
Shubham Kulkarni
1c732d7556
esp_http_server: Add lru_socket flag in sock_db to indicate httpd_sess_close is called from httpd_sess_close_lru
2021-01-22 11:16:10 +05:30
Shubham Kulkarni
29feb17636
esp_http_client.c: Clear raw_len for response buffer after dispatching HTTP_EVENT_ON_FINISH event
...
Closes: https://github.com/espressif/esp-idf/issues/6146
2021-01-22 11:03:23 +05:30
Angus Gratton
7ceaac64bf
Merge branch 'bugfix/secure_boot_sig_failed_crash_v4.2' into 'release/v4.2'
...
secure boot: Fix crash if signature verification fails in app (v4.2)
See merge request espressif/esp-idf!11924
2021-01-22 07:58:24 +08:00
Aditya Patwardhan
84219fe844
esp_tls_wolfssl: Move order of crt_bundle check to match that in
...
esp_tls_mbedtls
2021-01-21 10:45:42 +05:30
Aditya Patwardhan
a5cf243ea0
esp-tls: Fix mem leak when global_ca_store is freed
2021-01-21 10:45:18 +05:30
Island
56de4bbc4d
Merge branch 'bugfix/ble_mesh_node_set_name_status_check_v4.2' into 'release/v4.2'
...
ble_mesh: stack: Remove node set device name return status check (v4.2)
See merge request espressif/esp-idf!12081
2021-01-21 11:07:58 +08:00
Island
7c9be015aa
Merge branch 'bugfix/ble_mesh_proxy_client_net_resend_v4.2' into 'release/v4.2'
...
ble_mesh: stack: Fix proxy client may fail to resend msg (v4.2)
See merge request espressif/esp-idf!12079
2021-01-21 11:07:27 +08:00
Island
54d8a1f76b
Merge branch 'bugfix/ble_mesh_prov_use_diff_rand_v4.2' into 'release/v4.2'
...
ble_mesh: stack: Use different random for each provisioning (v4.2)
See merge request espressif/esp-idf!12077
2021-01-21 11:07:02 +08:00
lly
4510332e96
ble_mesh: stack: Remove node set device name return status check
2021-01-20 21:11:21 +08:00
lly
370e65ec8a
ble_mesh: stack: Fix proxy client may fail to resend msg
2021-01-20 21:10:18 +08:00
lly
962b14d653
ble_mesh: stack: Use different random for each provisioning
2021-01-20 21:09:09 +08:00
Ivan Grokhotkov
967c07b6ae
Merge branch 'bugfix/nvs_check_external_partition' into 'release/v4.2'
...
NVS: ensuring default partition
See merge request espressif/esp-idf!8934
2021-01-20 07:44:28 +08:00
David Čermák
ad47ed5ef1
Merge branch 'bugfix/mdns_txt_length_collision_v4.2' into 'release/v4.2'
...
mDNS: Fix of text length calculation when detecting a collision(Backport v4.2)
See merge request espressif/esp-idf!12029
2021-01-19 22:15:05 +08:00
Island
db2ddebc23
Merge branch 'bugfix/ble_mesh_log_macro_v4.2' into 'release/v4.2'
...
ble_mesh: stack: Add prefix for log macros (v4.2)
See merge request espressif/esp-idf!12052
2021-01-19 17:34:05 +08:00
lly
f56fe3f877
ble_mesh: stack: Fix compile warning when log is disabled
2021-01-19 14:04:45 +08:00
lly
571da869f5
ble_mesh: ci: Add disable log sdkconfig test files
2021-01-19 14:04:45 +08:00
lly
d545f1223f
ble_mesh: stack: Add prefix BLE_MESH_ for log related macros
2021-01-19 14:04:44 +08:00
David Čermák
8cd16b60f5
Merge branch 'bugfix/ppp_deinit_failure_v4.2' into 'release/v4.2'
...
esp_modem: Fixed race condition on exiting PPP mode (v4.2)
See merge request espressif/esp-idf!11870
2021-01-19 02:42:50 +08:00
Island
a4525284bd
Merge branch 'update/ble_mesh_set_hsl_states_v4.2' into 'release/v4.2'
...
ble_mesh: stack: Enable updating lighting hsl state (v4.2)
See merge request espressif/esp-idf!12036
2021-01-18 19:10:31 +08:00
Island
e36282787e
Merge branch 'bugfix/ble_mesh_build_error_c3_merge_master_v4.2' into 'release/v4.2'
...
Bugfix/ble mesh build error merge master (v4.2)
See merge request espressif/esp-idf!12038
2021-01-18 19:10:21 +08:00
Jiang Jiang Jian
b24ccd8a20
Merge branch 'bugfix/fix_iperf_example_crash_issue_v4.2' into 'release/v4.2'
...
Bugfix/fix iperf example crash issue v4.2 (backport v4.2)
See merge request espressif/esp-idf!12024
2021-01-18 19:09:37 +08:00
lly
c44dc1f262
ble_mesh: stack: Fix compile warning with BIT macro
2021-01-18 14:07:30 +08:00
lly
de166facd7
ble_mesh: stack: Update mesh max conn macro when using bluedroid
2021-01-18 14:07:24 +08:00
lly
71f4c476cb
ble_mesh: stack: Enable updating lighting hsl state
2021-01-18 14:01:39 +08:00
Island
b4735859d6
Merge branch 'bugfix/bluedroid_avoid_same_bdaddr_conn_v4.2' into 'release/v4.2'
...
Bluedroid: Do not connect if peer BD_ADDR is same as own BD_ADDR. (v4.2)
See merge request espressif/esp-idf!11990
2021-01-18 14:01:31 +08:00
David Čermák
28371f45a4
Merge branch 'bugfix/ppp_netif_free_v4.2' into 'release/v4.2'
...
esp-modem: Remove esp-netif destroy from modem network glue code (v4.2)
See merge request espressif/esp-idf!11872
2021-01-16 00:57:15 +08:00
David Cermak
84039dc77d
esp_modem: Fixed race condition on exiting PPP mode
...
esp_modem_stop_ppp() stops both ppp netif and switches the modem back to
command mode. IF these two actions are not synchronised, we might
experience issues of
* active PPP session trying to send/receive uart-data
* command mode already active before modem switched to it
both resulting in crashes.
Fixed by introducing the transition mode and running these actions in sequence
* set esp-modem to transition mode
* enter command mode, wait for the reply or re-sync
* close the PPP netif
* wait until the netif closes
Other fixes include ignoring certain events if modem component not ready
or not in appropriate mode:
* ignoring all UART events comming from DTE with no DCE attached
* ignore pattern detection in PPP mode
2021-01-15 17:38:30 +01:00
David Čermák
67a3ff8a4b
Merge branch 'bugfix/esp_netif_ppp_event_data_v4.2' into 'release/v4.2'
...
esp-netif: Fix PPP netif event posting to include esp_netif data (v4.2)
See merge request espressif/esp-idf!11868
2021-01-15 23:48:27 +08:00
suren.gabrielyan
500edd412a
mDNS: Fix of text length calculation when detecting a collision
2021-01-15 17:11:14 +04:00
suren.gabrielyan
cc0ad534e9
mDNS: Fix of collision detection during txt length calculation
...
Closes https://github.com/espressif/esp-idf/issues/6114
2021-01-15 17:10:35 +04:00
xiehang
b78fbdab12
example: Scan failure should not cause system crash
2021-01-15 20:21:35 +08:00
xiehang
30becdfaab
example: do not check the return value of esp_wifi_connect()
2021-01-15 20:20:17 +08:00
David Čermák
7ff123562b
Merge branch 'bugfix/mdns_resolve_nonstrict_answers_v4.2' into 'release/v4.2'
...
mdns: Allow resolve (it's own) non-strict answers (v4.2)
See merge request espressif/esp-idf!11818
2021-01-15 19:51:04 +08:00
David Cermak
53fc156adb
esp-modem: Remove esp-netif destroy from modem network glue code
...
To be in line with other interfaces, when deleting the driver and it's glue layer to esp-netif, we DO NOT delete the related esp-netif (since is was allocated and created outside of the glue code and it works the same way in esp-eth and esp-wifi driver/glue layers).
Closes https://github.com/espressif/esp-idf/issues/5486
2021-01-15 11:48:26 +00:00
Island
67fb958b8c
Merge branch 'bugfix/ble_mesh_macro_OR_v4.2' into 'release/v4.2'
...
ble_mesh: stack: Fix using wrong | for OR between macros (v4.2)
See merge request espressif/esp-idf!11997
2021-01-15 11:04:47 +08:00
lly
cd1fbfdee1
ble_mesh: stack: Fix using wrong | for OR between macros
2021-01-14 19:03:00 +08:00
Island
8911c29122
Merge branch 'feat/ble_mesh_support_ble_scan_v4.2' into 'release/v4.2'
...
ble_mesh: stack: Add BLE scan callback when mesh is enabled (v4.2)
See merge request espressif/esp-idf!11963
2021-01-14 19:01:05 +08:00
lly
a3fa7dda33
ble_mesh: ci: Add ble & ble mesh coex sdkconfig test files
2021-01-14 07:30:47 +00:00
lly
c8890a40e4
ble_mesh: stack: Support reporting normal ble adv packets
2021-01-14 07:30:47 +00:00
lly
a91addb716
ble_mesh: stack: Add a btc file for ble coex functions
...
Previously if starting/stopping BLE advertising when BLE Mesh
is enabled, the corresponding events will be notified through
the callback registered by esp_ble_mesh_register_prov_callback().
With this commit, the func esp_ble_mesh_register_ble_callback()
needs to be invoked for resgitering the callback used for BLE
coexistence related functionalities (i.e. ADV/SCAN).
2021-01-14 07:30:47 +00:00
lly
396c6a3bc5
ble_mesh: stack: Move ble scan funcitons to a single file
2021-01-14 07:30:47 +00:00
lly
96182bdc43
ble_mesh: stack: Optimize handling received mesh adv packets
2021-01-14 07:30:47 +00:00
Chinmay Chhajed
4cfece437d
Bluedroid: Do not connect if peer BD_ADDR is same as own BD_ADDR.
2021-01-14 12:22:30 +05:30
Angus Gratton
73023f7ff7
Merge branch 'ci/increase_build_example_parallel_count' into 'release/v4.2'
...
ci: Add 1 parallel count for building example
See merge request espressif/esp-idf!11976
2021-01-14 14:33:26 +08:00