Update README.md

[oweals/nmrpflash.git] / tftp.c

diff --git a/tftp.c b/tftp.c
index 079ee8a2a8558dd48fc5e521f3e31aa07b7aff0c..da76dc97158e75947ab2e9e23d3a9cc1862dcd62 100644 (file)
--- a/tftp.c
+++ b/tftp.c
@@ -40,28 +40,12 @@ enum tftp_opcode {
        ERR  = 5
 };
 
-static const char *leafname(const char *path)
-{
-       const char *slash, *bslash;
-
-       slash = strrchr(path, '/');
-       bslash = strrchr(path, '\\');
-
-       if (slash && bslash) {
-               path = 1 + (slash > bslash ? slash : bslash);
-       } else if (slash) {
-               path = 1 + slash;
-       } else if (bslash) {
-               path = 1 + bslash;
-       }
-
-       return path;
-}
-
 static bool is_netascii(const char *str)
 {
-       for (; *str; ++str) {
-               if (*str < 0x20 || *str > 0x7f) {
+       uint8_t *p = (uint8_t*)str;
+
+       for (; *p; ++p) {
+               if (*p < 0x20 || *p > 0x7f) {
                        return false;
                }
        }
@@ -84,9 +68,11 @@ static void pkt_mkwrq(char *pkt, const char *filename)
        size_t len = 2;
 
        filename = leafname(filename);
-       if (!is_netascii(filename) || strlen(filename) > 500) {
-               fprintf(stderr, "Overlong/illegal filename; using 'firmware.bin'.\n");
-               filename = "firmware.bin";
+       if (!tftp_is_valid_filename(filename)) {
+               fprintf(stderr, "Overlong/illegal filename; using 'firmware'.\n");
+               filename = "firmware";
+       } else if (!strcmp(filename, "-")) {
+               filename = "firmware";
        }
 
        pkt_mknum(pkt, WRQ);
@@ -207,17 +193,35 @@ static ssize_t tftp_sendto(int sock, char *pkt, size_t len,
        return sent;
 }
 
+const char *leafname(const char *path)
+{
+       const char *slash, *bslash;
+
+       slash = strrchr(path, '/');
+       bslash = strrchr(path, '\\');
+
+       if (slash && bslash) {
+               path = 1 + (slash > bslash ? slash : bslash);
+       } else if (slash) {
+               path = 1 + slash;
+       } else if (bslash) {
+               path = 1 + bslash;
+       }
+
+       return path;
+}
+
 #ifdef NMRPFLASH_WINDOWS
 void sock_perror(const char *msg)
 {
        win_perror2(msg, WSAGetLastError());
 }
-#else
-inline void sock_perror(const char *msg)
+#endif
+
+inline bool tftp_is_valid_filename(const char *filename)
 {
-       perror(msg);
+       return strlen(filename) <= 500 && is_netascii(filename);
 }
-#endif
 
 int tftp_put(struct nmrpd_args *args)
 {
@@ -230,11 +234,15 @@ int tftp_put(struct nmrpd_args *args)
        sock = -1;
        ret = -1;
 
-       fd = open(args->filename, O_RDONLY);
-       if (fd < 0) {
-               perror("open");
-               ret = fd;
-               goto cleanup;
+       if (!strcmp(args->file_local, "-")) {
+               fd = STDIN_FILENO;
+       } else {
+               fd = open(args->file_local, O_RDONLY);
+               if (fd < 0) {
+                       perror("open");
+                       ret = fd;
+                       goto cleanup;
+               }
        }
 
        sock = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
@@ -259,7 +267,7 @@ int tftp_put(struct nmrpd_args *args)
        /* Not really, but this way the loop sends our WRQ before receiving */
        timeout = 1;
 
-       pkt_mkwrq(tx, args->filename);
+       pkt_mkwrq(tx, args->file_remote);
 
        do {
                if (!timeout && pkt_num(rx) == ACK) {
@@ -309,7 +317,7 @@ int tftp_put(struct nmrpd_args *args)
                if (ret < 0) {
                        goto cleanup;
                } else if (!ret) {
-                       if (++timeout < 5) {
+                       if (++timeout < 5 || (!block && timeout < 10)) {
                                continue;
                        } else if (block) {
                                fprintf(stderr, "Timeout while waiting for ACK(%d).\n", block);