added "more" command

[unix-history] / usr / src / usr.bin / tftp / tftp.c

diff --git a/usr/src/usr.bin/tftp/tftp.c b/usr/src/usr.bin/tftp/tftp.c
index c2bd1ee..e1a7e76 100644 (file)
--- a/usr/src/usr.bin/tftp/tftp.c
+++ b/usr/src/usr.bin/tftp/tftp.c
@@ -1,4 +1,12 @@
-/*     tftp.c  4.6     83/06/12        */
+/*
+ * Copyright (c) 1983 Regents of the University of California.
+ * All rights reserved.  The Berkeley software License Agreement
+ * specifies the terms and conditions for redistribution.
+ */
+
+#ifndef lint
+static char sccsid[] = "@(#)tftp.c     5.1 (Berkeley) %G%";
+#endif not lint

 
 /*
  * TFTP User Program -- Protocol Machines
 
 /*
  * TFTP User Program -- Protocol Machines


@@ -7,22 +15,23 @@
 #include <sys/socket.h>
 
 #include <netinet/in.h>
 #include <sys/socket.h>
 
 #include <netinet/in.h>

-
+#include <arpa/inet.h>

 #include <arpa/tftp.h>
 
 #include <signal.h>
 #include <stdio.h>
 #include <errno.h>
 #include <setjmp.h>
 #include <arpa/tftp.h>
 
 #include <signal.h>
 #include <stdio.h>
 #include <errno.h>
 #include <setjmp.h>

+#include <netdb.h>

 
 extern int errno;
 extern struct sockaddr_in sin;
 extern char mode[];
 int    f;
 int    trace;
 
 extern int errno;
 extern struct sockaddr_in sin;
 extern char mode[];
 int    f;
 int    trace;

-int    verbose;

 int    connected;
 int    connected;

-char   buf[BUFSIZ];
+char   sbuf[BUFSIZ];                   /* send buffer */
+char   rbuf[BUFSIZ];                   /* receive buffer */

 int    rexmtval;
 int    maxtimeout;
 int    timeout;
 int    rexmtval;
 int    maxtimeout;
 int    timeout;


