- merge branch-netatalk-afp-3x-dev, HEAD was tagged before

[netatalk.git] / libatalk / netddp / netddp_sendto.c

diff --git a/libatalk/netddp/netddp_sendto.c b/libatalk/netddp/netddp_sendto.c
index 3e26e338183e6962f6388cdefbc76cfec9c927f8..407b94d0f89ab687e524d07926049b33d4555884 100644 (file)
--- a/libatalk/netddp/netddp_sendto.c
+++ b/libatalk/netddp/netddp_sendto.c
@@ -1,4 +1,6 @@
 /* 
+ * $Id: netddp_sendto.c,v 1.7 2005-04-28 20:50:02 bfernhomberg Exp $
+ *
  * Copyright (c) 1999 Adrian Sun (asun@zoology.washington.edu)
  * Copyright (c) 1990,1991 Regents of The University of Michigan.
  * All Rights Reserved. See COPYRIGHT.
@@ -6,20 +8,24 @@
  * send data.
  */
 
-static int _netddp_sendto_dummy;
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif /* HAVE_CONFIG_H */
 
 #ifndef NO_DDP
 #include <string.h>
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
+#endif /* HAVE_UNISTD_H */
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/uio.h>
 #include <errno.h>
 
 #ifdef MACOSX_SERVER
-#include <at/appletalk.h>
-#include <at/ddp.h>
-#endif
+#include <netat/appletalk.h>
+#include <netat/ddp.h>
+#endif /* MACOSX_SERVER */
 
 #include <netatalk/at.h>
 #include <netatalk/endian.h>
@@ -28,10 +34,10 @@ static int _netddp_sendto_dummy;
 
 #ifndef MAX
 #define MAX(a, b)  ((a) < (b) ? (b) : (a))
-#endif
+#endif /* ! MAX */
 
 #ifdef MACOSX_SERVER
-int netddp_sendto(int fd, void *buf, int buflen, unsigned int dummy, 
+int netddp_sendto(int fd, void *buf, size_t buflen, unsigned int dummy, 
                  const struct sockaddr *addr, unsigned int addrlen)
 {
     ssize_t i;
@@ -48,7 +54,7 @@ int netddp_sendto(int fd, void *buf, int buflen, unsigned int dummy,
       return -1;
 
     memset(&ddphdr, 0, sizeof(ddphdr));
-    ddphdr.deh_len = htons(sizeof(ddphdr) + buflen);
+    ddphdr.deh_len = htons(sizeof(ddphdr) + (u_int16_t) buflen);
     ddphdr.deh_dnet = sat->sat_addr.s_net;
     ddphdr.deh_dnode = sat->sat_addr.s_node;
     ddphdr.deh_dport = sat->sat_port;