remove gcc warning

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

diff --git a/include/atalk/dsi.h b/include/atalk/dsi.h
index f30a90ee27219b823368e8e29ea3b7d3751543f5..13609048191226e6e972d15409b7bf163899d23d 100644 (file)
--- a/include/atalk/dsi.h
+++ b/include/atalk/dsi.h
@@ -49,7 +49,7 @@ struct dsi_block {
   u_int32_t dsi_reserved;   /* reserved field */
 };
 
-#define DSI_CMDSIZ        800
+#define DSI_CMDSIZ        8192 
 #define DSI_DATASIZ       8192
 /* child and parent processes might interpret a couple of these
  * differently. */
@@ -57,14 +57,19 @@ typedef struct DSI {
   dsi_proto protocol;
   struct dsi_block header;
   struct sockaddr_in server, client;
-  sigset_t sigblockset;
+  
+  sigset_t sigblockset, oldset;
+  int      sigblocked;
   struct itimerval timer, savetimer;
+  
   u_int32_t attn_quantum, datasize, server_quantum;
   u_int16_t serverID, clientID;
-  u_int8_t *status, commands[DSI_CMDSIZ], data[DSI_DATASIZ];
-  int statuslen;
-  unsigned int datalen, cmdlen;
+  char      *status;
+  u_int8_t  commands[DSI_CMDSIZ], data[DSI_DATASIZ];
+  size_t statuslen;
+  size_t datalen, cmdlen;
   size_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;
   const char *program; 
@@ -75,6 +80,20 @@ typedef struct DSI {
    * write/read just write/read data */
   pid_t  (*proto_open)(struct DSI *);
   void   (*proto_close)(struct DSI *);
+
+  /* url registered with slpd */
+#ifdef USE_SRVLOC
+  char srvloc_url[512];
+#endif 
+
+  /* buffer for OSX deadlock */
+  int noblocking;
+  char *buffer;
+  char *start;
+  char *eof;
+  char *end;
+  int  maxsize;
+
 } DSI;
   
 /* DSI flags */
@@ -111,9 +130,9 @@ typedef struct DSI {
 
 /* server and client quanta */
 #define DSI_DEFQUANT        2           /* default attention quantum size */
-#define DSI_SERVQUANT_MAX   0xffffffffL /* server quantum */
-#define DSI_SERVQUANT_MIN   0x0004A2E0L /* minimum server quantum */
-#define DSI_SERVQUANT_DEF   DSI_SERVQUANT_MIN /* default server quantum */
+#define DSI_SERVQUANT_MAX   0xffffffff  /* server quantum */
+#define DSI_SERVQUANT_MIN   32000       /* minimum server quantum */
+#define DSI_SERVQUANT_DEF   0x0004A2E0L /* default server quantum */
 
 /* default port number */
 #define DSI_AFPOVERTCP_PORT 548
@@ -124,7 +143,7 @@ extern DSI *dsi_init __P((const dsi_proto /*protocol*/,
                          const char * /*host*/, const char * /*address*/,
                          const int /*port*/, const int /*proxy*/,
                          const u_int32_t /* server quantum */));
-extern void dsi_setstatus __P((DSI *, u_int8_t *, const int));
+extern void dsi_setstatus __P((DSI *, char *, const size_t));
 
 /* in dsi_getsess.c */
 extern DSI *dsi_getsession __P((DSI *, server_child *, const int));
@@ -138,9 +157,13 @@ extern int  dsi_cmdreply __P((DSI *, const int));
 extern int dsi_tickle __P((DSI *));
 extern void dsi_getstatus __P((DSI *));
 extern void dsi_close __P((DSI *));
+extern void dsi_sleep __P((DSI *, const int ));
+
+/* set, unset socket blocking mode */
+extern int dsi_block __P((DSI *, const int));
 
 /* low-level stream commands -- in dsi_stream.c */
-extern size_t dsi_stream_write __P((DSI *, void *, const size_t));
+extern size_t dsi_stream_write __P((DSI *, void *, const size_t, const int mode));
 extern size_t dsi_stream_read __P((DSI *, void *, const size_t));
 extern int dsi_stream_send __P((DSI *, void *, size_t));
 extern int dsi_stream_receive __P((DSI *, void *, const size_t, size_t *));