@@ -47,67 +56,86 @@ sendfile(fd, name)
        int fd;
        char *name;
 {
        int fd;
        char *name;
 {

-       register struct tftphdr *tp = (struct tftphdr *)buf;
+       register struct tftphdr *stp = (struct tftphdr *)sbuf;
+       register struct tftphdr *rtp = (struct tftphdr *)rbuf;

        register int block = 0, size, n, amount = 0;
        register int block = 0, size, n, amount = 0;

-       struct sockaddr_in from;
+       struct sockaddr_in from, to;

        time_t start = time(0), delta;
        time_t start = time(0), delta;

-       int fromlen;
+       int fromlen, aborted = 0;

 
 

+       to = sin;

        signal(SIGALRM, timer);
        do {
                if (block == 0)
                        size = makerequest(WRQ, name) - 4;
                else {
        signal(SIGALRM, timer);
        do {
                if (block == 0)
                        size = makerequest(WRQ, name) - 4;
                else {

-                       size = read(fd, tp->th_data, SEGSIZE);
+                       size = read(fd, stp->th_data, SEGSIZE);

                        if (size < 0) {
                        if (size < 0) {

-                               nak(errno + 100);
+                               nak(&to, errno + 100);

                                break;
                        }
                                break;
                        }

-                       tp->th_opcode = htons((u_short)DATA);
-                       tp->th_block = htons((u_short)block);
+                       stp->th_opcode = htons((u_short)DATA);
+                       stp->th_block = htons((u_short)block);

                }
                timeout = 0;
                (void) setjmp(timeoutbuf);
                if (trace)
                }
                timeout = 0;
                (void) setjmp(timeoutbuf);
                if (trace)

-                       tpacket("sent", tp, size + 4);
-               n = sendto(f, buf, size + 4, 0, (caddr_t)&sin, sizeof (sin));
+                       tpacket("sent", &to, stp, size + 4);
+               n = sendto(f, sbuf, size + 4, 0, (caddr_t)&to, sizeof (to));

                if (n != size + 4) {
                        perror("tftp: sendto");
                if (n != size + 4) {
                        perror("tftp: sendto");

-                       goto abort;
+                       aborted = 1;
+                       goto done;

                }
                do {
                }
                do {

+again:

                        alarm(rexmtval);
                        do {
                                fromlen = sizeof (from);
                        alarm(rexmtval);
                        do {
                                fromlen = sizeof (from);

-                               n = recvfrom(f, buf, sizeof (buf), 0,
+                               n = recvfrom(f, rbuf, sizeof (rbuf), 0,

                                    (caddr_t)&from, &fromlen);
                        } while (n <= 0);
                        alarm(0);
                        if (n < 0) {
                                perror("tftp: recvfrom");
                                    (caddr_t)&from, &fromlen);
                        } while (n <= 0);
                        alarm(0);
                        if (n < 0) {
                                perror("tftp: recvfrom");

-                               goto abort;
+                               aborted = 1;
+                               goto done;
+                       }
+                       if (to.sin_addr.s_addr != from.sin_addr.s_addr) {
+                               tpacket("discarded (wrong host)",
+                                   &from, rtp, n);
+                               goto again;
+                       }
+                       if (to.sin_port = sin.sin_port)
+                               to.sin_port = from.sin_port;
+                       if (to.sin_port != from.sin_port) {
+                               tpacket("discarded (wrong port)",
+                                   &from, rtp, n);
+                               goto again;

                        }
                        if (trace)
                        }
                        if (trace)

-                               tpacket("received", tp, n);
+                               tpacket("received", &from, rtp, n);

                        /* should verify packet came from server */
                        /* should verify packet came from server */

-                       tp->th_opcode = ntohs(tp->th_opcode);
-                       tp->th_block = ntohs(tp->th_block);
-                       if (tp->th_opcode == ERROR) {
-                               printf("Error code %d: %s\n", tp->th_code,
-                                       tp->th_msg);
-                               goto abort;
+                       rtp->th_opcode = ntohs(rtp->th_opcode);
+                       rtp->th_block = ntohs(rtp->th_block);
+                       if (rtp->th_opcode == ERROR) {
+                               printf("Error code %d: %s\n", rtp->th_code,
+                                       rtp->th_msg);
+                               aborted = 1;
+                               goto done;

                        }
                        }

-               } while (tp->th_opcode != ACK && block != tp->th_block);
+               } while (rtp->th_opcode != ACK && block != rtp->th_block);

                if (block > 0)
                        amount += size;
                block++;
        } while (size == SEGSIZE || block == 1);
                if (block > 0)
                        amount += size;
                block++;
        } while (size == SEGSIZE || block == 1);

-abort:
-       (void) close(fd);
-       if (amount > 0) {
+       if (!aborted && amount > 0) {

                delta = time(0) - start;
                printf("Sent %d bytes in %d seconds.\n", amount, delta);
        }
                delta = time(0) - start;
                printf("Sent %d bytes in %d seconds.\n", amount, delta);
        }

+done:
+       (void) close(fd);
+       return (aborted);

 }
 
 /*
 }
 
 /*


@@ -117,91 +145,112 @@ recvfile(fd, name)
        int fd;
        char *name;
 {
        int fd;
        char *name;
 {

-       register struct tftphdr *tp = (struct tftphdr *)buf;
+       register struct tftphdr *stp = (struct tftphdr *)sbuf;
+       register struct tftphdr *rtp = (struct tftphdr *)rbuf;

        register int block = 1, n, size, amount = 0;
        register int block = 1, n, size, amount = 0;

-       struct sockaddr_in from;
+       struct sockaddr_in from, to;

        time_t start = time(0), delta;
        time_t start = time(0), delta;

-       int fromlen, firsttrip = 1;
+       int fromlen, firsttrip = 1, aborted = 0;

 
 

+       to = sin;

        signal(SIGALRM, timer);
        do {
                if (firsttrip) {
                        size = makerequest(RRQ, name);
                        firsttrip = 0;
                } else {
        signal(SIGALRM, timer);
        do {
                if (firsttrip) {
                        size = makerequest(RRQ, name);
                        firsttrip = 0;
                } else {

-                       tp->th_opcode = htons((u_short)ACK);
-                       tp->th_block = htons((u_short)(block));
+                       stp->th_opcode = htons((u_short)ACK);
+                       stp->th_block = htons((u_short)(block));

                        size = 4;
                        block++;
                }
                timeout = 0;
                (void) setjmp(timeoutbuf);
                if (trace)
                        size = 4;
                        block++;
                }
                timeout = 0;
                (void) setjmp(timeoutbuf);
                if (trace)

-                       tpacket("sent", tp, size);
-               if (sendto(f, buf, size, 0, (caddr_t)&sin,
-                   sizeof (sin)) != size) {
+                       tpacket("sent", &to, stp, size);
+               if (sendto(f, sbuf, size, 0, (caddr_t)&to,
+                   sizeof (to)) != size) {

                        alarm(0);
                        perror("tftp: sendto");
                        alarm(0);
                        perror("tftp: sendto");

-                       goto abort;
+                       aborted = 1;
+                       goto done;

                }
                do {
                }
                do {

+again:

                        alarm(rexmtval);
                        alarm(rexmtval);

-                       do
-                               n = recvfrom(f, buf, sizeof (buf), 0,
+                       do {
+                               fromlen = sizeof (from);
+                               n = recvfrom(f, rbuf, sizeof (rbuf), 0,

                                    (caddr_t)&from, &fromlen);
                                    (caddr_t)&from, &fromlen);

-                       while (n <= 0);
+                       } while (n <= 0);

                        alarm(0);
                        if (n < 0) {
                                perror("tftp: recvfrom");
                        alarm(0);
                        if (n < 0) {
                                perror("tftp: recvfrom");

-                               goto abort;
+                               aborted = 1;
+                               goto done;
+                       }
+                       if (to.sin_addr.s_addr != from.sin_addr.s_addr) {
+                               tpacket("discarded (wrong host)",
+                                   &from, rtp, n);
+                               goto again;
+                       }
+                       if (to.sin_port = sin.sin_port)
+                               to.sin_port = from.sin_port;
+                       if (to.sin_port != from.sin_port) {
+                               tpacket("discarded (wrong port)",
+                                   &from, rtp, n);
+                               goto again;

                        }
                        if (trace)
                        }
                        if (trace)

-                               tpacket("received", tp, n);
-                       /* should verify client address */
-                       tp->th_opcode = ntohs(tp->th_opcode);
-                       tp->th_block = ntohs(tp->th_block);
-                       if (tp->th_opcode == ERROR) {
-                               printf("Error code %d: %s\n", tp->th_code,
-                                       tp->th_msg);
-                               goto abort;
+                               tpacket("received", &from, rtp, n);
+                       rtp->th_opcode = ntohs(rtp->th_opcode);
+                       rtp->th_block = ntohs(rtp->th_block);
+                       if (rtp->th_opcode == ERROR) {
+                               printf("Error code %d: %s\n", rtp->th_code,
+                                       rtp->th_msg);
+                               aborted = 1;
+                               goto done;

                        }
                        }

-               } while (tp->th_opcode != DATA && block != tp->th_block);
-               size = write(fd, tp->th_data, n - 4);
+               } while (rtp->th_opcode != DATA && rtp->th_block != block);
+               size = write(fd, rtp->th_data, n - 4);

                if (size < 0) {
                if (size < 0) {

-                       nak(errno + 100);
-                       break;
+                       perror("tftp: write");
+                       nak(&to, errno + 100);
+                       aborted = 1;
+                       goto done;

                }
                amount += size;
        } while (size == SEGSIZE);
                }
                amount += size;
        } while (size == SEGSIZE);

