Changeset 222

Timestamp:

02/15/10 17:12:03 (2 years ago)

Author:

marek

Message:

ap51-flash: add flash from file mode

Location:

ap51-flash/trunk

Files:

• Makefile (modified) (1 diff)
• ap51-flash.c (modified) (17 diffs)
• ap51-flash.h (modified) (3 diffs)
• main.c (modified) (4 diffs)
• packet.c (modified) (5 diffs)
• packet.h (modified) (1 diff)
• uip-conf.h (modified) (1 diff)

ap51-flash/trunk/Makefile

@@ -32 +32 @@
 # enable packet debug output
 # CFLAGS += -DPACKET_DEBUG
+# enable flash from file mode
+# CFLAGS += -DFLASH_FROM_FILE
 
 # if you change the names here you also need to change the ap51-flash.c code

ap51-flash/trunk/ap51-flash.c

@@ -40 +40 @@
 
 char flash_mode = MODE_NONE;
+int flash_from_file = 0;
+struct flash_from_file fff_data[FFF_NUM];
 unsigned int remote_ip;
 unsigned int local_ip;
@@ -94 +96 @@
         /* Open the output adapter */
         if (NULL == (pcap_fp = pcap_open_live(dev, 1500, 1, PCAP_TIMEOUT_MS, error))) {
-                fprintf(stderr,"Error opening adapter: %s\n", error);
+                fprintf(stderr, "Error opening adapter: %s\n", error);
                 return -1;
         }
@@ -378 +380 @@
                         unsigned long int x = 0;
                         sscanf(str_ptr, "Erase from 0x%08lx", &x);
