aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--configure.ac2
-rw-r--r--tests/server/tftpd.c27
2 files changed, 26 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac
index 1f2eedde3..11ca84c43 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1434,6 +1434,8 @@ AC_CHECK_HEADERS(
libgen.h \
locale.h \
errno.h \
+ arpa/tftp.h \
+ sys/filio.h \
setjmp.h,
dnl to do if not found
[],
diff --git a/tests/server/tftpd.c b/tests/server/tftpd.c
index f122c9b1e..bc9c82e1c 100644
--- a/tests/server/tftpd.c
+++ b/tests/server/tftpd.c
@@ -49,16 +49,37 @@
*/
#include "setup.h" /* portability help from the lib directory */
+#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_IOCTL_H
#include <sys/ioctl.h>
+#endif
+#ifdef HAVE_SYS_STAT_H
#include <sys/stat.h>
+#endif
+
#include <signal.h>
-#include <fcntl.h>
+#ifdef HAVE_FCNTL_H
+#include <fcntl.h>
+#endif
+#ifdef HAVE_SYS_SOCKET_H
#include <sys/socket.h>
+#endif
+#ifdef HAVE_NETINET_IN_H
#include <netinet/in.h>
+#endif
+#ifdef HAVE_ARPA_TFTP_H
#include <arpa/tftp.h>
+#endif
+#ifdef HAVE_NETDB_H
#include <netdb.h>
+#endif
+#ifdef HAVE_SYS_FILIO_H
+/* FIONREAD on Solaris 7 */
+#include <sys/filio.h>
+#endif
#include <setjmp.h>
#include <stdio.h>
@@ -683,7 +704,7 @@ static void sendfile(struct testcase *test, struct formats *pf)
{
struct tftphdr *dp;
struct tftphdr *ap; /* ack packet */
- u_int16_t block = 1;
+ unsigned short block = 1;
int size, n;
mysignal(SIGALRM, timer);
@@ -752,7 +773,7 @@ static void recvfile(struct testcase *test, struct formats *pf)
{
struct tftphdr *dp;
struct tftphdr *ap; /* ack buffer */
- u_int16_t block = 0;
+ unsigned short block = 0;
int n, size;
mysignal(SIGALRM, timer);