soutade/libgourou
3
6
Fork 4
Code Issues 1 Pull Requests Packages Releases 4 Activity

Change log levels names to avoid collisions

Browse Source
This commit is contained in:
Grégory Soutadé 2022-08-07 16:44:14 +02:00
parent 3c73b8ccb3
commit 33bb983283
4 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/libgourou_common.h
View File

@ -140,7 +140,7 @@ namespace gourou
std::stringstream msg; std::stringstream msg;
msg << "Exception code : 0x" << std::setbase(16) << code << std::endl; msg << "Exception code : 0x" << std::setbase(16) << code << std::endl;
msg << "Message : " << message << std::endl; msg << "Message : " << message << std::endl;
if (logLevel >= DEBUG) if (logLevel >= LG_LOG_DEBUG)
msg << "File : " << file << ":" << std::setbase(10) << line << std::endl; msg << "File : " << file << ":" << std::setbase(10) << line << std::endl;
fullmessage = strdup(msg.str().c_str()); fullmessage = strdup(msg.str().c_str());
} }

12
include/libgourou_log.h
View File

@ -24,16 +24,16 @@
namespace gourou { namespace gourou {
enum GOUROU_LOG_LEVEL { enum GOUROU_LOG_LEVEL {
ERROR, LG_LOG_ERROR,
WARN, LG_LOG_WARN,
INFO, LG_LOG_INFO,
DEBUG, LG_LOG_DEBUG,
TRACE LG_LOG_TRACE
}; };
extern GOUROU_LOG_LEVEL logLevel; extern GOUROU_LOG_LEVEL logLevel;
#define GOUROU_LOG(__lvl, __msg) if (__lvl <= gourou::logLevel) {std::cout << __msg << std::endl << std::flush;} #define GOUROU_LOG(__lvl, __msg) if (gourou::LG_LOG_##__lvl <= gourou::logLevel) {std::cout << __msg << std::endl << std::flush;}
#define GOUROU_LOG_FUNC() GOUROU_LOG(TRACE, __FUNCTION__ << "() @ " << __FILE__ << ":" << __LINE__) #define GOUROU_LOG_FUNC() GOUROU_LOG(TRACE, __FUNCTION__ << "() @ " << __FILE__ << ":" << __LINE__)
/** /**

14
src/libgourou.cpp
View File

@ -37,7 +37,7 @@
namespace gourou namespace gourou
{ {
GOUROU_LOG_LEVEL logLevel = WARN; GOUROU_LOG_LEVEL logLevel = LG_LOG_WARN;
const std::string DRMProcessor::VERSION = LIBGOUROU_VERSION; const std::string DRMProcessor::VERSION = LIBGOUROU_VERSION;
DRMProcessor::DRMProcessor(DRMProcessorClient* client):client(client), device(0), user(0) DRMProcessor::DRMProcessor(DRMProcessorClient* client):client(client), device(0), user(0)
@ -89,7 +89,7 @@ namespace gourou
uint16_t nlength = htons(length); uint16_t nlength = htons(length);
char c; char c;
if (logLevel >= TRACE) if (logLevel >= LG_LOG_TRACE)
printf("%02x %02x ", ((uint8_t*)&nlength)[0], ((uint8_t*)&nlength)[1]); printf("%02x %02x ", ((uint8_t*)&nlength)[0], ((uint8_t*)&nlength)[1]);
client->digestUpdate(sha_ctx, (unsigned char*)&nlength, sizeof(nlength)); client->digestUpdate(sha_ctx, (unsigned char*)&nlength, sizeof(nlength));
@ -98,17 +98,17 @@ namespace gourou
{ {
c = string[i]; c = string[i];
client->digestUpdate(sha_ctx, (unsigned char*)&c, 1); client->digestUpdate(sha_ctx, (unsigned char*)&c, 1);
if (logLevel >= TRACE) if (logLevel >= LG_LOG_TRACE)
printf("%c", c); printf("%c", c);
} }
if (logLevel >= TRACE) if (logLevel >= LG_LOG_TRACE)
printf("\n"); printf("\n");
} }
void DRMProcessor::pushTag(void* sha_ctx, uint8_t tag) void DRMProcessor::pushTag(void* sha_ctx, uint8_t tag)
{ {
client->digestUpdate(sha_ctx, &tag, sizeof(tag)); client->digestUpdate(sha_ctx, &tag, sizeof(tag));
if (logLevel >= TRACE) if (logLevel >= LG_LOG_TRACE)
printf("%02x ", tag); printf("%02x ", tag);
} }
@ -226,7 +226,7 @@ namespace gourou
client->digestFinalize(sha_ctx, sha_out); client->digestFinalize(sha_ctx, sha_out);
if (logLevel >= DEBUG) if (logLevel >= LG_LOG_DEBUG)
{ {
printf("\nSHA OUT : "); printf("\nSHA OUT : ");
for(int i=0; i<(int)SHA1_LEN; i++) for(int i=0; i<(int)SHA1_LEN; i++)
@ -252,7 +252,7 @@ namespace gourou
client->RSAPrivateEncrypt(privateRSAKey.data(), privateRSAKey.length(), client->RSAPrivateEncrypt(privateRSAKey.data(), privateRSAKey.length(),
RSAInterface::RSA_KEY_PKCS12, deviceKey.toBase64().data(), RSAInterface::RSA_KEY_PKCS12, deviceKey.toBase64().data(),
sha_out, sizeof(sha_out), res); sha_out, sizeof(sha_out), res);
if (logLevel >= DEBUG) if (logLevel >= LG_LOG_DEBUG)
{ {
printf("Sig : "); printf("Sig : ");
for(int i=0; i<(int)sizeof(res); i++) for(int i=0; i<(int)sizeof(res); i++)

24
utils/drmprocessorclientimpl.cpp
View File

@ -124,7 +124,7 @@ static int downloadProgress(void *clientp, curl_off_t dltotal, curl_off_t dlnow,
curl_off_t ultotal, curl_off_t ulnow) curl_off_t ultotal, curl_off_t ulnow)
{ {
// For "big" files only // For "big" files only
if (dltotal >= DISPLAY_THRESHOLD && gourou::logLevel >= gourou::WARN) if (dltotal >= DISPLAY_THRESHOLD && gourou::logLevel >= gourou::LG_LOG_WARN)
{ {
int percent = 0; int percent = 0;
if (dltotal) if (dltotal)
@ -174,7 +174,7 @@ static size_t curlHeaders(char *buffer, size_t size, size_t nitems, void *userda
(*responseHeaders)[key] = value; (*responseHeaders)[key] = value;
if (gourou::logLevel >= gourou::DEBUG) if (gourou::logLevel >= gourou::LG_LOG_DEBUG)
std::cout << key << " : " << value << std::endl; std::cout << key << " : " << value << std::endl;
} }
@ -189,10 +189,10 @@ std::string DRMProcessorClientImpl::sendHTTPRequest(const std::string& URL, cons
if (!responseHeaders) if (!responseHeaders)
responseHeaders = &localHeaders; responseHeaders = &localHeaders;
GOUROU_LOG(gourou::INFO, "Send request to " << URL); GOUROU_LOG(INFO, "Send request to " << URL);
if (POSTData.size()) if (POSTData.size())
{ {
GOUROU_LOG(gourou::DEBUG, "<<< " << std::endl << POSTData); GOUROU_LOG(DEBUG, "<<< " << std::endl << POSTData);
} }
unsigned prevDownloadedBytes; unsigned prevDownloadedBytes;
@ -202,11 +202,11 @@ std::string DRMProcessorClientImpl::sendHTTPRequest(const std::string& URL, cons
struct stat _stat; struct stat _stat;
if (!fstat(fd, &_stat)) if (!fstat(fd, &_stat))
{ {
GOUROU_LOG(gourou::WARN, "Resume download @ " << _stat.st_size << " bytes"); GOUROU_LOG(WARN, "Resume download @ " << _stat.st_size << " bytes");
downloadedBytes = _stat.st_size; downloadedBytes = _stat.st_size;
} }
else else
GOUROU_LOG(gourou::WARN, "Want to resume, but fstat failed"); GOUROU_LOG(WARN, "Want to resume, but fstat failed");
} }
CURL *curl = curl_easy_init(); CURL *curl = curl_easy_init();
@ -262,7 +262,7 @@ std::string DRMProcessorClientImpl::sendHTTPRequest(const std::string& URL, cons
// Connexion failed, wait & retry // Connexion failed, wait & retry
if (res == CURLE_COULDNT_CONNECT) if (res == CURLE_COULDNT_CONNECT)
{ {
GOUROU_LOG(gourou::WARN, "\nConnection failed, attempt " << (i+1) << "/" << HTTP_REQ_MAX_RETRY); GOUROU_LOG(WARN, "\nConnection failed, attempt " << (i+1) << "/" << HTTP_REQ_MAX_RETRY);
} }
// Transfer failed but some data has been received // Transfer failed but some data has been received
// --> try again without incrementing tries // --> try again without incrementing tries
@ -270,11 +270,11 @@ std::string DRMProcessorClientImpl::sendHTTPRequest(const std::string& URL, cons
{ {
if (prevDownloadedBytes != downloadedBytes) if (prevDownloadedBytes != downloadedBytes)
{ {
GOUROU_LOG(gourou::WARN, "\nConnection broken, but data received, try again"); GOUROU_LOG(WARN, "\nConnection broken, but data received, try again");
i--; i--;
} }
else else
GOUROU_LOG(gourou::WARN, "\nConnection broken and no data received, attempt " << (i+1) << "/" << HTTP_REQ_MAX_RETRY); GOUROU_LOG(WARN, "\nConnection broken and no data received, attempt " << (i+1) << "/" << HTTP_REQ_MAX_RETRY);
} }
// Other error --> fail // Other error --> fail
else else
@ -291,12 +291,12 @@ std::string DRMProcessorClientImpl::sendHTTPRequest(const std::string& URL, cons
EXCEPTION(gourou::CLIENT_NETWORK_ERROR, "Error " << curl_easy_strerror(res)); EXCEPTION(gourou::CLIENT_NETWORK_ERROR, "Error " << curl_easy_strerror(res));
if ((downloadedBytes >= DISPLAY_THRESHOLD || replyData.size() >= DISPLAY_THRESHOLD) && if ((downloadedBytes >= DISPLAY_THRESHOLD || replyData.size() >= DISPLAY_THRESHOLD) &&
gourou::logLevel >= gourou::WARN) gourou::logLevel >= gourou::LG_LOG_WARN)
std::cout << std::endl; std::cout << std::endl;
if ((*responseHeaders)["Content-Type"] == "application/vnd.adobe.adept+xml") if ((*responseHeaders)["Content-Type"] == "application/vnd.adobe.adept+xml")
{ {
GOUROU_LOG(gourou::DEBUG, ">>> " << std::endl << replyData.data()); GOUROU_LOG(DEBUG, ">>> " << std::endl << replyData.data());
} }
return std::string((char*)replyData.data(), replyData.length()); return std::string((char*)replyData.data(), replyData.length());
@ -360,7 +360,7 @@ void DRMProcessorClientImpl::RSAPrivateDecrypt(const unsigned char* RSAKey, unsi
if (ret < 0) if (ret < 0)
EXCEPTION(gourou::CLIENT_RSA_ERROR, ERR_error_string(ERR_get_error(), NULL)); EXCEPTION(gourou::CLIENT_RSA_ERROR, ERR_error_string(ERR_get_error(), NULL));
if (gourou::logLevel >= gourou::DEBUG) if (gourou::logLevel >= gourou::LG_LOG_DEBUG)
{ {
printf("Decrypted : "); printf("Decrypted : ");
for(int i=0; i<ret; i++) for(int i=0; i<ret; i++)