-                        if (0 != x)
-                        {
+                        if (0 != x) {
                                 x -= device_info->flash_addr;
-                                if (x > device_info->flash_size)
-                                {
+                                if (x > device_info->flash_size) {
                                         rootfs_part_size += (x - device_info->flash_size);
                                         printf("Rootfs partition size now 0x%08x\n", rootfs_part_size);
@@ -426 +426 @@
                         goto err_close;
                 }
-                if (tftp_bytes_sent < (unsigned long)kernel_size)
-                {
+                if (tftp_bytes_sent < (unsigned long)kernel_size) {
                         fprintf(stderr, "Error transferring kernel, send=%ld, expected=%d\n", tftp_bytes_sent, kernel_size);
                         exit(1);
@@ -477 +476 @@
                 s->inputbuffer[0] = 0;
                 PSOCK_READTO(475, &s->p, '>');
-                if (!uncomp_loader)
-                {
-                        sprintf(str, "fis load %s %s\n", (0x1f == kernel_buf[0] && 0x8b ==kernel_buf[1] ? "-d" : "-l"), kernelpartname);
-                }
-                else
-                {
-                        sprintf(str, "fis load %s\n", kernelpartname);
-                }
+
+                if (flash_from_file) {
+                        if (!uncomp_loader)
+                                sprintf(str, "fis load %s %s\n",
+                                        (0x1f == fff_data[FFF_KERNEL].buff[0] && 0x8b ==fff_data[FFF_KERNEL].buff[1] ? "-d" : "-l"),
+                                        kernelpartname);
+                        else
+                                sprintf(str, "fis load %s\n", kernelpartname);
+                } else {
+                        if (!uncomp_loader)
+                                sprintf(str, "fis load %s %s\n",
+                                        (0x1f == kernel_buf[0] && 0x8b ==kernel_buf[1] ? "-d" : "-l"),
+                                        kernelpartname);
+                        else
+                                sprintf(str, "fis load %s\n", kernelpartname);
+                }
+
                 PSOCK_SEND_STR(477, &s->p, str);
                 s->inputbuffer[0] = 0;
@@ -591 +599 @@
 }
 
-int ap51_flash(char* device, char* rootfs_filename, char* kernel_filename, int nvram, int uncomp, int special)
+static int open_image_file(char *fname, int *fd, int *file_size, int *flash_size, unsigned char **buff)
+{
+        char err_string[265];
+
+        *fd = open(fname, O_RDONLY | O_BINARY);
+        if (*fd < 0) {
+                perror(fname);
+                goto err;
+        }
+
+        *file_size = lseek(*fd, 0, SEEK_END);
+        if (*file_size < 0) {
+                fprintf(stderr, "Unable to retrieve file size: %s\n", fname);
+                goto err_close;
+        }
+
+        *flash_size = ((*file_size + FLASH_PAGE_SIZE - 1) / FLASH_PAGE_SIZE) * FLASH_PAGE_SIZE;
+        if (*flash_size >= 8 * 1024 * 1024) {
+                fprintf(stderr, "File size exceeds 8MB limit: %s\n", fname);
+                goto err_close;
+        }
+
+        lseek(*fd, 0, SEEK_SET);
+
+        if (!buff) /* FLASH_FROM_FILE */
+                return 0;
+
+        *buff = malloc(*flash_size);
+        if (!*buff) {
+                perror("no mem");
+                goto err_close;
+        }
+
+        if (*file_size != read(*fd, *buff, *file_size)) {
+                sprintf(err_string, "%s read fails: buf=%p, size=%d", fname, *buff, *file_size);
+                perror(err_string);
+                goto err_free;
+        }
+
+        close(*fd);
+        return 1;
+
+err_free:
+        free(*buff);
+err_close:
+        close(*fd);
+err:
+        return -1;
+}
+
+int ap51_flash(char *device, char *rootfs_filename, char *kernel_filename, int nvram, int uncomp, int special)
 {
         uip_ipaddr_t netmask;
@@ -597 +655 @@
         pcap_if_t *alldevs = NULL, *d;
         char *pcap_device, errbuf[PCAP_ERRBUF_SIZE];
-        unsigned char* buf = 0;
-        int i = 0, if_num = 0;
-        int fd, size = 0, ubnt_img = 0;
+        int ret, i, if_num = 0, ubnt_img = 0;
+        unsigned char *buf = 0;
+        int fd, size = 0;
 
         pcap_device = device;
@@ -614 +672 @@
                 nvram_part_size = FLASH_PAGE_SIZE;
 
-        /* Root file name? */
-        if (NULL != rootfs_filename) {
-                if (-1 == (fd = open(rootfs_filename, O_RDONLY | O_BINARY))) {
-                        perror(rootfs_filename);
+#if defined(FLASH_FROM_FILE)
+        if (flash_from_file) {
+                for (i = 0; i < FFF_NUM; i++) {
+                        if (!fff_data[i].fname)
+                                continue;
+
+                        ret = open_image_file(fff_data[i].fname, &fff_data[i].fd,
+                                              &fff_data[i].file_size, &fff_data[i].flash_size, NULL);
+
+                        if (ret < 0)
+                                return 1;
+
+                        printf("Reading %s file %s with %d bytes ...\n",
+                               (i == 0 ? "rootfs" : (i == 1 ? "kernel" : "ubnt")),
+                               fff_data[i].fname, fff_data[i].flash_size);
+                }
+
+                goto init_pcap;
+        }
+#endif
+
+        if (rootfs_filename) {
+                ret = open_image_file(rootfs_filename, &fd,
+                                      &size, &rootfs_size, &rootfs_buf);
+
+                if (ret < 0)
                         return 1;
-                }
-                size = lseek(fd, 0, SEEK_END);
-                rootfs_size = ((size + FLASH_PAGE_SIZE - 1) / FLASH_PAGE_SIZE) * FLASH_PAGE_SIZE;
-                lseek(fd, 0, SEEK_SET);
-                if (0 != (rootfs_buf = malloc(rootfs_size)))
-                {
-                        if (size != read(fd, rootfs_buf, size) ||
-                                0 >= size || 8 * 1024 * 1024 < size)
-                        {
-                                char s[265];
-                                sprintf(s, "%s fails: buf=%p, size=%d", rootfs_filename, rootfs_buf, size);
-                                perror(s);
-                                return 1;
-                        }
-                }
-                else
-                {
-                        perror("no mem");
-                        return 1;
-                }
-                printf("Reading rootfs file %s with %d bytes ...\n", rootfs_filename, size);
+
+                printf("Reading rootfs file %s with %d bytes ...\n",
+                       rootfs_filename, rootfs_size);
+
         } else {
 #if defined(EMBEDDED_DATA) && defined(WIN32)
                 HRSRC hRsrc;
                 hRsrc = FindResource(NULL, MAKEINTRESOURCE(IDR_ROOTFS), RT_RCDATA);
-                if (NULL != hRsrc)
-                {
+                if (hRsrc) {
                         HGLOBAL hGlobal = LoadResource(NULL, hRsrc);
                         buf = LockResource(hGlobal);
@@ -655 +717 @@
 #endif
 
-                if (0 != buf)
-                {
+                if (buf) {
                         rootfs_size = ((size + FLASH_PAGE_SIZE - 1) / FLASH_PAGE_SIZE) * FLASH_PAGE_SIZE;
-                        if (0 != (rootfs_buf = malloc(rootfs_size)))
-                        {
+                        if (0 != (rootfs_buf = malloc(rootfs_size))) {
                                 memset(rootfs_buf, 0xff, rootfs_size);
                                 memmove(rootfs_buf, buf, size);
-                        }
-                        else
-                        {
+                        } else {
                                 perror("no mem");
                                 return 1;
@@ -671 +729 @@
         }
 
-        /* Kernel file name? */
-        if (NULL != kernel_filename)
-        {
-                if (-1 == (fd = open(kernel_filename, O_RDONLY | O_BINARY)))
-                {
-                        perror(kernel_filename);
+        if (kernel_filename) {
+                ret = open_image_file(kernel_filename, &fd,
+                                      &size, &kernel_size, &kernel_buf);
+
+                if (ret < 0)
                         return 1;
-                }
-                size = lseek(fd, 0, SEEK_END);
-                kernel_size = ((size + FLASH_PAGE_SIZE - 1) / FLASH_PAGE_SIZE) * FLASH_PAGE_SIZE;
-                lseek(fd, 0, SEEK_SET);
-                if (0 != (kernel_buf = malloc(kernel_size)))
-                {
-                        if (size != read(fd, kernel_buf, size) ||
-                                0 >= size || 8 * 1024 * 1024 < size)
-                        {
-                                char s[265];
-                                sprintf(s, "%s fails: buf=%p, size=%d", kernel_filename, kernel_buf, size);
-                                perror(s);
-                                return 1;
-                        }
-                }
-                else
-                {
-                        perror("no mem");
-                        return 1;
-                }
-                printf("Reading kernel file %s with %d bytes ...\n", kernel_filename, size);
+
+                printf("Reading kernel file %s with %d bytes ...\n",
+                       kernel_filename, kernel_size);
         } else {
 #if defined(EMBEDDED_DATA) && defined(WIN32)
                 HRSRC hRsrc = FindResource(NULL, MAKEINTRESOURCE(IDR_KERNEL), RT_RCDATA);
-                if (NULL != hRsrc)
-                {
+                if (hRsrc) {
                         HGLOBAL hGlobal = LoadResource(NULL, hRsrc);
                         buf = LockResource(hGlobal);
@@ -713 +751 @@
 #endif
 
-                if (0 != buf)
-                {
+                if (buf) {
                         kernel_size = ((size + FLASH_PAGE_SIZE - 1) / FLASH_PAGE_SIZE) * FLASH_PAGE_SIZE;
-                        if (0 != (kernel_buf = malloc(kernel_size)))
-                        {
+                        if (0 != (kernel_buf = malloc(kernel_size))) {
                                 memset(kernel_buf, 0xff, kernel_size);
                                 memmove(kernel_buf, buf, size);
-                        }
-                        else
-                        {
+                        } else {
                                 perror("no mem");
                                 return 1;
@@ -743 +777 @@
                 return 1;
         }
+
+#if defined(FLASH_FROM_FILE)
+init_pcap:
+#endif
 
         srcmac.addr[0] = 0x00;
@@ -765 +803 @@
 
         /* Print the list */
+        i = 0;
         for (d = alldevs; d != NULL; d = d->next) {
                 i++;
@@ -798 +837 @@
         switch (flash_mode) {
         case MODE_REDBOOT:
-                if (ubnt_img) {
-                        fprintf(stderr, "You are trying to flash a redboot device with a ubiquiti image!\n");
-                        return 1;
+                if (flash_from_file) {
+                        if ((!fff_data[FFF_ROOTFS].fname) ||
+                            (!fff_data[FFF_KERNEL].fname)) {
+                                fprintf(stderr, "Error - redboot enabled device detected but rootfs & kernel file not available\n");
+                                return 1;
+                        }
+                } else {
+                        if (ubnt_img) {
+                                fprintf(stderr, "Error - you are trying to flash a redboot device with a ubiquiti image!\n");
+                                return 1;
+                        }
                 }
 
@@ -808 +855 @@
 
                 if (NULL == uip_connect(&dstipaddr, htons(TELNET_PORT))) {
-                        fprintf(stderr, "Cannot connect to port %i\n", TELNET_PORT);
+                        fprintf(stderr, "Error - cannot connect to port %i\n", TELNET_PORT);
                         return 1;
                 }
@@ -814 +861 @@
         case MODE_TFTP_CLIENT:
 #if defined(EMBEDDED_DATA)
-                if (!rootfs_filename) {
+                if ((!rootfs_filename) && (!flash_from_file)) {
 
                         /* free the rootfs and replace it by the ubnt image */
@@ -845 +892 @@
                         ubnt_img = 1;
                 }
-#endif
-                if (!ubnt_img) {
-                        fprintf(stderr, "You are trying to flash a ubiquiti device with redboot images!\n");
-                        return 1;
-                }
-
-                tftp_xfer_buff = rootfs_buf;
-                tftp_xfer_size = rootfs_size;
+#endif /* EMBEDDED_DATA */
+                if (flash_from_file) {
+                        if (!fff_data[FFF_UBNT].fname) {
+                                fprintf(stderr, "Error - ubiquiti device detected but ubiquiti file not available\n");
+                                return 1;
+                        }
+                } else {
+                        if (!ubnt_img) {
+                                fprintf(stderr, "Error - you are trying to flash a ubiquiti device with redboot images!\n");
+                                return 1;
+                        }
+                }
+
+                tftp_xfer_buff = (flash_from_file ? (unsigned char *)&fff_data[FFF_UBNT] : rootfs_buf);
+                tftp_xfer_size = (flash_from_file ? fff_data[FFF_UBNT].flash_size : rootfs_size);
                 printf("Ubiquiti device detected - using TFTP client to flash\n");
                 break;
         default:
-                fprintf(stderr, "Could not auto-detect flash mode!\n");
+                fprintf(stderr, "Error - could not auto-detect flash mode!\n");
                 return 1;
         }
 
-        fw_upload();
-        return 0;
+        return fw_upload();
 }
 

ap51-flash/trunk/ap51-flash.h

@@ -71 +71 @@
 };
 
+struct flash_from_file {
+        int fd;
+        int file_size;
+        int flash_size;
+        char *fname;
+        char buff[2];
+};
+
 /* flash modes */
 enum {
@@ -77 +85 @@
         MODE_MAYBE_REDBOOT,
         MODE_TFTP_CLIENT,
+};
+
+/* flash from file data */
+enum {
+        FFF_ROOTFS = 0,
+        FFF_KERNEL,
+        FFF_UBNT,
+        FFF_NUM,
 };
 
@@ -119 +135 @@
 extern int kernel_size;
 extern char flash_mode;
+extern int flash_from_file;
+extern struct flash_from_file fff_data[];
 
 #endif /* __ap51_FLASH_H__ */

ap51-flash/trunk/main.c

@@ -20 +20 @@
 #include <stdlib.h>
 #include <string.h>
+#if defined(FLASH_FROM_FILE)
+#include <getopt.h>
+#endif
 
 #include "ap51-flash.h"
@@ -39 +42 @@
         fprintf(stderr, "%s [ethdevice] ubnt.bin   flashes your ubiquiti image\n", prgname);
         fprintf(stderr, "%s -v   prints version information\n", prgname);
+
+#if defined(FLASH_FROM_FILE)
+        fprintf(stderr, "\nFlash from file mode:\n");
+        fprintf(stderr, "%s --flash-from-file [file options] interface\n", prgname);
+        fprintf(stderr, "Options:\n");
+        fprintf(stderr, "  --flash-from-file   enable 'flash from file' mode\n");
+        fprintf(stderr, "  --rootfs   path to rootfs file\n");
+        fprintf(stderr, "  --kernel   path to kernel file\n");
+        fprintf(stderr, "  --ubnt   path to ubiquiti image\n");
+#endif
 
         fprintf(stderr, "\nThe 'ethdevice' has to be one of the devices that are part of the supported device list which follows.\nYou can either specify its name or the interface number.\n");
@@ -72 +85 @@
 int main(int argc, char* argv[])
 {
-        int nvram = 0;
-        int uncomp = 0;
-        int special = 0;
+        int nvram = 0, uncomp = 0, special = 0;
+        char *iface = NULL;
+
+#if defined(FLASH_FROM_FILE)
+        int i, found_args = 1, optchar, option_index;
+        struct option long_options[] =
+        {
+                {"flash-from-file", no_argument, 0, 'f'},
+                {"rootfs", required_argument, 0, 'r'},
+                {"kernel", required_argument, 0, 'k'},
+                {"ubnt", required_argument, 0, 'u'},
+                {0, 0, 0, 0}
+        };
+#endif
 
         if ((argc == 2) && (strcmp("-v", argv[1]) == 0)) {
@@ -99 +123 @@
                 special = 1;
         }
-// #if defined(DEBUG)
-//      special = 1;
-// #endif
 
-/*      if (argc > 2 && 0 == strcmp("uncomp", argv[argc - 1]))
-        {
+        /*if (argc > 2 && strcmp("uncomp", argv[argc - 1]) == 0) {
                 argc--;
                 uncomp = 1;
         }
 
-        if (argc > 1 && 0 == strcmp("nvram", argv[argc - 1]))
-        {
+        if (argc > 1 && strcmp("nvram", argv[argc - 1]) == 0) {
                 argc--;
                 nvram = 1;
         }*/
 
-        if (argc < 2)
-        {
+        if (argc < 2) {
                 usage(argv[0]);
                 return 1;
         }
 
-        return ap51_flash(argv[1], 2 < argc ? argv[2] : NULL, 3 < argc ? argv[3] : NULL, nvram, uncomp, special);
+        iface = argv[1];
+
+#if defined(FLASH_FROM_FILE)
+        for (i = 0; i < FFF_NUM; i++)
+                fff_data[i].fname = NULL;
+
+        while ((optchar = getopt_long(argc, argv, "fk:r:u:", long_options, &option_index)) != -1) {
+                switch (optchar) {
+                case 'f':
+                        flash_from_file = 1;
+                        found_args++;
+                        break;
+                case 'k':
+                        fff_data[FFF_KERNEL].fname = optarg;
+                        found_args += 2;
+                        break;
+                case 'r':
+                        fff_data[FFF_ROOTFS].fname = optarg;
+                        found_args += 2;
+                        break;
+                case 'u':
+                        fff_data[FFF_UBNT].fname = optarg;
+                        found_args += 2;
+                        break;
+                default:
+                        usage(argv[0]);
+                        return 1;
+                }
+        }
+
+        if (flash_from_file) {
+                if ((fff_data[FFF_ROOTFS].fname && !fff_data[FFF_KERNEL].fname) ||
+                    (!fff_data[FFF_ROOTFS].fname && fff_data[FFF_KERNEL].fname)) {
+                        fprintf(stderr, "Error - you need to specify kernel and rootfs together or not at all\n");
+                        return 1;
+                }
+
+                if (!fff_data[FFF_ROOTFS].fname && !fff_data[FFF_KERNEL].fname && !fff_data[FFF_UBNT].fname) {
+                        fprintf(stderr, "Error - you need to specify at least kernel and rootfs or ubiquiti image file\n");
+                        return 1;
+                }
+
+                if (found_args == argc) {
+                        fprintf(stderr, "Error - you need to specify the interface to run 'flash from file' mode\n");
+                        return 1;
+                } else if (found_args + 1 < argc) {
+                        fprintf(stderr, "Error - too many arguments to run flash from file mode\n");
+                        return 1;
+                }
+
+                iface = argv[found_args];
+        }
+#endif
+
+        return ap51_flash(iface, (argc > 2 ? argv[2] : NULL), (argc > 3 ? argv[3] : NULL), nvram, uncomp, special);
 }

ap51-flash/trunk/packet.c

@@ -123 +123 @@
 }
 
+static void read_from_file(void *target_buff, void *data, int len, int seek_pos)
+{
+        struct flash_from_file *fff = (struct flash_from_file *)data;
+        int read_len = len;
+
+        if (fff->file_size < seek_pos)
+                read_len = 0;
+        else if (fff->file_size < seek_pos + len)
+                read_len = fff->file_size - seek_pos;
+
+        if (read_len > 0) {
+                if (read_len != read(fff->fd, target_buff, read_len)) {
+                        perror(fff->fname);
+                        exit(1);
+                }
+        }
+
+        if (read_len != len)
+                memset(target_buff + read_len, 0, len - read_len);
+
+        if (seek_pos == 0)
+                memcpy(fff->buff, target_buff, 2);
+}
+
 static void tftp_transfer(const unsigned char *packet_buff, unsigned int packet_len)
 {
@@ -146 +170 @@
                 file_name = ((char *)rcv_udphdr) + sizeof(struct udphdr) + 2;
                 if (strcmp(file_name, "kernel") == 0) {
-                        tftp_xfer_buff = kernel_buf;
-                        tftp_xfer_size = kernel_size;
+                        tftp_xfer_buff = (flash_from_file ? (unsigned char *)&fff_data[FFF_KERNEL] : kernel_buf);
+                        tftp_xfer_size = (flash_from_file ? fff_data[FFF_KERNEL].flash_size : kernel_size);
                         printf("Sending kernel, %ld blocks...\n",
                                ((tftp_xfer_size + 511) / 512));
                 } else if (strcmp(file_name, "rootfs") == 0) {
-                        tftp_xfer_buff = rootfs_buf;
-                        tftp_xfer_size = rootfs_size;
+                        tftp_xfer_buff = (flash_from_file ? (unsigned char *)&fff_data[FFF_ROOTFS] : rootfs_buf);
+                        tftp_xfer_size = (flash_from_file ? fff_data[FFF_ROOTFS].flash_size : rootfs_size);
                         printf("Sending rootfs, %ld blocks...\n",
                                ((tftp_xfer_size + 511) / 512));
@@ -200 +224 @@
                 *((unsigned short *)(tftp_data + 2)) = htons(block);
 
-                if (tftp_xfer_size - tftp_bytes_sent >= 512) {
-                        memcpy(tftp_data + 4, (void *)(tftp_xfer_buff + tftp_bytes_sent), 512);
-                        tftp_data_len = 512;
-                } else {
-                        memcpy(tftp_data + 4, (void *)(tftp_xfer_buff + tftp_bytes_sent), tftp_xfer_size - tftp_bytes_sent);
-                        tftp_data_len = tftp_xfer_size - tftp_bytes_sent;
-                }
+                tftp_data_len = tftp_xfer_size - tftp_bytes_sent > 512 ? 512 : tftp_xfer_size - tftp_bytes_sent;
+
+                if (flash_from_file)
+                        read_from_file(tftp_data + 4, (void *)tftp_xfer_buff, tftp_data_len, tftp_bytes_sent);
+                else
+                        memcpy(tftp_data + 4, (void *)(tftp_xfer_buff + tftp_bytes_sent), tftp_data_len);
 
                 tftp_bytes_sent += tftp_data_len;
@@ -231 +254 @@
 }
 
-void fw_upload(void)
+int fw_upload(void)
 {
         const unsigned char *packet;
@@ -342 +365 @@
                 }
         }
-}
+
+        return 0;
+}

ap51-flash/trunk/packet.h

@@ -34 +34 @@
 void arp_packet_init(void);
 void arp_packet_send(void);
-void fw_upload(void);
+int fw_upload(void);

ap51-flash/trunk/uip-conf.h

@@ -117 +117 @@
  * \hideinitializer
  */
-#define UIP_CONF_BYTE_ORDER      UIP_LITTLE_ENDIAN
+/* #define UIP_CONF_BYTE_ORDER      UIP_LITTLE_ENDIAN */
 
 /**