Changeset 13741

Timestamp:

01/26/10 06:35:52 (3 years ago)

Author:

BrainSlayer

Message:

i hope this was the last one

File:

• src/router/rc/mtd.c (modified) (3 diffs)

src/router/rc/mtd.c

@@ -179 +179 @@
         unsigned short flags;
         unsigned char res3[10];
-} ;
+} __attribute__((packed));
 
 struct etrx_header {
         struct code_header code;
         struct trx_header trx;
-};
+} __attribute__((packed));
 
 #define SQUASHFS_MAGIC                  0x74717368
@@ -234 +234 @@
          */
 #ifdef HAVE_WRT160NL
+        fprintf(stderr,"size of ETRX header = %d\n",sizeof(struct etrx_header));
         if ((fp = fopen(path, "r")))
                 count = safe_fread(&etrx, 1, sizeof(struct etrx_header), fp);
@@ -455 +456 @@
                  * Check CRC before writing if possible 
                  */
-                if (count == trx.len) {
+                #ifdef HAVE_WRT160NL
+                if (count == trx.len + sizeof(struct code_header)) {
+                #else
+                if (count == trx.len) {         
+                #endif
                         if (crc != trx.crc32) {
                                 fprintf(stderr, "%s: Bad CRC\n", path);