LE Scan: modify message codes

bug: v/82820

Modify message codes so its safe when client and server have different version of codes.

Signed-off-by: Zihao Gao <[email protected]>

Author: gzh-terry

service/ipc/socket/include/bt_message_scan.h

@@ -26,7 +26,7 @@ BT_SCAN_MESSAGE_START,
 
 #ifdef __BT_CALLBACK_CODE__
     BT_SCAN_CALLBACK_START,
-    BT_LE_ON_SCAN_RESULT,
+    BT_LE_ON_SCAN_RESULT_UNUSED, // Unused, but kept to maintain enum stability
     BT_LE_ON_SCAN_START_STATUS,
     BT_LE_ON_SCAN_STOPPED,
     BT_SCAN_CALLBACK_END,
@@ -46,7 +46,9 @@ BT_SCAN_MESSAGE_START,
 
     enum {
         BLE_SCAN_SUBCODE_START = 0,
-        BLE_SCAN_SUBCODE_BATCH_SCAN_CALLBACK = 1,
+        BLE_SCAN_SUBCODE_BATCH_SCAN_CALLBACK_UNUSED = 1, // Unused
+        BLE_SCAN_SUBCODE_SCAN_CALLBACK = 2,
+        BLE_SCAN_SUBCODE_BATCH_SCAN_CALLBACK = 3,
         BLE_SCAN_SUBCODE_END = BT_IPC_CODE_SUBCODE_MAX_NUM,
     };
 
@@ -56,6 +58,7 @@ BT_SCAN_MESSAGE_START,
 
 #define BT_IPC_CODE_CALLBACK_BLE_SCAN_BEGIN BT_IPC_CODE(BT_IPC_CODE_TYPE_CALLBACK, BT_IPC_CODE_GROUP_BLE_SCAN, 0)
 // TODO: Add new BT IPC Code sequentially
+#define BT_LE_ON_SCAN_RESULT BT_IPC_CODE(BT_IPC_CODE_TYPE_CALLBACK, BT_IPC_CODE_GROUP_BLE_SCAN, BLE_SCAN_SUBCODE_SCAN_CALLBACK)
 #define BT_LE_ON_BATCH_SCAN_RESULT BT_IPC_CODE(BT_IPC_CODE_TYPE_CALLBACK, BT_IPC_CODE_GROUP_BLE_SCAN, BLE_SCAN_SUBCODE_BATCH_SCAN_CALLBACK)
 #define BT_IPC_CODE_CALLBACK_BLE_SCAN_END BT_IPC_CODE(BT_IPC_CODE_TYPE_CALLBACK, BT_IPC_CODE_GROUP_BLE_SCAN, BT_IPC_CODE_SUBCODE_MAX_NUM)
 

service/ipc/socket/src/bt_socket_scan.c

@@ -271,14 +271,7 @@ int bt_socket_client_scan_callback(service_poll_t* poll,
     int fd, bt_instance_t* ins, bt_message_packet_t* packet, bool is_async)
 {
     switch (packet->code) {
-    case BT_LE_ON_SCAN_RESULT: {
-        bt_scan_remote_t* scan = INT2PTR(bt_scan_remote_t*) packet->scan_cb._on_scan_result_cb.scanner;
-        ble_scan_result_t* result = &packet->scan_cb._on_scan_result_cb.result;
-        ble_scan_result_t* tmp = malloc(sizeof(ble_scan_result_t) + result->length);
-        memcpy(tmp, result, sizeof(ble_scan_result_t));
-        memcpy(tmp->adv_data, packet->scan_cb._on_scan_result_cb.adv_data, result->length);
-        scan->callback->on_scan_result(scan, tmp);
-        free(tmp);
+    case BT_LE_ON_SCAN_RESULT_UNUSED: {
         break;
     }
     case BT_LE_ON_SCAN_START_STATUS: {
@@ -320,6 +313,16 @@ int bt_socket_client_scan_callback(service_poll_t* poll,
             }
             break;
         }
+        case BLE_SCAN_SUBCODE_SCAN_CALLBACK: {
+            bt_scan_remote_t* scan = INT2PTR(bt_scan_remote_t*) packet->scan_cb._on_scan_result_cb.scanner;
+            ble_scan_result_t* result = &packet->scan_cb._on_scan_result_cb.result;
+            ble_scan_result_t* tmp = malloc(sizeof(ble_scan_result_t) + result->length);
+            memcpy(tmp, result, sizeof(ble_scan_result_t));
+            memcpy(tmp->adv_data, packet->scan_cb._on_scan_result_cb.adv_data, result->length);
+            scan->callback->on_scan_result(scan, tmp);
+            free(tmp);
+            break;
+        }
         default:
             return BT_STATUS_PARM_INVALID;
         }