-abort:
-       tp->th_opcode = htons((u_short)ACK);
-       tp->th_block = htons((u_short)block);
-       (void) sendto(f, buf, 4, 0, &sin, sizeof (sin));
+done:
+       stp->th_opcode = htons((u_short)ACK);
+       stp->th_block = htons((u_short)block);
+       (void) sendto(f, sbuf, 4, 0, &to, sizeof (to));

        (void) close(fd);
        (void) close(fd);

-       if (amount > 0) {
+       if (!aborted && amount > 0) {

                delta = time(0) - start;
                printf("Received %d bytes in %d seconds.\n", amount, delta);
        }
                delta = time(0) - start;
                printf("Received %d bytes in %d seconds.\n", amount, delta);
        }

+       return (aborted);

 }
 
 makerequest(request, name)
        int request;
        char *name;
 {
 }
 
 makerequest(request, name)
        int request;
        char *name;
 {

-       register struct tftphdr *tp;
+       register struct tftphdr *stp;

        int size;
        register char *cp;
 
        int size;
        register char *cp;
 

-       tp = (struct tftphdr *)buf;
-       tp->th_opcode = htons((u_short)request);
-       strcpy(tp->th_stuff, name);
+       stp = (struct tftphdr *)sbuf;
+       stp->th_opcode = htons((u_short)request);
+       strcpy(stp->th_stuff, name);

        size = strlen(name);
        size = strlen(name);

-       cp = tp->th_stuff + strlen(name);
+       cp = stp->th_stuff + strlen(name);

        *cp++ = '\0';
        strcpy(cp, mode);
        cp += sizeof ("netascii") - 1;
        *cp++ = '\0';
        *cp++ = '\0';
        strcpy(cp, mode);
        cp += sizeof ("netascii") - 1;
        *cp++ = '\0';

-       return (cp - buf);
+       return (cp - sbuf);

 }
 
 struct errmsg {
 }
 
 struct errmsg {


@@ -225,31 +274,33 @@ struct errmsg {
  * standard TFTP codes, or a UNIX errno
  * offset by 100.
  */
  * standard TFTP codes, or a UNIX errno
  * offset by 100.
  */

-nak(error)
+nak(to, error)
+       struct sockaddr_in *to;

        int error;
 {
        int error;
 {

-       register struct tftphdr *tp;
+       register struct tftphdr *stp;

        int length;
        register struct errmsg *pe;
        extern char *sys_errlist[];
 
        int length;
        register struct errmsg *pe;
        extern char *sys_errlist[];
 

-       tp = (struct tftphdr *)buf;
-       tp->th_opcode = htons((u_short)ERROR);
-       tp->th_code = htons((u_short)error);
+       stp = (struct tftphdr *)sbuf;
+       stp->th_opcode = htons((u_short)ERROR);
+       stp->th_code = htons((u_short)error);

        for (pe = errmsgs; pe->e_code >= 0; pe++)
                if (pe->e_code == error)
                        break;
        if (pe->e_code < 0)
                pe->e_msg = sys_errlist[error - 100];
        for (pe = errmsgs; pe->e_code >= 0; pe++)
                if (pe->e_code == error)
                        break;
        if (pe->e_code < 0)
                pe->e_msg = sys_errlist[error - 100];

-       strcpy(tp->th_msg, pe->e_msg);
+       strcpy(stp->th_msg, pe->e_msg);

        length = strlen(pe->e_msg) + 4;
        if (trace)
        length = strlen(pe->e_msg) + 4;
        if (trace)

-               tpacket("sent", tp, length);
-       if (send(f, &sin, buf, length) != length)
-               perror("nak");
+               tpacket("sent", to, stp, length);
+       if (sendto(f, sbuf, length, 0, to, sizeof (*to)) != length)
+               perror("tftp: nak");

 }
 
 }
 

-tpacket(s, tp, n)
+tpacket(s, sin, tp, n)
+       struct sockaddr_in *sin;

        struct tftphdr *tp;
        int n;
 {
        struct tftphdr *tp;
        int n;
 {


@@ -259,10 +310,19 @@ tpacket(s, tp, n)
        u_short op = ntohs(tp->th_opcode);
        char *index();
 
        u_short op = ntohs(tp->th_opcode);
        char *index();
 

+       printf("%s ", s);
+       if (sin) {
+               struct hostent *hp = gethostbyaddr(&sin->sin_addr,
+                    sizeof (sin->sin_addr), AF_INET);
+
+               printf("%s.%d ",
+                   hp == 0 ? inet_ntoa(sin->sin_addr) : hp->h_name,
+                   ntohs(sin->sin_port));
+       }

        if (op < RRQ || op > ERROR)
        if (op < RRQ || op > ERROR)

-               printf("%s opcode=%x ", s, op);
+               printf("opcode=%x ", op);

        else
        else

-               printf("%s %s ", s, opcodes[op]);
+               printf("%s ", opcodes[op]);

        switch (op) {
 
        case RRQ:
        switch (op) {
 
        case RRQ:


@@ -284,5 +344,9 @@ tpacket(s, tp, n)
        case ERROR:
                printf("<code=%d, msg=%s>\n", ntohs(tp->th_code), tp->th_msg);
                break;
        case ERROR:
                printf("<code=%d, msg=%s>\n", ntohs(tp->th_code), tp->th_msg);
                break;

+
+       default:
+               putchar('\n');
+               break;

        }
 }
        }
 }