gfwleak/tango-tfe
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

after log error, reset errno

Browse Source
This commit is contained in:
luwenpeng
2020-07-30 15:57:34 +08:00
parent 7e2f36d416
commit 13289d5a71
10 changed files with 103 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
platform/src/key_keeper.cpp
View File

@@ -486,6 +486,8 @@ static int health_check(struct key_keeper *keeper)
if (sockfd == -1)
{
TFE_LOG_ERROR(keeper->logger, "CertStore health check thread fail to create socket(), %s", strerror(errno));
/* after log, reset errno */
errno = 0;
goto error;
}
memset(&addr, 0, sizeof(addr));
@@ -495,16 +497,22 @@ static int health_check(struct key_keeper *keeper)
if (connect(sockfd, (const struct sockaddr *)&addr, sizeof(addr)) == -1)
{
TFE_LOG_ERROR(keeper->logger, "CertStore health check thread fail to connect(), %s", strerror(errno));
/* after log, reset errno */
errno = 0;
goto error;
}
if (write(sockfd, req_buff, strlen(req_buff)) == -1)
{
TFE_LOG_ERROR(keeper->logger, "CertStore health check thread fail to write(), %s", strerror(errno));
/* after log, reset errno */
errno = 0;
goto error;
}
if (read(sockfd, rsp_buff, sizeof(rsp_buff)) == -1)
{
TFE_LOG_ERROR(keeper->logger, "CertStore health check thread fail to read(), %s", strerror(errno));
/* after log, reset errno */
errno = 0;
goto error;
}
close(sockfd);
@@ -606,6 +614,8 @@ struct key_keeper* key_keeper_init(const char * profile, const char* section, vo
if (unlikely(ret < 0))
{
TFE_LOG_ERROR(keeper->logger, "Failed at creating certstore health check thread: %s", strerror(errno));
/* after log, reset errno */
errno = 0;
goto error_out;
}
}