github.com/UtilitechAS.amsreader-firmware
1
0
Fork 0
mirror of https://github.com/UtilitechAS/amsreader-firmware.git synced 2026-01-15 16:25:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed code that modified original byte stream

Browse Source
This commit is contained in:
Gunnar Skjold 2022-05-14 10:59:48 +02:00
parent fab637cf60
commit f01fbfca53
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/GBTAssembler.cpp
View File

@ -19,22 +19,20 @@ void GBTAssembler::init(const uint8_t* d, HDLCContext* context) {
int GBTAssembler::append(HDLCContext* context, const uint8_t* d, int length, Print* debugger) {
GBTHeader* h = (GBTHeader*) (d+context->apduStart);
h->sequence = ntohs(h->sequence);
h->sequenceAck = ntohs(h->sequenceAck);
uint16_t sequence = ntohs(h->sequence);
//debugger->printf("F: %02X, C: %02X, S: %d, A: %d, L: %d, X: %d\n", h->flag, h->control, h->sequence, h->sequenceAck, h->size, lastSequenceNumber);
if(h->flag != 0xE0) return -9;
if(h->sequence == 1) {
if(sequence == 1) {
init(d, context);
} else if(lastSequenceNumber != h->sequence-1) {
} else if(lastSequenceNumber != sequence-1) {
return -1;
}
uint8_t* ptr = (uint8_t*) &h[1];
memcpy(buf + pos, ptr, h->size);
pos += h->size;
lastSequenceNumber = h->sequence;
lastSequenceNumber = sequence;
return 0;
}