Changeset 280 for ap51-flash

Timestamp:

12/01/11 07:54:33 (6 months ago)

Author:

marek

Message:

ap51-flash: update CE image parser to support OpenWrt? CE format v1

Signed-off-by: Marek Lindner <lindner_marek@…>

Location:

ap51-flash/trunk

Files:

• router_images.c (modified) (10 diffs)
• types.h (modified) (2 diffs)

ap51-flash/trunk/router_images.c

@@ -23 +23 @@
 #include <errno.h>
 #include <unistd.h>
+#include <ctype.h>
 
 #include "types.h"
@@ -122 +123 @@
 
 static int uboot_verify(struct router_image *router_image, char *buff,
-                        int buff_len, int size)
+                        unsigned int buff_len, int size)
 {
         int ret;
@@ -174 +175 @@
 
 static int ubnt_verify(struct router_image *router_image, char *buff,
-                       int buff_len, int size)
+                       unsigned int buff_len, int size)
 {
         if (buff_len < 4)
@@ -220 +221 @@
 
 static int ci_verify(struct router_image *router_image, char *buff,
-                     int buff_len, int size)
+                     unsigned int buff_len, int size)
 {
         unsigned int kernel_size, rootfs_size;
@@ -284 +285 @@
 
 static int ce_verify_om2p(struct router_image *router_image, char *buff,
-                          int buff_len, int size)
-{
-        char name_buff[21];
+                          unsigned int buff_len, int size)
+{
+        char name_buff[33], md5_buff[33];
         unsigned int num_files, hdr_offset, file_offset, file_size;
+        unsigned int ce_version = 0, hdr_offset_sec;
         int ret;
 
-        hdr_offset = 14;
         file_offset = 64 * 1024;
 
@@ -300 +301 @@
                 return 0;
 
-        ret = sscanf(buff, "CE%10s%02x", name_buff, &num_files);
-        if (ret != 2)
-                return 0;
-
-        if (strstr(name_buff, "OM2P") == NULL)
-                return 0;
-
-        while (num_files > 0) {
-                ret = sscanf(buff + hdr_offset, "%20s%08x", name_buff, &file_size);
+        /* the old format does not have a version field */
+        if (isxdigit(buff[2]) && isxdigit(buff[3])) {
+                ret = sscanf(buff, "CE%02x", &ce_version);
+                if (ret != 1)
+                        return 0;
+        }
+
+        switch (ce_version) {
+        case 0:
+                ret = sscanf(buff, "CE%10s%02x", name_buff, &num_files);
                 if (ret != 2)
                         return 0;
+
+                hdr_offset = 14;
+                hdr_offset_sec = 28;
+                break;
+        case 1:
+                ret = sscanf(buff, "CE%*02x%32s%02x", name_buff, &num_files);
+                if (ret != 2)
+                        return 0;
+
+                hdr_offset = 38;
+                hdr_offset_sec = 72;
+                break;
+        default:
+                /* unsupported version */
+                return 0;
+        }
+
+        if (strstr(name_buff, "OM2P") == NULL)
+                return 0;
+
+        while (num_files > 0) {
+                if (hdr_offset + hdr_offset_sec > buff_len) {
+                        fprintf(stderr, "Error - buffer too small to parse CE header\n");
+                        return 0;
+                }
+
+                switch (ce_version) {
+                case 0:
+                        ret = sscanf(buff + hdr_offset, "%20s%08x", name_buff, &file_size);
+                        if (ret != 2)
+                                return 0;
+
+                        break;
+                case 1:
+                        ret = sscanf(buff + hdr_offset, "%32s%08x%32s", name_buff, &file_size, md5_buff);
+                        if (ret != 3)
+                                return 0;
+
+                        break;
+                }
 
                 ret = router_image_add_file(router_image, name_buff, file_size, file_size, file_offset);
@@ -317 +359 @@
 
                 file_offset += file_size;
-                hdr_offset += 28;
+                hdr_offset += hdr_offset_sec;
                 num_files--;
         }
@@ -421 +463 @@
 {
         struct router_image **router_image;
-        char file_buff[100], found_consumer = 0;
+        char *file_buff = NULL, found_consumer = 0;
+        unsigned int file_buff_size = 300;
         int fd, file_size, ret = -1, len;
+
+        file_buff = malloc(file_buff_size);
+        if (!file_buff_size)
+                goto out;
 
         fd = open(image_path, O_RDONLY | O_BINARY);
@@ -430 +477 @@
         }
 
-        ret = read(fd, file_buff, sizeof(file_buff));
+        ret = read(fd, file_buff, file_buff_size);
         if (ret < 0) {
                 fprintf(stderr, "Error - can't read image file '%s': %s\n", image_path, strerror(errno));
@@ -468 +515 @@
         close(fd);
 out:
+        free(file_buff);
         return ret;
 }

ap51-flash/trunk/types.h

@@ -105 +105 @@
 
 struct file_info {
-        char file_name[20];
+        char file_name[33];
         unsigned int file_offset;
         unsigned int file_size;
@@ -114 +114 @@
         char desc[DESC_MAX_LENGTH];
         int (*image_init)(void);
-        int (*image_verify)(struct router_image *router_image, char *buff, int buff_len, int size);
+        int (*image_verify)(struct router_image *router_image, char *buff, unsigned int buff_len, int size);
         char *path;
         char *embedded_img;