6to4: fix interface error handling

[openwrt.git] / tools / firmware-utils / src / trx.c

diff --git a/tools/firmware-utils/src/trx.c b/tools/firmware-utils/src/trx.c
index 44bd06a..8e95d98 100644 (file)
--- a/tools/firmware-utils/src/trx.c
+++ b/tools/firmware-utils/src/trx.c
@@ -53,8 +53,10 @@
 
 #if __BYTE_ORDER == __BIG_ENDIAN
 #define STORE32_LE(X)          bswap_32(X)
+#define LOAD32_LE(X)           bswap_32(X)
 #elif __BYTE_ORDER == __LITTLE_ENDIAN
 #define STORE32_LE(X)          (X)
+#define LOAD32_LE(X)           (X)
 #else
 #error unkown endianness!
 #endif
@@ -98,10 +100,11 @@ int main(int argc, char **argv)
        int c, i, append = 0;
        size_t n;
        ssize_t n2;
-       uint32_t cur_len;
+       uint32_t cur_len, fsmark=0;
        unsigned long maxlen = TRX_MAX_LEN;
        struct trx_header *p;
        char trx_version = 1;
+       unsigned char binheader[32];
 
        fprintf(stderr, "mjn3's trx replacement - v0.81.1\n");
 
@@ -114,12 +117,11 @@ int main(int argc, char **argv)
 
        p->magic = STORE32_LE(TRX_MAGIC);
        cur_len = sizeof(struct trx_header) - 4; /* assume v1 header */
-       p->flag_version = STORE32_LE((trx_version << 16));
 
        in = NULL;
        i = 0;
 
-       while ((c = getopt(argc, argv, "-:2o:m:a:x:b:f:A:")) != -1) {
+       while ((c = getopt(argc, argv, "-:2o:m:a:x:b:f:A:F:")) != -1) {
                switch (c) {
                        case '2':
                                /* take care that nothing was written to buf so far */
@@ -131,6 +133,8 @@ int main(int argc, char **argv)
                                        cur_len += 4;
                                }
                                break;
+                       case 'F':
+                               fsmark = cur_len;
                        case 'A':
                                append = 1;
                                /* fall through */
@@ -214,7 +218,7 @@ int main(int argc, char **argv)
                                        usage();
                                }
                                if (n < cur_len) {
-                                       fprintf(stderr, "WARNING: current length exceeds -b %d offset\n",n);
+                                       fprintf(stderr, "WARNING: current length exceeds -b %d offset\n",(int) n);
                                } else {
                                        memset(buf + cur_len, 0, n - cur_len);
                                        cur_len = n;
@@ -229,7 +233,7 @@ int main(int argc, char **argv)
                                }
                                if (n2 < 0) {
                                        if (-n2 > cur_len) {
-                                               fprintf(stderr, "WARNING: current length smaller then -x %d offset\n",n2);
+                                               fprintf(stderr, "WARNING: current length smaller then -x %d offset\n",(int) n2);
                                                cur_len = 0;
                                        } else
                                                cur_len += n2;
@@ -243,6 +247,7 @@ int main(int argc, char **argv)
                                usage();
                }
        }
+       p->flag_version = STORE32_LE((trx_version << 16));
 
        if (!in) {
                fprintf(stderr, "we require atleast one filename\n");
@@ -257,11 +262,27 @@ int main(int argc, char **argv)
                cur_len += ROUND - n;
        }
 
+       /* for TRXv2 set bin-header Flags to 0xFF for CRC calculation like CFE does */ 
+       if (trx_version == 2) {
+               if(cur_len - LOAD32_LE(p->offsets[3]) < sizeof(binheader)) {
+                       fprintf(stderr, "TRXv2 binheader too small!\n");
+                       return EXIT_FAILURE;
+               }
+               memcpy(binheader, buf + LOAD32_LE(p->offsets[3]), sizeof(binheader)); /* save header */
+               memset(buf + LOAD32_LE(p->offsets[3]) + 22, 0xFF, 8); /* set stable and try1-3 to 0xFF */
+       }
+
        p->crc32 = crc32buf((char *) &p->flag_version,
-                                               cur_len - offsetof(struct trx_header, flag_version));
+                                               (fsmark)?fsmark:cur_len - offsetof(struct trx_header, flag_version));
        p->crc32 = STORE32_LE(p->crc32);
 
-       p->len = STORE32_LE(cur_len);
+       p->len = STORE32_LE((fsmark) ? fsmark : cur_len);
+       p->len = STORE32_LE(p->len);
+
+       /* restore TRXv2 bin-header */
+       if (trx_version == 2) {
+               memcpy(buf + LOAD32_LE(p->offsets[3]), binheader, sizeof(binheader));
+       }
 
        if (!fwrite(buf, cur_len, 1, out) || fflush(out)) {
                fprintf(stderr, "fwrite failed\n");