--- tftpd/inc/defs.h	2014/02/20 23:11:18	1.1.1.1.4.6
+++ tftpd/inc/defs.h	2014/02/18 12:46:39	1.2
@@ -3,34 +3,25 @@
 
 
 #ifndef STRSIZ
-#define STRSIZ			256
+#define STRSIZ		256
 #endif
 
-#define DEFAULT_CFGNAME		"/etc/tftpd.conf"
-#define DEFAULT_TIMEOUT		5
-#define TFTP_PKT_MAX		516
-#define TFTP_LOAD_MAX		512
+#define DEFAULT_CFGNAME	"/etc/tftpd.conf"
+#define DEFAULT_TIMEOUT	5
+#define TFTP_PKT_MAX	516
+#define TFTP_LOAD_MAX	512
 
-#define TFTP_OPT_TSIZE		"tsize"
-#define TFTP_OPT_BLKSIZE	"blksize"
-#define TFTP_OPT_BLKSIZE2	"blksize2"
-#define TFTP_OPT_TIMEOUT	"timeout"
-#define TFTP_OPT_ROLLOVER	"rollover"
 
-
 struct tagCli {
 	int		opc;
 	u_short		seq;
-	struct timespec	tout;
-	u_short		roll;
 	int		siz;
-	off_t		tsiz;
 	sockaddr_t	addr;
 	int		fd;
 	char		file[PATH_MAX];
 	char		mode[10];
 	short		close;
-	int		tmp;
+	short		opts;
 };