Skip to content

Commit 2509b82

Browse files
authored
Rebase with develop (#160)
* Update xconfclient.c
1 parent 1bb864a commit 2509b82

3 files changed

Lines changed: 21 additions & 4 deletions

File tree

CHANGELOG.md

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,27 @@ All notable changes to this project will be documented in this file. Dates are d
44

55
Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
66

7+
#### [1.6.1](https://github.com/rdkcentral/telemetry/compare/1.6.0...1.6.1)
8+
9+
- RDKB 60706 : Failed to verify the certificate used during telemetry profile upload. [`#150`](https://github.com/rdkcentral/telemetry/pull/150)
10+
- Rebase [`#156`](https://github.com/rdkcentral/telemetry/pull/156)
11+
- RDKEMW-6872: Reduce Max Sleep for Previous Report and Fix Crash [`#153`](https://github.com/rdkcentral/telemetry/pull/153)
12+
- RDKB-60978 Timer should not expire when there is a systemClock drift ( eg: NTP sync) happens. [`#143`](https://github.com/rdkcentral/telemetry/pull/143)
13+
- Update xconfclient.c [`10b5914`](https://github.com/rdkcentral/telemetry/commit/10b5914ae038c61b8fbb348ffbad67be733bdad5)
14+
- Update xconfclient.c [`7f44568`](https://github.com/rdkcentral/telemetry/commit/7f44568a4d227b0e7de0964d7d285139fa5cda68)
15+
- Update curlinterface.c [`0336ce6`](https://github.com/rdkcentral/telemetry/commit/0336ce65b7bdff6f91c378e6d9a514f3f322886e)
16+
717
#### [1.6.0](https://github.com/rdkcentral/telemetry/compare/1.5.2...1.6.0)
818

19+
> 20 August 2025
20+
21+
- Resolve coverity issues and optimize DeltaInmmapSearch [`#151`](https://github.com/rdkcentral/telemetry/pull/151)
922
- Resolve build errors in XE2-V2 builds [`#145`](https://github.com/rdkcentral/telemetry/pull/145)
1023
- RDKB-60894 : crash with strnstr and memcmp_eq in T2 [`#144`](https://github.com/rdkcentral/telemetry/pull/144)
1124
- RDK-57625: [RDK-E] Increase L2 Test Coverage For Telemetry [`#128`](https://github.com/rdkcentral/telemetry/pull/128)
12-
- RDK-58420: crash [`#141`](https://github.com/rdkcentral/telemetry/pull/141)
25+
- Topic/memcmp crash [`#141`](https://github.com/rdkcentral/telemetry/pull/141)
1326
- RDK-58420: Implement Log rotation logic for grep markers [`#135`](https://github.com/rdkcentral/telemetry/pull/135)
14-
- RDK-58420: Optimize dca sub-module for log data scrapping [`f68badc`](https://github.com/rdkcentral/telemetry/commit/f68badc055ce35ba80c23a23e56d32eb766fd6b0)
27+
- Resolve crash issues [`f68badc`](https://github.com/rdkcentral/telemetry/commit/f68badc055ce35ba80c23a23e56d32eb766fd6b0)
1528
- Update dca.c with temporary file approach [`9fc4930`](https://github.com/rdkcentral/telemetry/commit/9fc49306c65d51e21c471c36874270d7cf423faa)
1629
- Update dca.c to resolve memcmp_crash [`34f7a90`](https://github.com/rdkcentral/telemetry/commit/34f7a90e84aad97ab43af5021c0e466c65e240f2)
1730

source/protocol/http/curlinterface.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -515,13 +515,14 @@ T2ERROR sendReportOverHTTP(char *httpUrl, char *payload, pid_t* outForkedPid)
515515
if(curl_code != CURLE_OK || http_code != 200)
516516
{
517517
#ifdef LIBRDKCERTSEL_BUILD
518-
T2Info("%s: Using xpki Certs connection certname: %s\n", __func__, pCertFile);
518+
T2Error("%s: Failed to establish connection using xPKI certificate: %s, curl failed: %d\n", __func__, pCertFile, curl_code);
519519
#endif
520520
fprintf(stderr, "curl failed: %s\n", curl_easy_strerror(curl_code));
521521
childCurlResponse.lineNumber = __LINE__;
522522
}
523523
else
524524
{
525+
T2Info("%s: Using xpki Certs connection certname: %s\n", __func__, pCertFile);
525526
childCurlResponse.lineNumber = __LINE__;
526527
}
527528
childCurlResponse.curlResponse = curl_code;

source/xconf-client/xconfclient.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -792,9 +792,12 @@ T2ERROR doHttpGet(char* httpsUrl, char **data)
792792
curl_code = curl_easy_perform(curl);
793793
#ifdef LIBRDKCERTSEL_BUILD
794794
if(curl_code != CURLE_OK)
795+
{
796+
T2Error("%s: Failed to establish connection using xPKI certificate: %s, Curl failed : %d\n", __func__, pCertFile, curl_code);
797+
}
798+
else
795799
{
796800
T2Info("%s: Using xpki Certs connection certname : %s \n", __FUNCTION__, pCertFile);
797-
T2Error("Curl failed : %d \n", curl_code);
798801
}
799802
}
800803
}

0 commit comments

Comments
 (0)