dali/bacnet_stack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added BACnet file object restore using CreateObject handling after a backup for the STARTRESTORE state.

Browse Source
This commit is contained in:
Steve Karg
2026-02-09 16:02:34 -06:00
parent 45ed68e8b8
commit 145d026224
2 changed files with 74 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/bacnet/basic/object/device.c
+37
View File
@@ -3109,9 +3109,46 @@ void Device_Start_Restore(void)
{ {
#if defined BACNET_BACKUP_RESTORE #if defined BACNET_BACKUP_RESTORE
BACNET_DATE_TIME bdateTime = { 0 }; BACNET_DATE_TIME bdateTime = { 0 };
BACNET_CREATE_OBJECT_DATA create_data = { 0 };
uint8_t apdu[MAX_APDU] = { 0 };
int32_t apdu_len = 0, offset = 0, file_size = 0;
int decoded_len = 0;
datetime_local(&bdateTime.date, &bdateTime.time, NULL, NULL); datetime_local(&bdateTime.date, &bdateTime.time, NULL, NULL);
bacapp_timestamp_datetime_set(&Last_Restore_Time, &bdateTime); bacapp_timestamp_datetime_set(&Last_Restore_Time, &bdateTime);
Backup_State = BACKUP_STATE_PREPARING_FOR_RESTORE; Backup_State = BACKUP_STATE_PREPARING_FOR_RESTORE;
/* create objects from the backup file */
#if defined(BACFILE)
file_size = bacfile_file_size(Configuration_Files[0]);
#endif
while (offset < file_size) {
#if defined(BACFILE)
apdu_len = bacfile_read_offset(
Configuration_Files[0], offset, &apdu[0], sizeof(apdu));
#endif
if (apdu_len > 0) {
decoded_len = create_object_decode_service_request(
apdu, apdu_len, &create_data);
if (decoded_len > 0) {
offset += decoded_len;
create_data.error_class = ERROR_CLASS_PROPERTY;
create_data.error_code = ERROR_CODE_SUCCESS;
create_data.continue_on_error = true;
if (Device_Create_Object(&create_data)) {
/* object created and initialized successfully */
} else {
/* error creating object - keep going */
}
} else {
/* error while decoding object */
break;
}
} else {
/* error while reading file */
break;
}
}
Backup_State = BACKUP_STATE_IDLE;
#endif #endif
} }
src/bacnet/basic/server/bacnet_device.c
+37
View File
@@ -3432,9 +3432,46 @@ void Device_Start_Restore(void)
{ {
#if defined BACNET_BACKUP_RESTORE #if defined BACNET_BACKUP_RESTORE
BACNET_DATE_TIME bdateTime = { 0 }; BACNET_DATE_TIME bdateTime = { 0 };
BACNET_CREATE_OBJECT_DATA create_data = { 0 };
uint8_t apdu[MAX_APDU] = { 0 };
int32_t apdu_len = 0, offset = 0, file_size = 0;
int decoded_len = 0;
datetime_local(&bdateTime.date, &bdateTime.time, NULL, NULL); datetime_local(&bdateTime.date, &bdateTime.time, NULL, NULL);
bacapp_timestamp_datetime_set(&Last_Restore_Time, &bdateTime); bacapp_timestamp_datetime_set(&Last_Restore_Time, &bdateTime);
Backup_State = BACKUP_STATE_PREPARING_FOR_RESTORE; Backup_State = BACKUP_STATE_PREPARING_FOR_RESTORE;
/* create objects from the backup file */
#if defined(BACFILE)
file_size = bacfile_file_size(Configuration_Files[0]);
#endif
while (offset < file_size) {
#if defined(BACFILE)
apdu_len = bacfile_read_offset(
Configuration_Files[0], offset, &apdu[0], sizeof(apdu));
#endif
if (apdu_len > 0) {
decoded_len = create_object_decode_service_request(
apdu, apdu_len, &create_data);
if (decoded_len > 0) {
offset += decoded_len;
create_data.error_class = ERROR_CLASS_PROPERTY;
create_data.error_code = ERROR_CODE_SUCCESS;
create_data.continue_on_error = true;
if (Device_Create_Object(&create_data)) {
/* object created and initialized successfully */
} else {
/* error creating object - keep going */
}
} else {
/* error while decoding object */
break;
}
} else {
/* error while reading file */
break;
}
}
Backup_State = BACKUP_STATE_IDLE;
#endif #endif
} }