D4
/
d4-core
mirror of https://github.com/D4-project/d4-core
2
0
Fork 0
Code Issues Releases Wiki Activity

chg: [client] Fixed memory aligment artefacts

pull/23/head
Gerard Wagener 2018-12-20 10:56:13 +01:00
parent 48fc60edeb
commit d413cc68dc
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
client/d4.c
View File

@ -181,6 +181,7 @@ void d4_update_header(d4_t* d4, ssize_t nread) {
void d4_transfert(d4_t* d4) void d4_transfert(d4_t* d4)
{ {
ssize_t nread; ssize_t nread;
ssize_t n;
char* buf; char* buf;
unsigned char* hmac; unsigned char* hmac;
@ -204,8 +205,18 @@ void d4_transfert(d4_t* d4)
hmac_sha256_final(d4->ctx, hmac, SZHMAC); hmac_sha256_final(d4->ctx, hmac, SZHMAC);
//Add it to the header //Add it to the header
memcpy(d4->header.hmac, hmac, SZHMAC); memcpy(d4->header.hmac, hmac, SZHMAC);
write(d4->destination.fd, &d4->header, sizeof(d4->header)); n = 0;
write(d4->destination.fd,buf,nread); n+=write(d4->destination.fd, &d4->header.version, sizeof(uint8_t));
n+=write(d4->destination.fd, &d4->header.type, sizeof(uint8_t));
n+=write(d4->destination.fd, &d4->header.uuid, SZUUID);
n+=write(d4->destination.fd, &d4->header.timestamp, sizeof(uint64_t));
n+=write(d4->destination.fd, &d4->header.hmac, SZHMAC);
n+=write(d4->destination.fd, &d4->header.size, sizeof(uint32_t));
n+=write(d4->destination.fd,buf,nread);
if (n != SZD4HDR + nread) {
fprintf(stderr,"Incomplete header written. abort to let consumer known that the packet is corrupted\n");
abort();
}
} else{ } else{
//FIXME no data available, sleep, abort, retry //FIXME no data available, sleep, abort, retry
break; break;

1
client/d4.h
View File

@ -14,6 +14,7 @@
#define MAXSNAPLEN 65535 #define MAXSNAPLEN 65535
#define SZUUID 16 #define SZUUID 16
#define SZUUID_TEXT 37 #define SZUUID_TEXT 37
#define SZD4HDR 62
#define INSERT_ERROR(...) do { \ #define INSERT_ERROR(...) do { \
if (d4->err_idx < NERRORS) \ if (d4->err_idx < NERRORS) \
snprintf(d4->errors[d4->err_idx],SZERRVALUE,__VA_ARGS__); \ snprintf(d4->errors[d4->err_idx],SZERRVALUE,__VA_ARGS__); \