Fix some warnings in allbareconfig.
[oweals/busybox.git] / networking / tftp.c
index 378ba2feff0d4daaf141db2a53048f0053b7b866..bdba16727bf27da7dc62c7d6330285be0f8ea3b2 100644 (file)
@@ -1,42 +1,29 @@
-/* ------------------------------------------------------------------------- */
-/* tftp.c                                                                    */
-/*                                                                           */
-/* A simple tftp client for busybox.                                         */
-/* Tries to follow RFC1350.                                                  */
-/* Only "octet" mode supported.                                              */
-/* Optional blocksize negotiation (RFC2347 + RFC2348)                        */
-/*                                                                           */
-/* Copyright (C) 2001 Magnus Damm <damm@opensource.se>                       */
-/*                                                                           */
-/* Parts of the code based on:                                               */
-/*                                                                           */
-/* atftp:  Copyright (C) 2000 Jean-Pierre Lefebvre <helix@step.polymtl.ca>   */
-/*                        and Remi Lefebvre <remi@debian.org>                */
-/*                                                                           */
-/* utftp:  Copyright (C) 1999 Uwe Ohse <uwe@ohse.de>                         */
-/*                                                                           */
-/* This program is free software; you can redistribute it and/or modify      */
-/* it under the terms of the GNU General Public License as published by      */
-/* the Free Software Foundation; either version 2 of the License, or         */
-/* (at your option) any later version.                                       */
-/*                                                                           */
-/* This program is distributed in the hope that it will be useful,           */
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of            */
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          */
-/* General Public License for more details.                                  */
-/*                                                                           */
-/* You should have received a copy of the GNU General Public License         */
-/* along with this program; if not, write to the Free Software               */
-/* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA   */
-/*                                                                           */
-/* ------------------------------------------------------------------------- */
+/* vi: set sw=4 ts=4: */
+/* -------------------------------------------------------------------------
+ * tftp.c
+ *
+ * A simple tftp client for busybox.
+ * Tries to follow RFC1350.
+ * Only "octet" mode supported.
+ * Optional blocksize negotiation (RFC2347 + RFC2348)
+ *
+ * Copyright (C) 2001 Magnus Damm <damm@opensource.se>
+ *
+ * Parts of the code based on:
+ *
+ * atftp:  Copyright (C) 2000 Jean-Pierre Lefebvre <helix@step.polymtl.ca>
+ *                        and Remi Lefebvre <remi@debian.org>
+ *
+ * utftp:  Copyright (C) 1999 Uwe Ohse <uwe@ohse.de>
+ *
+ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
+ * ------------------------------------------------------------------------- */
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <sys/types.h>
 #include <sys/socket.h>
-#include <sys/time.h>
 #include <sys/stat.h>
 #include <netdb.h>
 #include <netinet/in.h>
@@ -60,7 +47,7 @@
 #define TFTP_ERROR 5
 #define TFTP_OACK  6
 
