Index: netkit-tftp-0.17/tftp/tftp.c
===================================================================
--- netkit-tftp-0.17.orig/tftp/tftp.c
+++ netkit-tftp-0.17/tftp/tftp.c
@@ -56,6 +56,7 @@ char tftp_rcsid[] =
 #include <setjmp.h>
 #include <unistd.h>
 #include <string.h>
+#include <stddef.h>
 
 #include "tftpsubs.h"
 
@@ -78,7 +79,7 @@ static sigjmp_buf timeoutbuf;
 
 
 static int makerequest(int request, char *name, 
-		       struct tftphdr *tp, char *mode);
+		       char *hdr, char *mode);
 static void nak(int errnor);
 static void tpacket(const char *s, struct tftphdr *tp, int n);
 static void startclock(void);
@@ -126,7 +127,7 @@ sendfile(int fd, char *name, char *mode)
 	mysignal(SIGALRM, timer);
 	do {
 		if (firsttrip) {
-			size = makerequest(WRQ, name, dp, mode) - 4;
+		  size = makerequest(WRQ, name, (char*)dp, mode) - 4;
 		}
 		else {
 		/*      size = read(fd, dp->th_data, SEGSIZE);   */
@@ -238,7 +239,7 @@ recvfile(int fd, char *name, char *mode)
 	mysignal(SIGALRM, timer);
 	do {
 		if (firsttrip) {
-			size = makerequest(RRQ, name, ap, mode);
+			size = makerequest(RRQ, name, ackbuf, mode);
 			firsttrip = 0;
 		} else {
 			ap->th_opcode = htons((u_short)ACK);
@@ -320,12 +321,13 @@ abort:
 }
 
 int
-makerequest(int request, char *name, struct tftphdr *tp, char *mode)
+makerequest(int request, char *name, char *hdr, char *mode)
 {
 	register char *cp;
+	struct tftphdr *tp = (struct tftphdr*)hdr;
 
 	tp->th_opcode = htons((u_short)request);
-	cp = tp->th_stuff;
+	cp = hdr + offsetof(struct tftphdr, th_stuff);
 	strcpy(cp, name);
 	cp += strlen(name);
 	*cp++ = '\0';