ipa-firmware: Remove the part_length from the struct sdp_firmware
* The length of the table is not at a fixed position. We will need
to read the offset, seek there, read the data, convert it to the
host endianes.
* Prepare the code to work with offsets of 0...
diff --git a/openbsc/src/ipaccess/ipaccess-firmware.c b/openbsc/src/ipaccess/ipaccess-firmware.c
index 4975b88..ea30ec5 100644
--- a/openbsc/src/ipaccess/ipaccess-firmware.c
+++ b/openbsc/src/ipaccess/ipaccess-firmware.c
@@ -31,7 +31,7 @@
#define PART_LENGTH 138
static_assert(sizeof(struct sdp_header_entry) == 138, right_entry);
-static_assert(sizeof(struct sdp_firmware) == 160, _right_header_length);
+static_assert(sizeof(struct sdp_firmware) == 158, _right_header_length);
/* more magic, the second "int" in the header */
static char more_magic[] = { 0x10, 0x02 };
@@ -42,6 +42,9 @@
struct sdp_header *header;
char buf[4096];
int rc, i;
+ u_int16_t table_size;
+ u_int16_t table_offset;
+
rc = read(fd, buf, sizeof(*firmware_header));
if (rc < 0) {
@@ -80,17 +83,29 @@
return -1;
}
+ table_offset = ntohs(firmware_header->table_offset);
+ if (lseek(fd, table_offset, SEEK_CUR) == -1) {
+ fprintf(stderr, "Failed to seek to the rel position: 0x%x\n", table_offset);
+ return -1;
+ }
- if (ntohs(firmware_header->part_length) % PART_LENGTH != 0) {
- fprintf(stderr, "The part length seems to be wrong.\n");
+ if (read(fd, &table_size, sizeof(table_size)) != sizeof(table_size)) {
+ fprintf(stderr, "The table size could not be read.\n");
+ return -1;
+ }
+
+ table_size = ntohs(table_size);
+
+ if (table_size % PART_LENGTH != 0) {
+ fprintf(stderr, "The part length seems to be wrong: 0x%x\n", table_size);
return -1;
}
/* look into each firmware now */
- for (i = 0; i < ntohs(firmware_header->part_length) / PART_LENGTH; ++i) {
+ for (i = 0; i < table_size / PART_LENGTH; ++i) {
struct sdp_header_entry entry;
struct sdp_header_item *header_entry;
- unsigned int offset = base_offset + sizeof(struct sdp_firmware);
+ unsigned int offset = base_offset + sizeof(struct sdp_firmware) + 2;
offset += i * 138;
if (lseek(fd, offset, SEEK_SET) != offset) {