-static const char *tftp_error_msg[] = {
+static const char * const tftp_bb_error_msg[] = {
        "Undefined error",
        "File not found",
        "Access violation",
@@ -71,34 +58,43 @@ static const char *tftp_error_msg[] = {
        "No such user"
 };
 
-const int tftp_cmd_get = 1;
-const int tftp_cmd_put = 2;
+#ifdef CONFIG_FEATURE_TFTP_GET
+# define tftp_cmd_get 1
+#else
+# define tftp_cmd_get 0
+#endif
+#ifdef CONFIG_FEATURE_TFTP_PUT
+# define tftp_cmd_put (tftp_cmd_get+1)
+#else
+# define tftp_cmd_put 0
+#endif
+
 
 #ifdef CONFIG_FEATURE_TFTP_BLOCKSIZE
 
-static int tftp_blocksize_check(int blocksize, int bufsize)  
+static int tftp_blocksize_check(int blocksize, int bufsize)
 {
-        /* Check if the blocksize is valid: 
+       /* Check if the blocksize is valid:
         * RFC2348 says between 8 and 65464,
         * but our implementation makes it impossible
         * to use blocksizes smaller than 22 octets.
         */
 
-        if ((bufsize && (blocksize > bufsize)) || 
+       if ((bufsize && (blocksize > bufsize)) ||
            (blocksize < 8) || (blocksize > 65464)) {
-               error_msg("bad blocksize");
+               bb_error_msg("bad blocksize");
                return 0;
        }
 
        return blocksize;
 }
 
-static char *tftp_option_get(char *buf, int len, char *option)  
+static char *tftp_option_get(char *buf, int len, char *option)
 {
-        int opt_val = 0;
+       int opt_val = 0;
        int opt_found = 0;
        int k;
-  
+
        while (len > 0) {
 
                /* Make sure the options are terminated correctly */
@@ -117,28 +113,28 @@ static char *tftp_option_get(char *buf, int len, char *option)
                        if (strcasecmp(buf, option) == 0) {
                                opt_found = 1;
                        }
-               }      
+               }
                else {
                        if (opt_found) {
                                return buf;
                        }
                }
-    
+
                k++;
-               
+
                buf += k;
                len -= k;
-               
+
                opt_val ^= 1;
        }
-       
+
        return NULL;
 }
 
 #endif
 
 static inline int tftp(const int cmd, const struct hostent *host,
-       const char *remotefile, int localfd, const int port, int tftp_bufsize)
+       const char *remotefile, int localfd, const unsigned short port, int tftp_bufsize)
 {
        const int cmd_get = cmd & tftp_cmd_get;
        const int cmd_put = cmd & tftp_cmd_put;
@@ -156,7 +152,7 @@ static inline int tftp(const int cmd, const struct hostent *host,
        int opcode = 0;
        int finished = 0;
        int timeout = bb_tftp_num_retries;
-       int block_nr = 1;
+       unsigned short block_nr = 1;
 
 #ifdef CONFIG_FEATURE_TFTP_BLOCKSIZE
        int want_option_ack = 0;
@@ -168,8 +164,8 @@ static inline int tftp(const int cmd, const struct hostent *host,
 
        tftp_bufsize += 4;
 
-       if ((socketfd = socket(PF_INET, SOCK_DGRAM, 0)) < 0) {
-               perror_msg("socket");
+       if ((socketfd = socket(PF_INET, SOCK_DGRAM, 0)) < 0) { /* bb_xsocket? */
+               bb_perror_msg("socket");
                return EXIT_FAILURE;
        }
 
@@ -179,7 +175,7 @@ static inline int tftp(const int cmd, const struct hostent *host,
        bind(socketfd, (struct sockaddr *)&sa, len);
 
        sa.sin_family = host->h_addrtype;
-       sa.sin_port = htons(port);
+       sa.sin_port = port;
        memcpy(&sa.sin_addr, (struct in_addr *) host->h_addr,
                   sizeof(sa.sin_addr));
 
@@ -207,7 +203,7 @@ static inline int tftp(const int cmd, const struct hostent *host,
 
                if ((cmd_get && (opcode == TFTP_RRQ)) ||
                        (cmd_put && (opcode == TFTP_WRQ))) {
-                        int too_long = 0; 
+                       int too_long = 0;
 
                        /* see if the filename fits into buf */
                        /* and fill in packet                */
@@ -223,7 +219,7 @@ static inline int tftp(const int cmd, const struct hostent *host,
                        }
 
                        if (too_long || ((&buf[tftp_bufsize - 1] - cp) < 6)) {
-                               error_msg("too long remote-filename");
+                               bb_error_msg("too long remote-filename");
                                break;
                        }
 
@@ -239,7 +235,7 @@ static inline int tftp(const int cmd, const struct hostent *host,
                        if (len != TFTP_BLOCKSIZE_DEFAULT) {
 
                                if ((&buf[tftp_bufsize - 1] - cp) < 15) {
-                                       error_msg("too long remote-filename");
+                                       bb_error_msg("too long remote-filename");
                                        break;
                                }
 
@@ -267,10 +263,10 @@ static inline int tftp(const int cmd, const struct hostent *host,
                        block_nr++;
 
                        if (cmd_put && (opcode == TFTP_DATA)) {
-                               len = read(localfd, cp, tftp_bufsize - 4);
+                               len = bb_full_read(localfd, cp, tftp_bufsize - 4);
 
                                if (len < 0) {
-                                       perror_msg("read");
+                                       bb_perror_msg("read");
                                        break;
                                }
 
@@ -286,25 +282,26 @@ static inline int tftp(const int cmd, const struct hostent *host,
                /* send packet */
 
 
+               timeout = bb_tftp_num_retries;  /* re-initialize */
                do {
 
                        len = cp - buf;
 
 #ifdef CONFIG_FEATURE_TFTP_DEBUG
-                       printf("sending %u bytes\n", len);
+                       fprintf(stderr, "sending %u bytes\n", len);
                        for (cp = buf; cp < &buf[len]; cp++)
-                               printf("%02x ", *cp);
-                       printf("\n");
+                               fprintf(stderr, "%02x ", (unsigned char)*cp);
+                       fprintf(stderr, "\n");
 #endif
                        if (sendto(socketfd, buf, len, 0,
                                        (struct sockaddr *) &sa, sizeof(sa)) < 0) {
-                               perror_msg("send");
+                               bb_perror_msg("send");
                                len = -1;
                                break;
                        }
 
 
-                       if (finished) {
+                       if (finished && (opcode == TFTP_ACK)) {
                                break;
                        }
 
@@ -319,19 +316,19 @@ static inline int tftp(const int cmd, const struct hostent *host,
                        FD_ZERO(&rfds);
                        FD_SET(socketfd, &rfds);
 
-                       switch (select(FD_SETSIZE, &rfds, NULL, NULL, &tv)) {
+                       switch (select(socketfd + 1, &rfds, NULL, NULL, &tv)) {
                        case 1:
                                len = recvfrom(socketfd, buf, tftp_bufsize, 0,
                                                (struct sockaddr *) &from, &fromlen);
 
                                if (len < 0) {
-                                       perror_msg("recvfrom");
+                                       bb_perror_msg("recvfrom");
                                        break;
                                }
 
                                timeout = 0;
 
-                               if (sa.sin_port == htons(port)) {
+                               if (sa.sin_port == port) {
                                        sa.sin_port = from.sin_port;
                                }
                                if (sa.sin_port == from.sin_port) {
@@ -343,18 +340,17 @@ static inline int tftp(const int cmd, const struct hostent *host,
                                timeout = bb_tftp_num_retries;
 
                        case 0:
-                               error_msg("timeout");
+                               bb_error_msg("timeout");
 
+                               timeout--;
                                if (timeout == 0) {
                                        len = -1;
-                                       error_msg("last timeout");
-                               } else {
-                                       timeout--;
+                                       bb_error_msg("last timeout");
                                }
                                break;
 
                        default:
-                               perror_msg("select");
+                               bb_perror_msg("select");
                                len = -1;
                        }
 
@@ -371,23 +367,23 @@ static inline int tftp(const int cmd, const struct hostent *host,
                tmp = ntohs(*((unsigned short *) &buf[2]));
 
 #ifdef CONFIG_FEATURE_TFTP_DEBUG
-               printf("received %d bytes: %04x %04x\n", len, opcode, tmp);
+               fprintf(stderr, "received %d bytes: %04x %04x\n", len, opcode, tmp);
 #endif
 
                if (opcode == TFTP_ERROR) {
-                       char *msg = NULL;
+                       const char *msg = NULL;
 
                        if (buf[4] != '\0') {
                                msg = &buf[4];
                                buf[tftp_bufsize - 1] = '\0';
-                       } else if (tmp < (sizeof(tftp_error_msg) 
+                       } else if (tmp < (sizeof(tftp_bb_error_msg)
                                          / sizeof(char *))) {
 
-                               msg = (char *) tftp_error_msg[tmp];
+                               msg = tftp_bb_error_msg[tmp];
                        }
 
                        if (msg) {
-                               error_msg("server says: %s", msg);
+                               bb_error_msg("server says: %s", msg);
                        }
 
                        break;
@@ -404,12 +400,12 @@ static inline int tftp(const int cmd, const struct hostent *host,
 
                                 char *res;
 
-                                res = tftp_option_get(&buf[2], len-2, 
+                                res = tftp_option_get(&buf[2], len-2,
                                                       "blksize");
 
                                 if (res) {
                                         int blksize = atoi(res);
-                            
+
                                         if (tftp_blocksize_check(blksize,
                                                           tftp_bufsize - 4)) {
 
@@ -420,7 +416,7 @@ static inline int tftp(const int cmd, const struct hostent *host,
                                                         opcode = TFTP_ACK;
                                                 }
 #ifdef CONFIG_FEATURE_TFTP_DEBUG
-                                                printf("using blksize %u\n", blksize);
+                                                fprintf(stderr, "using blksize %u\n", blksize);
 #endif
                                                 tftp_bufsize = blksize + 4;
                                                 block_nr = 0;
@@ -429,11 +425,11 @@ static inline int tftp(const int cmd, const struct hostent *host,
                                 }
                                 /* FIXME:
                                  * we should send ERROR 8 */
-                                error_msg("bad server option");
+                                bb_error_msg("bad server option");
                                 break;
                         }
 
-                        error_msg("warning: blksize not supported by server"
+                        bb_error_msg("warning: blksize not supported by server"
                                   " - reverting to 512");
 
                         tftp_bufsize = TFTP_BLOCKSIZE_DEFAULT + 4;
@@ -443,11 +439,11 @@ static inline int tftp(const int cmd, const struct hostent *host,
                if (cmd_get && (opcode == TFTP_DATA)) {
 
                        if (tmp == block_nr) {
-                           
-                               len = write(localfd, &buf[4], len - 4);
+
+                               len = bb_full_write(localfd, &buf[4], len - 4);
 
                                if (len < 0) {
-                                       perror_msg("write");
+                                       bb_perror_msg("write");
                                        break;
                                }
 
@@ -458,11 +454,22 @@ static inline int tftp(const int cmd, const struct hostent *host,
                                opcode = TFTP_ACK;
                                continue;
                        }
+                       /* in case the last ack disappeared into the ether */
+                       if ( tmp == (block_nr - 1) ) {
+                               --block_nr;
+                               opcode = TFTP_ACK;
+                               continue;
+                       } else if (tmp + 1 == block_nr) {
+                               /* Server lost our TFTP_ACK.  Resend it */
+                               block_nr = tmp;
+                               opcode = TFTP_ACK;
+                               continue;
+                       }
                }
 
                if (cmd_put && (opcode == TFTP_ACK)) {
 
-                       if (tmp == (block_nr - 1)) {
+                       if (tmp == (unsigned short)(block_nr - 1)) {
                                if (finished) {
                                        break;
                                }
@@ -476,7 +483,7 @@ static inline int tftp(const int cmd, const struct hostent *host,
 #ifdef CONFIG_FEATURE_CLEAN_UP
        close(socketfd);
 
-        free(buf);
+       free(buf);
 #endif
 
        return finished ? EXIT_SUCCESS : EXIT_FAILURE;
@@ -485,92 +492,92 @@ static inline int tftp(const int cmd, const struct hostent *host,
 int tftp_main(int argc, char **argv)
 {
        struct hostent *host = NULL;
-       char *localfile = NULL;
-       char *remotefile = NULL;
-       int port = 69;
+       const char *localfile = NULL;
+       const char *remotefile = NULL;
+       int port;
        int cmd = 0;
        int fd = -1;
        int flags = 0;
-       int opt;
        int result;
        int blocksize = TFTP_BLOCKSIZE_DEFAULT;
 
        /* figure out what to pass to getopt */
 
 #ifdef CONFIG_FEATURE_TFTP_BLOCKSIZE
+       char *sblocksize = NULL;
 #define BS "b:"
+#define BS_ARG , &sblocksize
 #else
 #define BS
+#define BS_ARG
 #endif
 
 #ifdef CONFIG_FEATURE_TFTP_GET
 #define GET "g"
+#define GET_COMPL ":g"
 #else
-#define GET 
+#define GET
+#define GET_COMPL
 #endif
 
 #ifdef CONFIG_FEATURE_TFTP_PUT
 #define PUT "p"
+#define PUT_COMPL ":p"
 #else
-#define PUT 
+#define PUT
+#define PUT_COMPL
 #endif
 
-       while ((opt = getopt(argc, argv, BS GET PUT "l:r:")) != -1) {
-               switch (opt) {
+#if defined(CONFIG_FEATURE_TFTP_GET) && defined(CONFIG_FEATURE_TFTP_PUT)
+       bb_opt_complementally = GET_COMPL PUT_COMPL ":?g--p:p--g";
+#elif defined(CONFIG_FEATURE_TFTP_GET) || defined(CONFIG_FEATURE_TFTP_PUT)
+       bb_opt_complementally = GET_COMPL PUT_COMPL;
+#else
+       /* XXX: may be should #error ? */
+#endif
+
+
+       cmd = bb_getopt_ulflags(argc, argv, GET PUT "l:r:" BS,
+                               &localfile, &remotefile BS_ARG);
 #ifdef CONFIG_FEATURE_TFTP_BLOCKSIZE
-               case 'b':
-                       blocksize = atoi(optarg);
-                       if (!tftp_blocksize_check(blocksize, 0)) {
-                                return EXIT_FAILURE;
-                       }
-                       break;
+       if(sblocksize) {
+               blocksize = atoi(sblocksize);
+               if (!tftp_blocksize_check(blocksize, 0)) {
+                       return EXIT_FAILURE;
+               }
+       }
 #endif
+
+       cmd &= (tftp_cmd_get | tftp_cmd_put);
 #ifdef CONFIG_FEATURE_TFTP_GET
-               case 'g':
-                       cmd = tftp_cmd_get;
-                       flags = O_WRONLY | O_CREAT;
-                       break;
+       if(cmd == tftp_cmd_get)
+               flags = O_WRONLY | O_CREAT | O_TRUNC;
 #endif
 #ifdef CONFIG_FEATURE_TFTP_PUT
-               case 'p':
-                       cmd = tftp_cmd_put;
-                       flags = O_RDONLY;
-                       break;
+       if(cmd == tftp_cmd_put)
+               flags = O_RDONLY;
 #endif
-               case 'l': 
-                       localfile = xstrdup(optarg);
-                       break;
-               case 'r':
-                       remotefile = xstrdup(optarg);
-                       break;
-               }
-       }
 
-       if ((cmd == 0) || (optind == argc)) {
-               show_usage();
-       }
-       if(localfile && strcmp(localfile, "-") == 0) {
-           fd = fileno((cmd==tftp_cmd_get)? stdout : stdin);
-       }
        if(localfile == NULL)
            localfile = remotefile;
        if(remotefile == NULL)
            remotefile = localfile;
-       if (fd==-1) {
+       /* XXX: I corrected this, but may be wrong too. vodz */
+       if(localfile==NULL || strcmp(localfile, "-") == 0) {
+           fd = fileno((cmd==tftp_cmd_get)? stdout : stdin);
+       } else if (fd==-1) {
            fd = open(localfile, flags, 0644);
        }
        if (fd < 0) {
-               perror_msg_and_die("local file");
+               bb_perror_msg_and_die("local file");
        }
 
+       /* XXX: argv[optind] and/or argv[optind + 1] may be NULL! */
        host = xgethostbyname(argv[optind]);
-
-       if (optind + 2 == argc) {
-               port = atoi(argv[optind + 1]);
-       }
+       port = bb_lookup_port(argv[optind + 1], "udp", 69);
 
 #ifdef CONFIG_FEATURE_TFTP_DEBUG
-       printf("using server \"%s\", remotefile \"%s\", "
+       fprintf(stderr, "using server \"%s\", remotefile \"%s\", "
                "localfile \"%s\".\n",
                inet_ntoa(*((struct in_addr *) host->h_addr)),
                remotefile, localfile);
@@ -579,7 +586,7 @@ int tftp_main(int argc, char **argv)
        result = tftp(cmd, host, remotefile, fd, port, blocksize);
 
 #ifdef CONFIG_FEATURE_CLEAN_UP
-       if (!(fd == fileno(stdout) || fd == fileno(stdin))) {
+       if (!(fd == STDOUT_FILENO || fd == STDIN_FILENO)) {
            close(fd);
        }
 #endif