Patches for OpenBSD

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

diff --git a/include/atalk/dsi.h b/include/atalk/dsi.h
index b2e6cd98c66c08f75a4c6e80cd37b27cbb63798e..82da7a1595e517b0b0eea4ad761b4cb68d9dbd43 100644 (file)
--- a/include/atalk/dsi.h
+++ b/include/atalk/dsi.h
@@ -16,6 +16,10 @@
 #include <atalk/server_child.h>
 #include <netatalk/endian.h>
 
+#ifdef __OpenBSD__
+#include <sys/socket.h>
+#endif
+
 /* What a DSI packet looks like:
  0                               32
  |-------------------------------|
@@ -56,16 +60,15 @@ struct dsi_block {
 typedef struct DSI {
   dsi_proto protocol;
   struct dsi_block header;
-  struct sockaddr_in server, client;
+  struct sockaddr_storage server, client;
   
-  sigset_t sigblockset, oldset;
-  int      sigblocked;
   struct itimerval timer;
 
   int     in_write;      /* in the middle of writing multiple packets, signal handlers
                           * can't write to the socket 
                          */
   int      msg_request;   /* pending message to the client */
+  int      down_request;  /* pending SIGUSR1 down in 5 mn */
 
   u_int32_t attn_quantum, datasize, server_quantum;
   u_int16_t serverID, clientID;
@@ -73,7 +76,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;
@@ -92,7 +95,6 @@ typedef struct DSI {
 #endif 
 
   /* buffer for OSX deadlock */
-  int noblocking;
   char *buffer;
   char *start;
   char *eof;
@@ -146,7 +148,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);
 
@@ -164,15 +166,17 @@ extern void dsi_getstatus (DSI *);
 extern void dsi_close (DSI *);
 extern void dsi_sleep (DSI *, const int );
 
-/* set, unset socket blocking mode */
-extern int dsi_block (DSI *, const int);
-
+#define DSI_NOWAIT 1
 /* low-level stream commands -- in dsi_stream.c */
-extern size_t dsi_stream_write (DSI *, void *, const size_t, const int mode);
+extern ssize_t dsi_stream_write (DSI *, void *, const size_t, const int mode);
 extern size_t dsi_stream_read (DSI *, void *, const size_t);
 extern int dsi_stream_send (DSI *, void *, size_t);
 extern int dsi_stream_receive (DSI *, void *, const size_t, size_t *);
 
+#ifdef WITH_SENDFILE
+extern ssize_t dsi_stream_read_file(DSI *, int, off_t off, const size_t len);
+#endif
+
 /* client writes -- dsi_write.c */
 extern size_t dsi_writeinit (DSI *, void *, const size_t);
 extern size_t dsi_write (DSI *, void *, const size_t);