github/chiaki
1
0
Fork 0
mirror of https://git.sr.ht/~thestr4ng3r/chiaki synced 2025-08-19 13:09:39 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

More Parsing

Browse source
This commit is contained in:
Florian Märkl 2019-03-31 21:57:51 +02:00
commit 52cc926426
No known key found for this signature in database
GPG key ID: 125BC8A5A6A1E857
1 changed files with 29 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

35
lib/src/takion.c
View file

@ -651,24 +651,30 @@ typedef struct takion_av_packet_t
{ {
uint16_t packet_index; uint16_t packet_index;
uint16_t frame_index; uint16_t frame_index;
bool byte_at_0x1a;
bool is_2; bool is_2;
uint16_t word_at_0xa; uint16_t word_at_0xa;
uint16_t word_at_0xc; uint16_t word_at_0xc;
uint16_t word_at_0xe; uint16_t word_at_0xe;
uint32_t dword_at_0x10; uint32_t dword_at_0x10;
uint16_t word_at_0x18;
uint8_t byte_at_0x22;
uint8_t byte_at_0x2c;
} TakionAVPacket; } TakionAVPacket;
static void takion_handle_packet_av(ChiakiTakion *takion, uint8_t base_type, uint8_t *buf, size_t buf_size) static void takion_handle_packet_av(ChiakiTakion *takion, uint8_t base_type, uint8_t *buf, size_t buf_size)
{ {
// HHIxIIx // HHIxIIx
assert(base_type == 2 || base_type == 3); assert(base_type == 2 || base_type == 3); // TODO: should actually be base_type & 0xf
size_t av_size = buf_size-1; size_t av_size = buf_size-1;
TakionAVPacket packet; TakionAVPacket packet = {0};
packet.is_2 = base_type == 2; packet.is_2 = base_type == 2;
packet.byte_at_0x1a = ((base_type >> 4) & 1) != 0; // TODO: pass actual base_type, not just 2 and 3
size_t av_header_size = packet.is_2 ? AV_HEADER_SIZE_2 : AV_HEADER_SIZE_3; size_t av_header_size = packet.is_2 ? AV_HEADER_SIZE_2 : AV_HEADER_SIZE_3;
if(av_size < av_header_size + 1) // TODO: compare av_size or buf_size? if(av_size < av_header_size + 1) // TODO: compare av_size or buf_size?
{ {
@ -732,11 +738,28 @@ static void takion_handle_packet_av(ChiakiTakion *takion, uint8_t base_type, uin
CHIAKI_LOGD(takion->log, "Takion packet MAC correct for key pos %#lx\n", key_pos); CHIAKI_LOGD(takion->log, "Takion packet MAC correct for key pos %#lx\n", key_pos);
} }
//CHIAKI_LOGD(takion->log, "packet index %u, frame index %u\n", packet_index, frame_index); av += 0x12;
//chiaki_log_hexdump(takion->log, CHIAKI_LOG_DEBUG, buf, buf_size); av_size -= 12;
uint8_t *data = av + av_header_size; if(packet.is_2)
size_t data_size = av_size - av_header_size; {
packet.word_at_0x18 = ntohs(*((uint16_t *)(av + 0)));
packet.byte_at_0x22 = av[2] >> 5;
av += 3;
av_size -= 3;
}
// TODO: parsing for packet.byte_at_0x1a
if(packet.is_2)
{
packet.byte_at_0x2c = av[0];
av += 2;
av_size -= 2;
}
uint8_t *data = av;
size_t data_size = av_size;
if(takion->av_cb) if(takion->av_cb)
takion->av_cb(data, data_size, base_type, key_pos, takion->av_cb_user); takion->av_cb(data, data_size, base_type, key_pos, takion->av_cb_user);