Skip to content

Commit c935f6e

Browse files
Jason2866Jason2866
authored
Update 20220917
update
2 parents e466fc4 + 25c968e commit c935f6e

33 files changed

+308
-452
lines changed

‎components/bt/esp_ble_mesh/btc/btc_ble_mesh_ble.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ static void btc_ble_mesh_ble_callback(esp_ble_mesh_ble_cb_param_t *cb_params, ui
8282
msg.pid = BTC_PID_BLE_MESH_BLE_COEX;
8383
msg.act = act;
8484

85-
btc_transfer_context(&msg, cb_params, sizeof(esp_ble_mesh_ble_cb_param_t),
85+
btc_transfer_context(&msg, cb_params, cb_params == NULL ? 0 : sizeof(esp_ble_mesh_ble_cb_param_t),
8686
btc_ble_mesh_ble_copy_req_data);
8787
}
8888

‎components/bt/esp_ble_mesh/btc/btc_ble_mesh_config_model.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -298,7 +298,7 @@ static void btc_ble_mesh_config_client_callback(esp_ble_mesh_cfg_client_cb_param
298298
msg.pid = BTC_PID_CONFIG_CLIENT;
299299
msg.act = act;
300300

301-
btc_transfer_context(&msg, cb_params, sizeof(esp_ble_mesh_cfg_client_cb_param_t),
301+
btc_transfer_context(&msg, cb_params, cb_params == NULL ? 0 : sizeof(esp_ble_mesh_cfg_client_cb_param_t),
302302
btc_ble_mesh_config_client_copy_req_data);
303303
}
304304

@@ -702,7 +702,7 @@ static void btc_ble_mesh_config_server_callback(esp_ble_mesh_cfg_server_cb_param
702702
msg.pid = BTC_PID_CONFIG_SERVER;
703703
msg.act = act;
704704

705-
btc_transfer_context(&msg, cb_params, sizeof(esp_ble_mesh_cfg_server_cb_param_t), NULL);
705+
btc_transfer_context(&msg, cb_params, cb_params == NULL ? 0 : sizeof(esp_ble_mesh_cfg_server_cb_param_t), NULL);
706706
}
707707

708708
void bt_mesh_config_server_cb_evt_to_btc(uint8_t evt_type, struct bt_mesh_model *model,

‎components/bt/esp_ble_mesh/btc/btc_ble_mesh_generic_model.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -368,7 +368,7 @@ static void btc_ble_mesh_generic_client_callback(esp_ble_mesh_generic_client_cb_
368368
msg.pid = BTC_PID_GENERIC_CLIENT;
369369
msg.act = act;
370370

371-
btc_transfer_context(&msg, cb_params, sizeof(esp_ble_mesh_generic_client_cb_param_t),
371+
btc_transfer_context(&msg, cb_params, cb_params == NULL ? 0 : sizeof(esp_ble_mesh_generic_client_cb_param_t),
372372
btc_ble_mesh_generic_client_copy_req_data);
373373
}
374374

@@ -685,7 +685,7 @@ static void btc_ble_mesh_generic_server_callback(esp_ble_mesh_generic_server_cb_
685685
msg.pid = BTC_PID_GENERIC_SERVER;
686686
msg.act = act;
687687

688-
btc_transfer_context(&msg, cb_params, sizeof(esp_ble_mesh_generic_server_cb_param_t),
688+
btc_transfer_context(&msg, cb_params, cb_params == NULL ? 0 : sizeof(esp_ble_mesh_generic_server_cb_param_t),
689689
btc_ble_mesh_generic_server_copy_req_data);
690690
}
691691

‎components/bt/esp_ble_mesh/btc/btc_ble_mesh_health_model.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@ static void btc_ble_mesh_health_client_callback(esp_ble_mesh_health_client_cb_pa
231231
msg.pid = BTC_PID_HEALTH_CLIENT;
232232
msg.act = act;
233233

234-
btc_transfer_context(&msg, cb_params, sizeof(esp_ble_mesh_health_client_cb_param_t),
234+
btc_transfer_context(&msg, cb_params, cb_params == NULL ? 0 : sizeof(esp_ble_mesh_health_client_cb_param_t),
235235
btc_ble_mesh_health_client_copy_req_data);
236236
}
237237

@@ -542,7 +542,7 @@ static void btc_ble_mesh_health_server_callback(esp_ble_mesh_health_server_cb_pa
542542
msg.pid = BTC_PID_HEALTH_SERVER;
543543
msg.act = act;
544544

545-
btc_transfer_context(&msg, cb_params, sizeof(esp_ble_mesh_health_server_cb_param_t),
545+
btc_transfer_context(&msg, cb_params, cb_params == NULL ? 0 : sizeof(esp_ble_mesh_health_server_cb_param_t),
546546
btc_ble_mesh_health_server_copy_req_data);
547547
}
548548

‎components/bt/esp_ble_mesh/btc/btc_ble_mesh_lighting_model.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ static void btc_ble_mesh_lighting_client_callback(esp_ble_mesh_light_client_cb_p
212212
msg.pid = BTC_PID_LIGHTING_CLIENT;
213213
msg.act = act;
214214

215-
btc_transfer_context(&msg, cb_params, sizeof(esp_ble_mesh_light_client_cb_param_t),
215+
btc_transfer_context(&msg, cb_params, cb_params == NULL ? 0 : sizeof(esp_ble_mesh_light_client_cb_param_t),
216216
btc_ble_mesh_lighting_client_copy_req_data);
217217
}
218218

@@ -497,7 +497,7 @@ static void btc_ble_mesh_lighting_server_callback(esp_ble_mesh_lighting_server_c
497497
msg.pid = BTC_PID_LIGHTING_SERVER;
498498
msg.act = act;
499499

500-
btc_transfer_context(&msg, cb_params, sizeof(esp_ble_mesh_lighting_server_cb_param_t),
500+
btc_transfer_context(&msg, cb_params, cb_params == NULL ? 0 : sizeof(esp_ble_mesh_lighting_server_cb_param_t),
501501
btc_ble_mesh_lighting_server_copy_req_data);
502502
}
503503

‎components/bt/esp_ble_mesh/btc/btc_ble_mesh_prov.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -368,7 +368,7 @@ static bt_status_t btc_ble_mesh_model_callback(esp_ble_mesh_model_cb_param_t *pa
368368
msg.pid = BTC_PID_MODEL;
369369
msg.act = act;
370370

371-
ret = btc_transfer_context(&msg, param, sizeof(esp_ble_mesh_model_cb_param_t),
371+
ret = btc_transfer_context(&msg, param, param == NULL ? 0 : sizeof(esp_ble_mesh_model_cb_param_t),
372372
btc_ble_mesh_model_copy_req_data);
373373
if (ret != BT_STATUS_SUCCESS) {
374374
BT_ERR("btc_transfer_context failed");
@@ -528,7 +528,7 @@ static bt_status_t btc_ble_mesh_prov_callback(esp_ble_mesh_prov_cb_param_t *para
528528
msg.pid = BTC_PID_PROV;
529529
msg.act = act;
530530

531-
ret = btc_transfer_context(&msg, param, sizeof(esp_ble_mesh_prov_cb_param_t), NULL);
531+
ret = btc_transfer_context(&msg, param, param == NULL ? 0 : sizeof(esp_ble_mesh_prov_cb_param_t), NULL);
532532
if (ret != BT_STATUS_SUCCESS) {
533533
BT_ERR("btc_transfer_context failed");
534534
}

‎components/bt/esp_ble_mesh/btc/btc_ble_mesh_sensor_model.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -450,7 +450,7 @@ static void btc_ble_mesh_sensor_client_callback(esp_ble_mesh_sensor_client_cb_pa
450450
msg.pid = BTC_PID_SENSOR_CLIENT;
451451
msg.act = act;
452452

453-
btc_transfer_context(&msg, cb_params, sizeof(esp_ble_mesh_sensor_client_cb_param_t),
453+
btc_transfer_context(&msg, cb_params, cb_params == NULL ? 0 : sizeof(esp_ble_mesh_sensor_client_cb_param_t),
454454
btc_ble_mesh_sensor_client_copy_req_data);
455455
}
456456

@@ -817,7 +817,7 @@ static void btc_ble_mesh_sensor_server_callback(esp_ble_mesh_sensor_server_cb_pa
817817
msg.pid = BTC_PID_SENSOR_SERVER;
818818
msg.act = act;
819819

820-
btc_transfer_context(&msg, cb_params, sizeof(esp_ble_mesh_sensor_server_cb_param_t),
820+
btc_transfer_context(&msg, cb_params, cb_params == NULL ? 0 : sizeof(esp_ble_mesh_sensor_server_cb_param_t),
821821
btc_ble_mesh_sensor_server_copy_req_data);
822822
}
823823

‎components/bt/esp_ble_mesh/btc/btc_ble_mesh_time_scene_model.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ static void btc_ble_mesh_time_scene_client_callback(esp_ble_mesh_time_scene_clie
214214
msg.pid = BTC_PID_TIME_SCENE_CLIENT;
215215
msg.act = act;
216216

217-
btc_transfer_context(&msg, cb_params, sizeof(esp_ble_mesh_time_scene_client_cb_param_t),
217+
btc_transfer_context(&msg, cb_params, cb_params == NULL ? 0 : sizeof(esp_ble_mesh_time_scene_client_cb_param_t),
218218
btc_ble_mesh_time_scene_client_copy_req_data);
219219
}
220220

@@ -401,7 +401,7 @@ static void btc_ble_mesh_time_scene_server_callback(esp_ble_mesh_time_scene_serv
401401
msg.pid = BTC_PID_TIME_SCENE_SERVER;
402402
msg.act = act;
403403

404-
btc_transfer_context(&msg, cb_params, sizeof(esp_ble_mesh_time_scene_server_cb_param_t), NULL);
404+
btc_transfer_context(&msg, cb_params, cb_params == NULL ? 0 : sizeof(esp_ble_mesh_time_scene_server_cb_param_t), NULL);
405405
}
406406

407407
void bt_mesh_time_scene_server_cb_evt_to_btc(uint8_t evt_type, struct bt_mesh_model *model,

‎components/bt/host/nimble/nimble‎

‎components/tcp_transport/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
set(srcs
22
"transport.c"
33
"transport_ssl.c"
4-
"transport_utils.c")
4+
"transport_internal.c")
55

66
if(CONFIG_WS_TRANSPORT)
77
list(APPEND srcs

0 commit comments

Comments
 (0)