From ecadbe86f150b525b7f21de65fffe384a3cdc0ae Mon Sep 17 00:00:00 2001 From: shivabhaskar <31137603+shivabhaskar@users.noreply.github.com> Date: Wed, 1 Oct 2025 12:59:14 +0530 Subject: [PATCH 1/2] RDK-59014: Enable incremental CDL support for curl 56 error and Minor Format fix (#141) Reason for change: On some devices, CDL reaches ~90% and fails with curl 56 due to network or server reset. Adding incremental CDL support for curl 56, similar to curl 18 low bandwidth) and 28(timeout), allows downloads to resume after such errors, improving reliability. Test Procedure: check incremental CDL by simulating curl 56 Risks: Low Co-authored-by: Deva --- src/iarmInterface/iarmInterface.c | 4 ++-- src/include/rdkv_cdl.h | 1 + src/rdkv_main.c | 5 +++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/iarmInterface/iarmInterface.c b/src/iarmInterface/iarmInterface.c index 29dec261..4adff61d 100644 --- a/src/iarmInterface/iarmInterface.c +++ b/src/iarmInterface/iarmInterface.c @@ -72,10 +72,10 @@ void eventManager(const char *cur_event_name, const char *event_status) { memset( &infoStatus, 0, sizeof(IARM_Bus_MaintMGR_EventData_t) ); main_mgr_event = atoi(event_status); - SWLOG_INFO(">>>>> Identified MaintenanceMGR with event value=%u", main_mgr_event); + SWLOG_INFO(">>>>> Identified MaintenanceMGR with event value=%u\n", main_mgr_event); infoStatus.data.maintenance_module_status.status = (IARM_Maint_module_status_t)main_mgr_event; ret_code=IARM_Bus_BroadcastEvent(IARM_BUS_MAINTENANCE_MGR_NAME,(IARM_EventId_t)IARM_BUS_MAINTENANCEMGR_EVENT_UPDATE, (void *)&infoStatus, sizeof(infoStatus)); - SWLOG_INFO(">>>>> IARM %s Event = %d",(ret_code == IARM_RESULT_SUCCESS) ? "SUCCESS" : "FAILURE",\ + SWLOG_INFO(">>>>> IARM %s Event = %d\n",(ret_code == IARM_RESULT_SUCCESS) ? "SUCCESS" : "FAILURE",\ infoStatus.data.maintenance_module_status.status); } else diff --git a/src/include/rdkv_cdl.h b/src/include/rdkv_cdl.h index b699d75e..f0fd72da 100644 --- a/src/include/rdkv_cdl.h +++ b/src/include/rdkv_cdl.h @@ -116,6 +116,7 @@ #define CURL_CONNECTIVITY_ISSUE 7 #define CURLTIMEOUT 28 #define CURL_LOW_BANDWIDTH 18 +#define CURL_RECV_ERROR 56 #define CHUNK_DWNL_ENABLE 1 #define DWNL_BLOCK -2 #define REBOOT_PENDING_DELAY "2" diff --git a/src/rdkv_main.c b/src/rdkv_main.c index 5f71e2d5..9bd5be7a 100644 --- a/src/rdkv_main.c +++ b/src/rdkv_main.c @@ -869,7 +869,8 @@ int downloadFile( int server_type, const char* artifactLocationUrl, const void* chunk_dwnl = isIncremetalCDLEnable(file_dwnl.pathname); } SWLOG_INFO("%s : After curl request the curl status = %d and http=%d and chunk download=%d\n", __FUNCTION__, curl_ret_code, *httpCode, chunk_dwnl); - } while(chunk_dwnl && (CURL_LOW_BANDWIDTH == curl_ret_code || CURLTIMEOUT == curl_ret_code)); + // Sleep for 10 seconds in case of curl 56 (CURL_RECV_ERROR) for network to stabilize if this is due to network issue. + } while(chunk_dwnl && (CURL_LOW_BANDWIDTH == curl_ret_code || CURLTIMEOUT == curl_ret_code || ((CURL_RECV_ERROR == curl_ret_code) && !sleep(10)) )); #ifdef LIBRDKCERTSELECTOR } while (rdkcertselector_setCurlStatus(thisCertSel, curl_ret_code, file_dwnl.url) == TRY_ANOTHER); #endif @@ -1079,7 +1080,7 @@ int upgradeRequest(int upgrade_type, int server_type, const char* artifactLocati return ret_curl_code; } if (upgrade_type == XCONF_UPGRADE) { - SWLOG_INFO("Trying to communicate with XCONF server"); + SWLOG_INFO("Trying to communicate with XCONF server\n"); t2CountNotify("SYST_INFO_XCONFConnect", 1); } *pHttp_code = 0; From 98cc7a4cca48c0ef286b2627e925b6ad9df09b48 Mon Sep 17 00:00:00 2001 From: dthiya418 Date: Wed, 1 Oct 2025 09:53:09 +0000 Subject: [PATCH 2/2] 1.3.1 release changelog updates --- CHANGELOG.md | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7697d654..af03a61d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,14 +4,24 @@ All notable changes to this project will be documented in this file. Dates are d Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog). +#### [1.3.1](https://github.com/rdkcentral/rdkfwupdater/compare/1.3.0...1.3.1) + +- RDK-59014: Enable incremental CDL support for curl 56 error and Minor Format fix [`#141`](https://github.com/rdkcentral/rdkfwupdater/pull/141) +- Deploy fossid_integration_stateless_diffscan_target_repo action [`#148`](https://github.com/rdkcentral/rdkfwupdater/pull/148) +- Deploy cla action [`#104`](https://github.com/rdkcentral/rdkfwupdater/pull/104) +- Update CODEOWNERS [`1650d11`](https://github.com/rdkcentral/rdkfwupdater/commit/1650d11dc64b34813ea706733ca164ac3047afbb) +- Merge tag '1.3.0' into develop [`22046cc`](https://github.com/rdkcentral/rdkfwupdater/commit/22046cc538fbcebe39430438d6611894fab32bcc) + #### [1.3.0](https://github.com/rdkcentral/rdkfwupdater/compare/1.2.1...1.3.0) +> 16 September 2025 + - RDKEMW-6105 Update L1 tests in rdkvfwupdater to include rbus [`#117`](https://github.com/rdkcentral/rdkfwupdater/pull/117) - RDKEMW-5953 Xconf rule gets changed for Westinghouse [`#113`](https://github.com/rdkcentral/rdkfwupdater/pull/113) - RDK-58323: Canary firmware updates [`#106`](https://github.com/rdkcentral/rdkfwupdater/pull/106) +- 1.3.0 release changelog updates [`c26eac0`](https://github.com/rdkcentral/rdkfwupdater/commit/c26eac00f3e7125450ae0fa55f1bb0ad4d29dc8a) - Update fwdl_interface_gtest.cpp [`4a1f8b2`](https://github.com/rdkcentral/rdkfwupdater/commit/4a1f8b29dff382c88c5c6d470630671cc50bab3c) - Update rbusInterface.c [`07dfc9d`](https://github.com/rdkcentral/rdkfwupdater/commit/07dfc9d79d6e0a30c7aee49ba0a23f163ad988ea) -- Update flash.c [`e956cf8`](https://github.com/rdkcentral/rdkfwupdater/commit/e956cf8abd7d14c031114eb1222146bf32ea6788) #### [1.2.1](https://github.com/rdkcentral/rdkfwupdater/compare/1.2.0...1.2.1)