diff --git a/internal/decoders/constants.go b/internal/decoders/constants.go deleted file mode 100644 index 63059c9..0000000 --- a/internal/decoders/constants.go +++ /dev/null @@ -1,5 +0,0 @@ -package decoders - -var PACKET_HEADER_SIZE = 16 -var MAX_UDP_PACKET_SIZE = 1500 -var CHUNK_HEADER_SIZE = 4 diff --git a/internal/decoders/data_packet_chunk.go b/internal/decoders/data_packet_chunk.go index d24e097..effc86f 100644 --- a/internal/decoders/data_packet_chunk.go +++ b/internal/decoders/data_packet_chunk.go @@ -22,14 +22,14 @@ func decodeDataPacketChunkData(dataPacketChunk Chunk) DataPacketChunkData { case 0: packet_header := DecodePacketHeaderChunk(dataPacketChunk.ChunkData[offset:]) data.PacketHeader = &packet_header - offset = offset + CHUNK_HEADER_SIZE + offset += 4 if packet_header.Chunk.Header.DataLen > 0 { offset = offset + int(packet_header.Chunk.Header.DataLen) } case 1: tracker_list := DecodeDataTrackerListChunk(dataPacketChunk.ChunkData[offset:]) data.TrackerList = &tracker_list - offset = offset + CHUNK_HEADER_SIZE + offset += 4 if tracker_list.Chunk.Header.DataLen > 0 { offset = offset + int(tracker_list.Chunk.Header.DataLen) } diff --git a/internal/decoders/data_tracker_chunk.go b/internal/decoders/data_tracker_chunk.go index c324287..4a19dbd 100644 --- a/internal/decoders/data_tracker_chunk.go +++ b/internal/decoders/data_tracker_chunk.go @@ -28,49 +28,49 @@ func decodeDataTrackerChunkData(dataTrackerChunk Chunk) DataTrackerChunkData { case 0: pos := DecodeDataTrackerXYZChunk(dataTrackerChunk.ChunkData[offset:]) data.Pos = &pos - offset = offset + CHUNK_HEADER_SIZE + offset += 4 if data.Pos.Chunk.Header.DataLen > 0 { offset = offset + int(data.Pos.Chunk.Header.DataLen) } case 1: speed := DecodeDataTrackerXYZChunk(dataTrackerChunk.ChunkData[offset:]) data.Speed = &speed - offset = offset + CHUNK_HEADER_SIZE + offset += 4 if data.Speed.Chunk.Header.DataLen > 0 { offset = offset + int(data.Speed.Chunk.Header.DataLen) } case 2: ori := DecodeDataTrackerXYZChunk(dataTrackerChunk.ChunkData[offset:]) data.Ori = &ori - offset = offset + CHUNK_HEADER_SIZE + offset += 4 if data.Ori.Chunk.Header.DataLen > 0 { offset = offset + int(data.Ori.Chunk.Header.DataLen) } case 3: status := DecodeDataTrackerStatusChunk(dataTrackerChunk.ChunkData[offset:]) data.Status = &status - offset = offset + CHUNK_HEADER_SIZE + offset += 4 if data.Status.Chunk.Header.DataLen > 0 { offset = offset + int(data.Status.Chunk.Header.DataLen) } case 4: accel := DecodeDataTrackerXYZChunk(dataTrackerChunk.ChunkData[offset:]) data.Accel = &accel - offset = offset + CHUNK_HEADER_SIZE + offset += 4 if data.Accel.Chunk.Header.DataLen > 0 { offset = offset + int(data.Accel.Chunk.Header.DataLen) } case 5: trgtpos := DecodeDataTrackerXYZChunk(dataTrackerChunk.ChunkData[offset:]) data.TrgtPos = &trgtpos - offset = offset + CHUNK_HEADER_SIZE + offset += 4 if data.TrgtPos.Chunk.Header.DataLen > 0 { offset = offset + int(data.TrgtPos.Chunk.Header.DataLen) } case 6: timestamp := DecodeDataTrackerTimestampChunk(dataTrackerChunk.ChunkData[offset:]) data.Timestamp = ×tamp - offset = offset + CHUNK_HEADER_SIZE + offset += 4 if data.Timestamp.Chunk.Header.DataLen > 0 { offset = offset + int(data.Timestamp.Chunk.Header.DataLen) } diff --git a/internal/decoders/data_tracker_list_chunk.go b/internal/decoders/data_tracker_list_chunk.go index 1ab3595..7552c3c 100644 --- a/internal/decoders/data_tracker_list_chunk.go +++ b/internal/decoders/data_tracker_list_chunk.go @@ -10,7 +10,7 @@ func decodeDataTrackerListChunkData(dataTrackerListChunk Chunk) DataTrackerListC offset := 0 for offset < int(dataTrackerListChunk.Header.DataLen) { trackerChunk := DecodeDataTrackerChunk(dataTrackerListChunk.ChunkData[offset:]) - offset += CHUNK_HEADER_SIZE + offset += 4 if trackerChunk.Chunk.Header.DataLen > 0 { offset += int(trackerChunk.Chunk.Header.DataLen) } diff --git a/internal/decoders/info_packet_chunk.go b/internal/decoders/info_packet_chunk.go index 528f8c3..c4359a4 100644 --- a/internal/decoders/info_packet_chunk.go +++ b/internal/decoders/info_packet_chunk.go @@ -23,21 +23,21 @@ func decodeInfoPacketChunkData(infoPacketChunk Chunk) InfoPacketChunkData { case 0: packet_header := DecodePacketHeaderChunk(infoPacketChunk.ChunkData[offset:]) data.PacketHeader = &packet_header - offset = offset + CHUNK_HEADER_SIZE + offset += 4 if packet_header.Chunk.Header.DataLen > 0 { offset = offset + int(packet_header.Chunk.Header.DataLen) } case 1: system_name := DecodeInfoSystemNameChunk(infoPacketChunk.ChunkData[offset:]) data.SystemName = &system_name - offset = offset + CHUNK_HEADER_SIZE + offset += 4 if system_name.Chunk.Header.DataLen > 0 { offset = offset + int(system_name.Chunk.Header.DataLen) } case 2: tracker_list := DecodeInfoTrackerListChunk(infoPacketChunk.ChunkData[offset:]) data.TrackerList = &tracker_list - offset = offset + CHUNK_HEADER_SIZE + offset += 4 if tracker_list.Chunk.Header.DataLen > 0 { offset = offset + int(tracker_list.Chunk.Header.DataLen) } diff --git a/internal/decoders/info_tracker_chunk.go b/internal/decoders/info_tracker_chunk.go index 11feede..ced54b6 100644 --- a/internal/decoders/info_tracker_chunk.go +++ b/internal/decoders/info_tracker_chunk.go @@ -21,7 +21,7 @@ func decodeInfoTrackerChunkData(infoTrackerChunk Chunk) InfoTrackerChunkData { case 0: tracker_name := DecodeInfoTrackerNameChunk(infoTrackerChunk.ChunkData[offset:]) data.TrackerName = &tracker_name - offset = offset + CHUNK_HEADER_SIZE + offset += 4 if tracker_name.Chunk.Header.DataLen > 0 { offset = offset + int(tracker_name.Chunk.Header.DataLen) } diff --git a/internal/decoders/info_tracker_list_chunk.go b/internal/decoders/info_tracker_list_chunk.go index c47cbe2..f65457b 100644 --- a/internal/decoders/info_tracker_list_chunk.go +++ b/internal/decoders/info_tracker_list_chunk.go @@ -10,7 +10,7 @@ func decodeInfoTrackerListChunkData(infoTrackerListChunk Chunk) InfoTrackerListC offset := 0 for offset < int(infoTrackerListChunk.Header.DataLen) { trackerChunk := DecodeInfoTrackerChunk(infoTrackerListChunk.ChunkData[offset:]) - offset += CHUNK_HEADER_SIZE + offset += 4 if trackerChunk.Chunk.Header.DataLen > 0 { offset += int(trackerChunk.Chunk.Header.DataLen) }