- 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 e367fe0ce500c656e8e1fd007b8a20b775ac8273..407b94d0f89ab687e524d07926049b33d4555884 100644 (file)
--- a/libatalk/netddp/netddp_sendto.c
+++ b/libatalk/netddp/netddp_sendto.c
@@ -1,5 +1,5 @@
 /* 
- * $Id: netddp_sendto.c,v 1.4 2001-11-25 21:55:10 srittau Exp $
+ * $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.
@@ -12,8 +12,6 @@
 #include "config.h"
 #endif /* HAVE_CONFIG_H */
 
-static int _netddp_sendto_dummy;
-
 #ifndef NO_DDP
 #include <string.h>
 #ifdef HAVE_UNISTD_H
@@ -39,7 +37,7 @@ static int _netddp_sendto_dummy;
 #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;
@@ -56,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;