Changeset 265

Timestamp:

07/25/11 02:14:25 (10 months ago)

Author:

marek

Message:

ap51-flash: support for OM2P added (using the extended combined image format)

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

Location:

ap51-flash-ng

Files:

• commandline.c (modified) (1 diff)
• flash.c (modified) (3 diffs)
• flash.h (modified) (1 diff)
• proto.c (modified) (7 diffs)
• router_images.c (modified) (10 diffs)
• router_images.h (modified) (2 diffs)
• router_redboot.c (modified) (2 diffs)
• router_tftp_client.c (modified) (4 diffs)
• router_tftp_client.h (modified) (1 diff)
• router_types.c (modified) (1 diff)
• types.h (modified) (3 diffs)

ap51-flash-ng/commandline.c

@@ -71 +71 @@
         argv += 2;
 
+        router_images_init();
+
         while (argc > 0) {
                 ret = router_images_verify_path(argv[0]);

ap51-flash-ng/flash.c

@@ -45 +45 @@
 }
 
-static void node_list_prepend(struct list *list)
-{
-        if (!node_list) {
-                node_list = list;
-                return;
-        }
-
-        list->next = node_list->next;
-        node_list->next = list;
-}
-
 struct node *node_list_get(uint8_t *mac_addr)
 {
@@ -86 +75 @@
         node->image_state.fd = -1;
         list->data = node;
-        node_list_prepend(list);
+        list_prepend(&node_list, list);
         goto out;
 
@@ -142 +131 @@
                                 break;
 
-                        ret = mr500_flash_completed(node);
+                        ret = tftp_client_flash_completed(node);
                         if (ret == 0)
                                 break;

ap51-flash-ng/flash.h

@@ -20 +20 @@
 void our_mac_set(struct node *node);
 int flash(char *iface);
+
+static inline void list_prepend(struct list **list, struct list *list_item)
+{
+        if (!(*list)) {
+                *list = list_item;
+                return;
+        }
+
+        list_item->next = (*list)->next;
+        (*list)->next = list_item;
+}

ap51-flash-ng/proto.c

@@ -161 +161 @@
         switch (ntohs(arphdr->arp_op)) {
         case ARPOP_REQUEST:
-                /* fprintf(stderr, "[%02x:%02x:%02x:%02x:%02x:%02x]: received ARP request\n",
+                /* fprintf(stderr, "[%02x:%02x:%02x:%02x:%02x:%02x]: received ARP request, status: %d\n",
                         node->his_mac_addr[0], node->his_mac_addr[1], node->his_mac_addr[2],
-                        node->his_mac_addr[3], node->his_mac_addr[4], node->his_mac_addr[5]); */
+                        node->his_mac_addr[3], node->his_mac_addr[4], node->his_mac_addr[5],
+                        node->status); */
                 break;
         case ARPOP_REPLY:
-                /* fprintf(stderr, "[%02x:%02x:%02x:%02x:%02x:%02x]: received ARP reply\n",
+                /* fprintf(stderr, "[%02x:%02x:%02x:%02x:%02x:%02x]: received ARP reply, status: %d\n",
                         node->his_mac_addr[0], node->his_mac_addr[1], node->his_mac_addr[2],
-                        node->his_mac_addr[3], node->his_mac_addr[4], node->his_mac_addr[5]); */
+                        node->his_mac_addr[3], node->his_mac_addr[4], node->his_mac_addr[5],
+                        node->status); */
                 break;
         default:
-                /* fprintf(stderr, "ARP, unknown op code: %i\n", ntohs(arphdr->arp_op)); */
+                /* fprintf(stderr, "ARP, unknown op code: %i, status: %d\n", ntohs(arphdr->arp_op), node->status); */
                 return;
         }
@@ -183 +185 @@
                 if (ret == 1)
                         node->status = NODE_STATUS_DETECTED;
-                break;
+                else
+                        break;
         case NODE_STATUS_DETECTED:
         case NODE_STATUS_FLASHING:
