feedc0de/esp-idf
1
0
Fork 0
forked from espressif/esp-idf
Code Pull Requests Activity

Merge branch 'bugfix/handle_correct_return_value' into 'master'

Browse Source 
Nimble: Corrected conditional check during connection to handle failure case

See merge request espressif/esp-idf!24047
This commit is contained in:
Rahul Tank
2023-06-30 15:17:05 +08:00
parent 9b5f3c69a9 df2612d104
commit 1ad891361f
6 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
examples/bluetooth/nimble/ble_htp/htp_cent/main/main.c
View File

@@ -368,7 +368,7 @@ ble_htp_cent_should_connect(const struct ble_gap_disc_desc *disc)
rc = ble_hs_adv_parse_fields(&fields, disc->data, disc->length_data);
if (rc != 0) {
return rc;
return 0;
}
if (strlen(CONFIG_EXAMPLE_PEER_ADDR) && (strncmp(CONFIG_EXAMPLE_PEER_ADDR, "ADDR_ANY", strlen("ADDR_ANY")) != 0)) {

2
examples/bluetooth/nimble/ble_l2cap_coc/coc_blecent/main/main.c
View File

@@ -275,7 +275,7 @@ blecent_should_connect(const struct ble_gap_disc_desc *disc)
rc = ble_hs_adv_parse_fields(&fields, disc->data, disc->length_data);
if (rc != 0) {
return rc;
return 0;
}
if (strlen(CONFIG_EXAMPLE_PEER_ADDR) &&

2
examples/bluetooth/nimble/ble_phy/phy_cent/main/main.c
View File

@@ -301,7 +301,7 @@ blecent_should_connect(const struct ble_gap_disc_desc *disc)
rc = ble_hs_adv_parse_fields(&fields, disc->data, disc->length_data);
if (rc != 0) {
return rc;
return 0;
}
if (strlen(CONFIG_EXAMPLE_PEER_ADDR) && (strncmp(CONFIG_EXAMPLE_PEER_ADDR, "ADDR_ANY", strlen("ADDR_ANY")) != 0)) {

2
examples/bluetooth/nimble/ble_spp/spp_client/main/main.c
View File

@@ -134,7 +134,7 @@ ble_spp_client_should_connect(const struct ble_gap_disc_desc *disc)
rc = ble_hs_adv_parse_fields(&fields, disc->data, disc->length_data);
if (rc != 0) {
return rc;
return 0;
}
/* The device has to advertise support for the SPP

2
examples/bluetooth/nimble/blecent/main/main.c
View File

@@ -511,7 +511,7 @@ blecent_should_connect(const struct ble_gap_disc_desc *disc)
rc = ble_hs_adv_parse_fields(&fields, disc->data, disc->length_data);
if (rc != 0) {
return rc;
return 0;
}
if (strlen(CONFIG_EXAMPLE_PEER_ADDR) && (strncmp(CONFIG_EXAMPLE_PEER_ADDR, "ADDR_ANY", strlen("ADDR_ANY")) != 0)) {

2
examples/bluetooth/nimble/throughput_app/blecent_throughput/main/main.c
View File

@@ -420,7 +420,7 @@ blecent_should_connect(const struct ble_gap_disc_desc *disc)
rc = ble_hs_adv_parse_fields(&fields, disc->data, disc->length_data);
if (rc != 0) {
return rc;
return 0;
}
if (strlen(CONFIG_EXAMPLE_PEER_ADDR) && (strncmp(CONFIG_EXAMPLE_PEER_ADDR, "ADDR_ANY", strlen("ADDR_ANY")) != 0)) {