386BSD 0.1 development

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

diff --git a/usr/src/usr.bin/tftp/tftpsubs.c b/usr/src/usr.bin/tftp/tftpsubs.c
index 88d06c5..58832cc 100644 (file)
--- a/usr/src/usr.bin/tftp/tftpsubs.c
+++ b/usr/src/usr.bin/tftp/tftpsubs.c
@@ -1,12 +1,39 @@
 /*
 /*

- * Copyright (c) 1985 Regents of the University of California.
- * All rights reserved.  The Berkeley software License Agreement
- * specifies the terms and conditions for redistribution.
+ * Copyright (c) 1983 Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *     This product includes software developed by the University of
+ *     California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.

  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)tftpsubs.c 5.1 (Berkeley) %G%";
-#endif not lint
+static char sccsid[] = "@(#)tftpsubs.c 5.6 (Berkeley) 2/28/91";
+#endif /* not lint */

 
 /* Simple minded read-ahead/write-behind subroutines for tftp user and
    server.  Written originally with multiple buffers in mind, but current
 
 /* Simple minded read-ahead/write-behind subroutines for tftp user and
    server.  Written originally with multiple buffers in mind, but current


@@ -21,6 +48,7 @@ static char sccsid[] = "@(#)tftpsubs.c        5.1 (Berkeley) %G%";
 
 #include <sys/types.h>
 #include <sys/socket.h>
 
 #include <sys/types.h>
 #include <sys/socket.h>

+#include <sys/ioctl.h>

 #include <netinet/in.h>
 #include <arpa/tftp.h>
 #include <stdio.h>
 #include <netinet/in.h>
 #include <arpa/tftp.h>
 #include <stdio.h>


@@ -203,3 +231,35 @@ skipit:
 }
 
 
 }
 
 

+/* When an error has occurred, it is possible that the two sides
+ * are out of synch.  Ie: that what I think is the other side's
+ * response to packet N is really their response to packet N-1.
+ *
+ * So, to try to prevent that, we flush all the input queued up
+ * for us on the network connection on our host.
+ *
+ * We return the number of packets we flushed (mostly for reporting
+ * when trace is active).
+ */
+
+int
+synchnet(f)
+int    f;              /* socket to flush */
+{
+       int i, j = 0;
+       char rbuf[PKTSIZE];
+       struct sockaddr_in from;
+       int fromlen;
+
+       while (1) {
+               (void) ioctl(f, FIONREAD, &i);
+               if (i) {
+                       j++;
+                       fromlen = sizeof from;
+                       (void) recvfrom(f, rbuf, sizeof (rbuf), 0,
+                               (struct sockaddr *)&from, &fromlen);
+               } else {
+                       return(j);
+               }
+       }
+}