diff options
| -rw-r--r-- | include/arpa/tftp.h | 5 | ||||
| -rw-r--r-- | libexec/tftpd/tftpd.c | 8 | ||||
| -rw-r--r-- | usr.bin/tftp/extern.h | 6 |
3 files changed, 12 insertions, 7 deletions
diff --git a/include/arpa/tftp.h b/include/arpa/tftp.h index 8f9d4b89dc1..c1e6b7e8ea2 100644 --- a/include/arpa/tftp.h +++ b/include/arpa/tftp.h @@ -1,4 +1,4 @@ -/* $OpenBSD: tftp.h,v 1.7 2006/07/26 09:10:03 mglocker Exp $ */ +/* $OpenBSD: tftp.h,v 1.8 2006/07/26 16:43:30 deraadt Exp $ */ /* $NetBSD: tftp.h,v 1.3 1994/10/26 00:56:48 cgd Exp $ */ /* @@ -41,9 +41,6 @@ #define SEGSIZE 512 /* data segment size */ #define SEGSIZE_MIN 8 /* minimal data segment size */ #define SEGSIZE_MAX 65464 /* maximal data segment size */ -#define TIMEOUT 5 /* packet rexmt timeout */ -#define TIMEOUT_MIN 1 /* minimal packet rexmt timeout */ -#define TIMEOUT_MAX 255 /* maximal packet rexmt timeout */ /* * Packet types. diff --git a/libexec/tftpd/tftpd.c b/libexec/tftpd/tftpd.c index 0aadbcd6e87..465eb77b89b 100644 --- a/libexec/tftpd/tftpd.c +++ b/libexec/tftpd/tftpd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tftpd.c,v 1.50 2006/07/26 12:34:41 mglocker Exp $ */ +/* $OpenBSD: tftpd.c,v 1.51 2006/07/26 16:43:31 deraadt Exp $ */ /* * Copyright (c) 1983 Regents of the University of California. @@ -37,7 +37,7 @@ char copyright[] = #ifndef lint /*static char sccsid[] = "from: @(#)tftpd.c 5.13 (Berkeley) 2/26/91";*/ -static char rcsid[] = "$OpenBSD: tftpd.c,v 1.50 2006/07/26 12:34:41 mglocker Exp $"; +static char rcsid[] = "$OpenBSD: tftpd.c,v 1.51 2006/07/26 16:43:31 deraadt Exp $"; #endif /* not lint */ /* @@ -68,6 +68,10 @@ static char rcsid[] = "$OpenBSD: tftpd.c,v 1.50 2006/07/26 12:34:41 mglocker Exp #include <unistd.h> #include <vis.h> +#define TIMEOUT 5 /* packet rexmt timeout */ +#define TIMEOUT_MIN 1 /* minimal packet rexmt timeout */ +#define TIMEOUT_MAX 255 /* maximal packet rexmt timeout */ + struct formats; int readit(FILE *, struct tftphdr **, int, int); diff --git a/usr.bin/tftp/extern.h b/usr.bin/tftp/extern.h index 97b6430f7ae..16e99e39b1d 100644 --- a/usr.bin/tftp/extern.h +++ b/usr.bin/tftp/extern.h @@ -1,4 +1,4 @@ -/* $OpenBSD: extern.h,v 1.4 2003/06/03 02:56:18 millert Exp $ */ +/* $OpenBSD: extern.h,v 1.5 2006/07/26 16:43:31 deraadt Exp $ */ /* $NetBSD: extern.h,v 1.2 1994/12/08 09:51:24 jtc Exp $ */ /* @@ -34,3 +34,7 @@ void recvfile(int, char *, char *); void sendfile(int, char *, char *); + +#define TIMEOUT 5 /* packet rexmt timeout */ +#define TIMEOUT_MIN 1 /* minimal packet rexmt timeout */ +#define TIMEOUT_MAX 255 /* maximal packet rexmt timeout */ |