Use SUSv3 with Extensions, disable more AT

[netatalk.git] / include / atalk / dsi.h

diff --git a/include/atalk/dsi.h b/include/atalk/dsi.h
index 0c40f1f17d38f5cb9d84ab6a2ab821c194b0d8d9..713ed1fba647a49848f5e4fcb5ff6f7deec0f5ee 100644 (file)
--- a/include/atalk/dsi.h
+++ b/include/atalk/dsi.h
@@ -9,6 +9,7 @@
 #include <sys/cdefs.h>
 #include <sys/types.h>
 #include <sys/time.h>
+#include <sys/socket.h>
 #include <signal.h>
 
 #include <netinet/in.h>
@@ -56,7 +57,7 @@ struct dsi_block {
 typedef struct DSI {
   dsi_proto protocol;
   struct dsi_block header;
-  struct sockaddr_in server, client;
+  struct sockaddr_storage server, client;
   
   struct itimerval timer;
 
@@ -72,7 +73,7 @@ typedef struct DSI {
   u_int8_t  commands[DSI_CMDSIZ], data[DSI_DATASIZ];
   size_t statuslen;
   size_t datalen, cmdlen;
-  size_t read_count, write_count;
+  off_t  read_count, write_count;
   int asleep; /* client won't reply AFP 0x7a ? */
   /* inited = initialized?, child = a child?, noreply = send reply? */
   char child, inited, noreply;
@@ -90,6 +91,10 @@ typedef struct DSI {
   char srvloc_url[512];
 #endif 
 
+#ifdef USE_ZEROCONF
+  int zeroconf_registered;
+#endif
+
   /* buffer for OSX deadlock */
   char *buffer;
   char *start;
@@ -144,7 +149,7 @@ typedef struct DSI {
 extern DSI *dsi_init (const dsi_proto /*protocol*/,
                          const char * /*program*/, 
                          const char * /*host*/, const char * /*address*/,
-                         const int /*port*/, const int /*proxy*/,
+                         const char * /*port*/, const int /*proxy*/,
                          const u_int32_t /* server quantum */);
 extern void dsi_setstatus (DSI *, char *, const size_t);