detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-18 15:57:13 +02:00
Code Issues Actions Packages Releases Activity

wip

Browse Source
This commit is contained in:
maliakal_d
2021-09-10 17:23:06 +02:00
parent bf6650115c
commit 9cb352dec7
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
slsDetectorServers/slsDetectorServer/include/common.h
View File

@ -38,4 +38,4 @@ int verifyChecksumFromBuffer(char *mess, char *clientChecksum, char *buffer,
int verifyChecksumFromFile(char *mess, char *clientChecksum, char *fname); int verifyChecksumFromFile(char *mess, char *clientChecksum, char *fname);
int verifyChecksumFromFlash(char *mess, char *clientChecksum, char *fname, int verifyChecksumFromFlash(char *mess, char *clientChecksum, char *fname,
ssize_t fsize); ssize_t fsize);
int verifyChecksum(char *mess, char *clientChecksum, MD5_CTX *c); int verifyChecksum(char *mess, char *clientChecksum, MD5_CTX *c, char *msg);

10
slsDetectorServers/slsDetectorServer/src/common.c
View File

@ -272,7 +272,7 @@ int verifyChecksumFromFlash(char *mess, char *clientChecksum, char *fname,
int oldProgress = 0; int oldProgress = 0;
while (bytes > 0) { while (bytes > 0) {
LOG(logINFO, ("bytes:%d\n", bytes));
int progress = (int)(((double)(totalBytesRead) / fsize) * 100); int progress = (int)(((double)(totalBytesRead) / fsize) * 100);
if (oldProgress != progress) { if (oldProgress != progress) {
printf("%d%%\r", progress); printf("%d%%\r", progress);
@ -327,10 +327,10 @@ int verifyChecksumFromFlash(char *mess, char *clientChecksum, char *fname,
LOG(logINFO, ("\tRead %lu bytes to calculate checksum\n", totalBytesRead)); LOG(logINFO, ("\tRead %lu bytes to calculate checksum\n", totalBytesRead));
fclose(fp); fclose(fp);
fclose(flashfp); fclose(flashfp);
return verifyChecksum(mess, clientChecksum, &c); return verifyChecksum(mess, clientChecksum, &c, "flash");
} }
int verifyChecksum(char *mess, char *clientChecksum, MD5_CTX *c) { int verifyChecksum(char *mess, char *clientChecksum, MD5_CTX *c, char *msg) {
unsigned char out[MD5_DIGEST_LENGTH]; unsigned char out[MD5_DIGEST_LENGTH];
if (!MD5_Final(out, c)) { if (!MD5_Final(out, c)) {
strcpy(mess, "Unable to calculate checksum (MD5_Final)\n"); strcpy(mess, "Unable to calculate checksum (MD5_Final)\n");
@ -353,9 +353,9 @@ int verifyChecksum(char *mess, char *clientChecksum, MD5_CTX *c) {
// compare checksum // compare checksum
if (strcmp(clientChecksum, checksum)) { if (strcmp(clientChecksum, checksum)) {
sprintf(mess, sprintf(mess,
"Checksum of copied fpga program does not match. Client " "Checksum of %s does not match. Client "
"checksum:%s, copied checksum:%s\n", "checksum:%s, copied checksum:%s\n",
clientChecksum, checksum); msg, clientChecksum, checksum);
LOG(logERROR, (mess)); LOG(logERROR, (mess));
return FAIL; return FAIL;
} }