@@ -209 +212 @@
 {
         struct udphdr *udphdr;
+        struct file_info *file_info;
         unsigned short opcode, block;
         char *file_name;
@@ -245 +249 @@
                 switch (node->flash_mode) {
                 case FLASH_MODE_REDBOOT:
-                        /* combined image */
-                        if (strcmp(file_name, "kernel") == 0) {
+                case FLASH_MODE_TFTP_CLIENT:
+                        file_info = router_image_get_file(node->router_type->image->file_list, file_name);
+                        if (!file_info) {
+                                fprintf(stderr, "[%02x:%02x:%02x:%02x:%02x:%02x]: %s: tftp client asks for '%s' - file not found ...\n",
+                                        node->his_mac_addr[0], node->his_mac_addr[1], node->his_mac_addr[2],
+                                        node->his_mac_addr[3], node->his_mac_addr[4], node->his_mac_addr[5],
+                                        node->router_type->desc, file_name);
+                                goto out;
+                        }
+
+                        if (node->image_state.fd <= 0) {
                                 ret = router_images_open_path(node);
                                 if (ret < 0)
-                                        return;
+                                        goto out;
                                 node->status = NODE_STATUS_FLASHING;
-
-                                node->image_state.file_size = node->router_type->image->ci_info.kernel_size;
-                                node->image_state.flash_size = node->router_type->image->ci_info.kernel_fsize;
-                                node->image_state.offset = node->router_type->image->ci_info.kernel_offset;
-
-                                fprintf(stderr, "[%02x:%02x:%02x:%02x:%02x:%02x]: %s: tftp client asks for '%s', serving kernel portion of: %s (%i blocks) ...\n",
-                                        node->his_mac_addr[0], node->his_mac_addr[1], node->his_mac_addr[2],
-                                        node->his_mac_addr[3], node->his_mac_addr[4], node->his_mac_addr[5],
-                                        node->router_type->desc, file_name, node->router_type->image->path,
-                                        ((node->image_state.flash_size + TFTP_PAYLOAD_SIZE - 1) / TFTP_PAYLOAD_SIZE));
-                        } else {
-                                node->image_state.file_size = node->router_type->image->ci_info.rootfs_size;
-                                node->image_state.flash_size = node->router_type->image->ci_info.rootfs_fsize;
-                                node->image_state.offset = node->router_type->image->ci_info.rootfs_offset;
-
-                                fprintf(stderr, "[%02x:%02x:%02x:%02x:%02x:%02x]: %s: tftp client asks for '%s', serving rootfs portion of: %s (%i blocks) ...\n",
-                                        node->his_mac_addr[0], node->his_mac_addr[1], node->his_mac_addr[2],
-                                        node->his_mac_addr[3], node->his_mac_addr[4], node->his_mac_addr[5],
-                                        node->router_type->desc, file_name, node->router_type->image->path,
-                                        ((node->image_state.flash_size + TFTP_PAYLOAD_SIZE - 1) / TFTP_PAYLOAD_SIZE));
                         }
-                        break;
-                case FLASH_MODE_TFTP_CLIENT:
-                        fprintf(stderr, "[%02x:%02x:%02x:%02x:%02x:%02x]: %s: tftp client asks for '%s', serving: %s (%i blocks) ...\n",
+
+                        fprintf(stderr, "[%02x:%02x:%02x:%02x:%02x:%02x]: %s: tftp client asks for '%s', serving %s portion of: %s (%i blocks) ...\n",
                                 node->his_mac_addr[0], node->his_mac_addr[1], node->his_mac_addr[2],
                                 node->his_mac_addr[3], node->his_mac_addr[4], node->his_mac_addr[5],
-                                node->router_type->desc, file_name, node->router_type->image->path,
-                                ((node->router_type->image->flash_size + TFTP_PAYLOAD_SIZE - 1) / TFTP_PAYLOAD_SIZE));
+                                node->router_type->desc, file_name,file_info->file_name,
+                                node->router_type->image->path,
+                                ((file_info->file_fsize + TFTP_PAYLOAD_SIZE - 1) / TFTP_PAYLOAD_SIZE));
+
+                        node->image_state.file_size = file_info->file_size;
+                        node->image_state.flash_size = file_info->file_fsize;
+                        node->image_state.offset = file_info->file_offset;
                         break;
                 }
@@ -290 +287 @@
                 if (block == 0) {
                         if (node->flash_mode == FLASH_MODE_TFTP_SERVER) {
-#if defined(DEBUG)
                                 fprintf(stderr, "[%02x:%02x:%02x:%02x:%02x:%02x]: %s: connection to tftp server established - uploading %i blocks ...\n",
                                         node->his_mac_addr[0], node->his_mac_addr[1], node->his_mac_addr[2],
@@ -296 +292 @@
                                         node->router_type->desc,
                                         ((node->router_type->image->flash_size + TFTP_PAYLOAD_SIZE - 1) / TFTP_PAYLOAD_SIZE));
-#endif
-                        }
-
-                        if ((node->flash_mode == FLASH_MODE_TFTP_SERVER) ||
-                            (node->flash_mode == FLASH_MODE_TFTP_CLIENT)) {
+
                                 ret = router_images_open_path(node);
                                 if (ret < 0)
@@ -329 +321 @@
                         /* nothing more to send */
                         if (node->image_state.last_packet_size == 0) {
-                                switch (node->flash_mode) {
-                                case FLASH_MODE_TFTP_SERVER:
-                                case FLASH_MODE_TFTP_CLIENT:
-                                        fprintf(stderr, "[%02x:%02x:%02x:%02x:%02x:%02x]: %s: image successfully transmitted - writing image to flash ...\n",
-                                                node->his_mac_addr[0], node->his_mac_addr[1], node->his_mac_addr[2],
-                                                node->his_mac_addr[3], node->his_mac_addr[4], node->his_mac_addr[5],
-                                                node->router_type->desc);
-                                        router_images_close_path(node);
-                                        mr500_flash_time_set(node);
-                                        node->status = NODE_STATUS_FINISHED;
-                                        break;
+                                node->image_state.total_bytes_sent += node->image_state.bytes_sent;
+
+                                if (node->image_state.total_bytes_sent >= node->router_type->image->file_size) {
+                                        switch (node->flash_mode) {
+                                        case FLASH_MODE_TFTP_SERVER:
+                                        case FLASH_MODE_TFTP_CLIENT:
+                                                fprintf(stderr, "[%02x:%02x:%02x:%02x:%02x:%02x]: %s: image successfully transmitted - writing image to flash ...\n",
+                                                        node->his_mac_addr[0], node->his_mac_addr[1], node->his_mac_addr[2],
+                                                        node->his_mac_addr[3], node->his_mac_addr[4], node->his_mac_addr[5],
+                                                        node->router_type->desc);
+                                                router_images_close_path(node);
+                                                if (node->flash_mode == FLASH_MODE_TFTP_CLIENT)
+                                                        tftp_client_flash_time_set(node);
+                                                node->status = NODE_STATUS_FINISHED;
+                                                break;
+                                        }
                                 }
 

ap51-flash-ng/router_images.c

@@ -18 +18 @@
 
 #include <string.h>
+#include <stdlib.h>
 #include <stdio.h>
 #include <fcntl.h>
@@ -25 +26 @@
 
 #include "types.h"
+#include "flash.h"
 #include "router_images.h"
 #include "compat.h"
@@ -31 +33 @@
 #define TFTP_PAYLOAD_SIZE 512
 
-static int uboot_verify(struct router_image (*router_image)__attribute__((unused)), char *buff, int buff_len)
-{
+struct file_info *router_image_get_file(struct list *file_list, char *file_name)
+{
+        struct list *list;
+        struct file_info *file_info = NULL, *file_info_tmp;
+
+        for (list = file_list; list; list = list->next) {
+                file_info_tmp = (struct file_info *)list->data;
+
+                if (strcmp(file_info_tmp->file_name, file_name) != 0)
+                        continue;
+
+                file_info = file_info_tmp;
+                break;
+        }
+
+        return file_info;
+}
+
+static struct file_info *_router_image_add_file(struct router_image *router_image,
+                                                char *file_name)
+{
+        struct list *list;
+        struct file_info *file_info;
+
+        file_info = router_image_get_file(router_image->file_list, file_name);
+        if (file_info)
+                goto out;
+
+        file_info = malloc(sizeof(struct file_info));
+        if (!file_info)
+                goto out;
+
+        list = malloc(sizeof(struct list));
+        if (!list)
+                goto free_node;
+
+        memset(file_info, 0, sizeof(struct file_info));
+        strcpy(file_info->file_name, file_name);
+        list->data = file_info;
+        list_prepend(&router_image->file_list, list);
+        goto out;
+
+free_node:
+        free(file_info);
+        file_info = NULL;
+out:
+        return file_info;
+}
+
+static int router_image_add_file(struct router_image *router_image, char *file_name,
+                                 int file_size, int file_fsize, int file_offset)
+{
+        struct file_info *file_info;
+
+        file_info = _router_image_add_file(router_image, file_name);
+        if (!file_info)
+                return 1;
+
+        file_info->file_size = file_size;
+        file_info->file_fsize = file_fsize;
+        file_info->file_offset = file_offset;
+        return 0;
+}
+
+static int uboot_verify(struct router_image *router_image, char *buff,
+                        int buff_len, int size)
+{
+        int ret;
+
         if (buff_len < 4)
                 return 0;
@@ -41 +110 @@
                 return 0;
 
+        ret = router_image_add_file(router_image, "mr500.bin", size, size, 0);
+        if (ret)
+                return 0;
+
+        router_image->file_size = size;
         return 1;
 }
 
-static int ubnt_verify(struct router_image (*router_image)__attribute__((unused)), char *buff, int buff_len)
+static int ubnt_verify(struct router_image *router_image, char *buff,
+                       int buff_len, int size)
 {
         if (buff_len < 4)
@@ -54 +129 @@
                 return 0;
 
+        router_image->file_size = size;
         return 1;
 }
 
-static int ci_verify(struct router_image *router_image, char *buff, int buff_len)
+static int ci_verify(struct router_image *router_image, char *buff,
+                     int buff_len, int size)
 {
         unsigned int kernel_size, rootfs_size;
+        int ret;
 
         if (buff_len < 64)
@@ -72 +150 @@
                 return 0;
 
-        router_image->ci_info.kernel_offset = 64 * 1024;
-        router_image->ci_info.kernel_size = kernel_size;
-        router_image->ci_info.kernel_fsize = ((kernel_size + FLASH_PAGE_SIZE - 1) /
-                                                FLASH_PAGE_SIZE) * FLASH_PAGE_SIZE;
-        router_image->ci_info.rootfs_offset = (64 * 1024) + kernel_size;
-        router_image->ci_info.rootfs_size = rootfs_size;
-        router_image->ci_info.rootfs_fsize = ((rootfs_size + FLASH_PAGE_SIZE - 1) /
-                                                FLASH_PAGE_SIZE) * FLASH_PAGE_SIZE;
-
+        ret = router_image_add_file(router_image, "kernel", kernel_size,
+                                    ((kernel_size + FLASH_PAGE_SIZE - 1) / FLASH_PAGE_SIZE) * FLASH_PAGE_SIZE,
+                                    64 * 1024);
+        if (ret)
+                return 0;
+
+        ret = router_image_add_file(router_image, "rootfs", rootfs_size,
+                                    ((rootfs_size + FLASH_PAGE_SIZE - 1) / FLASH_PAGE_SIZE) * FLASH_PAGE_SIZE,
+                                    (64 * 1024) + kernel_size);
+        if (ret)
+                return 0;
+
+        router_image->file_size = size - (64 * 1024);
+        return 1;
+}
+
+static int ce_verify_om2p(struct router_image *router_image, char *buff,
+                          int buff_len, int size)
+{
+        char name_buff[21];
+        unsigned int num_files, hdr_offset, file_offset, file_size;
+        int ret;
+
+        hdr_offset = 14;
+        file_offset = 64 * 1024;
+
+        if (buff_len < 100)
+                return 0;
+
+        /* ext combined image magic header */
+        if ((buff[0] != 'C') || (buff[1] != 'E'))
+                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);
+                if (ret != 2)
+                        return 0;
+
+                ret = router_image_add_file(router_image, name_buff, file_size, file_size, file_offset);
+                if (ret)
+                        return 0;
+
+                file_offset += file_size;
+                hdr_offset += 28;
+                num_files--;
+        }
+
+        router_image->file_size = size - (64 * 1024);
         return 1;
 }
@@ -97 +221 @@
         .desc = "combined image",
         .image_verify = ci_verify,
+};
+
+struct router_image img_ce_om2p = {
+        .desc = "combined ext image (OM2P)",
+        .image_verify = ce_verify_om2p,
 };
 
@@ -103 +232 @@
         &img_ubnt,
         &img_ci,
+        &img_ce_om2p,
         NULL,
 };
+
+void router_images_init(void)
+{
+        struct router_image **router_image;
+
+        for (router_image = router_images; *router_image; ++router_image)
+                (*router_image)->file_list = NULL;
+}
 
 void router_images_print_desc(void)
@@ -117 +255 @@
 {
         struct router_image **router_image;
-        char file_buff[65], found_consumer = 0;
+        char file_buff[100], found_consumer = 0;
         int fd, file_size, ret = -1, len;
 
@@ -143 +281 @@
                 }
 
-                ret = (*router_image)->image_verify((*router_image), file_buff, len);
+                ret = (*router_image)->image_verify((*router_image), file_buff, len, file_size);
                 if (ret != 1)
                         continue;
 
-                (*router_image)->file_size = file_size;
                 (*router_image)->flash_size = (((*router_image)->file_size + FLASH_PAGE_SIZE - 1) /
                                                         FLASH_PAGE_SIZE) * FLASH_PAGE_SIZE;

ap51-flash-ng/router_images.h

@@ -17 +17 @@
  */
 
+struct file_info *router_image_get_file(struct list *file_list, char *file_name);
+void router_images_init(void);
 void router_images_print_desc(void);
 int router_images_verify_path(char *image_path);
@@ -26 +28 @@
 extern struct router_image img_ubnt;
 extern struct router_image img_ci;
+extern struct router_image img_ce_om2p;

ap51-flash-ng/router_redboot.c

@@ -147 +147 @@
 {
         struct redboot_priv *redboot_priv = node->router_priv;
+        struct file_info *file_info;
         char buff[100];
 
@@ -238 +239 @@
                 break;
         case REDBOOT_STATE_LD_ROOTFS:
+                file_info = router_image_get_file(node->router_type->image->file_list, "kernel");
+                if (!file_info)
+                        return;
+
                 sprintf(buff, "fis create -f 0x%08lx -l 0x%08lx rootfs\n",
-                        redboot_priv->redboot_type->flash_addr + node->router_type->image->ci_info.kernel_fsize,
-                        redboot_priv->redboot_type->flash_size - node->router_type->image->ci_info.kernel_fsize);
+                        redboot_priv->redboot_type->flash_addr + file_info->file_fsize,
+                        redboot_priv->redboot_type->flash_size - file_info->file_fsize);
 
                 printf("[%02x:%02x:%02x:%02x:%02x:%02x]: %s: flashing rootfs ...\n",

ap51-flash-ng/router_tftp_client.c

@@ -28 +28 @@
 
 static unsigned int mr500_ip = 3232260872UL; /* 192.168.99.8 */
+static unsigned int om2p_ip = 3232261128UL; /* 192.168.100.8 */
 
 struct mr500_priv {
@@ -33 +34 @@
 };
 
-void mr500_flash_time_set(struct node *node)
+struct om2p_priv {
+        time_t start_flash;
+};
+
+static void tftp_client_detect_post(struct node *node, char *packet_buff, int packet_buff_len)
 {
-        struct mr500_priv *mr500_priv = node->router_priv;
+        struct ether_arp *arphdr;
 
-        if (node->router_type != &mr500)
-                return;
+        if (!len_check(packet_buff_len, sizeof(struct ether_arp), "ARP"))
+                goto out;
 
-        mr500_priv->start_flash = time(NULL);
+        arphdr = (struct ether_arp *)packet_buff;
+
+        node->flash_mode = FLASH_MODE_TFTP_CLIENT;
+        node->his_ip_addr = *((unsigned int *)(arphdr->arp_spa));
+        node->our_ip_addr = *((unsigned int *)(arphdr->arp_tpa));
+
+out:
+        return;
 }
 
-int mr500_flash_completed(struct node *node)
+void tftp_client_flash_time_set(struct node *node)
 {
-        struct mr500_priv *mr500_priv = node->router_priv;
+        struct mr500_priv *mr500_priv;
+        struct om2p_priv *om2p_priv;
+
+        if (node->router_type == &mr500) {
+                mr500_priv = node->router_priv;
+                mr500_priv->start_flash = time(NULL);
+        } else if (node->router_type == &om2p) {
+                om2p_priv = node->router_priv;
+                om2p_priv->start_flash = time(NULL);
+        }
+}
+
+int tftp_client_flash_completed(struct node *node)
+{
+        struct mr500_priv *mr500_priv;
+        struct om2p_priv *om2p_priv;
         time_t time2flash;
 
-        if (node->router_type != &mr500)
+        if (node->router_type == &mr500) {
+                mr500_priv = node->router_priv;
+                time2flash = mr500_priv->start_flash + 45 + (node->router_type->image->flash_size / 65536);
+        } else if (node->router_type == &om2p) {
+                om2p_priv = node->router_priv;
+                time2flash = om2p_priv->start_flash + (node->router_type->image->flash_size / 65536);
+        } else {
                 return 0;
-
-        time2flash = mr500_priv->start_flash + 45 + (node->router_type->image->flash_size / 65536);
+        }
 
         if (time(NULL) < time2flash)
@@ -80 +112 @@
 }
 
-static void mr500_detect_post(struct node *node, char *packet_buff, int packet_buff_len)
+const struct router_type mr500 = {
+        .desc = "MR500 router",
+        .detect_pre = NULL,
+        .detect_main = mr500_detect_main,
+        .detect_post = tftp_client_detect_post,
+        .image = &img_uboot,
+        .priv_size = sizeof(struct mr500_priv),
+};
+
+static int om2p_detect_main(void (*priv)__attribute__((unused)), char *packet_buff, int packet_buff_len)
 {
         struct ether_arp *arphdr;
+        int ret = 0;
 
         if (!len_check(packet_buff_len, sizeof(struct ether_arp), "ARP"))
@@ -88 +130 @@
 
         arphdr = (struct ether_arp *)packet_buff;
+        if (arphdr->ea_hdr.ar_op != htons(ARPOP_REQUEST))
+                goto out;
 
-        node->flash_mode = FLASH_MODE_TFTP_CLIENT;
-        node->his_ip_addr = *((unsigned int *)(arphdr->arp_spa));
-        node->our_ip_addr = *((unsigned int *)(arphdr->arp_tpa));
+        if (*((unsigned int *)arphdr->arp_tpa) != htonl(om2p_ip))
+                goto out;
+
+        ret = 1;
 
 out:
-        return;
+        return ret;
 }
 
-const struct router_type mr500 = {
-        .desc = "MR500 router",
+const struct router_type om2p = {
+        .desc = "OM2P router",
         .detect_pre = NULL,
-        .detect_main = mr500_detect_main,
-        .detect_post = mr500_detect_post,
-        .image = &img_uboot,
-        .priv_size = sizeof(struct mr500_priv),
+        .detect_main = om2p_detect_main,
+        .detect_post = tftp_client_detect_post,
+        .image = &img_ce_om2p,
+        .priv_size = sizeof(struct om2p_priv),
 };

ap51-flash-ng/router_tftp_client.h

@@ -18 +18 @@
 
 extern const struct router_type mr500;
+extern const struct router_type om2p;
 
-void mr500_flash_time_set(struct node *node);
-int mr500_flash_completed(struct node *node);
+void tftp_client_flash_time_set(struct node *node);
+int tftp_client_flash_completed(struct node *node);

ap51-flash-ng/router_types.c

@@ -33 +33 @@
         &redboot,
         &mr500,
+        &om2p,
         NULL,
 };

ap51-flash-ng/types.h

@@ -40 +40 @@
 #define FLASH_MODE_TFTP_CLIENT  0x03
 
-#define DESC_MAX_LENGTH 20
+#define DESC_MAX_LENGTH 30
 
 struct list {
@@ -49 +49 @@
 struct image_state {
         int fd;
-        int bytes_sent;
-        int file_size;
+        unsigned int bytes_sent;
+        unsigned int file_size;
+        unsigned int total_bytes_sent;
         unsigned int flash_size;
         unsigned int offset;
@@ -102 +103 @@
 };
 
-struct ci_info {
-        unsigned int kernel_offset;
-        unsigned int kernel_size;
-        unsigned int kernel_fsize;
-        unsigned int rootfs_offset;
-        unsigned int rootfs_size;
-        unsigned int rootfs_fsize;
-        int lzma_kernel;
+struct file_info {
+        char file_name[20];
+        unsigned int file_offset;
+        unsigned int file_size;
+        unsigned int file_fsize;
 };
 
 struct router_image {
         char desc[DESC_MAX_LENGTH];
-        int (*image_verify)(struct router_image *router_image, char *buff, int buff_len);
+        int (*image_verify)(struct router_image *router_image, char *buff, int buff_len, int size);
         char *path;
-        int file_size;
+        unsigned int file_size;
         unsigned int flash_size;
-        struct ci_info ci_info;
+        struct list *file_list;
 };