X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=include%2Fatalk%2Fdsi.h;h=904bbc1250212cda9f8b3a9d2c0bc843f45cfc03;hb=be96d276348da0a7e66eeec844b306e8a5fa8fac;hp=376e7fc6d058f1f8fc4c49f87ad0281116bf1001;hpb=181e8305cdc7c058e674046650b4da8769bc5e46;p=netatalk.git

diff --git a/include/atalk/dsi.h b/include/atalk/dsi.h
index 376e7fc6..904bbc12 100644
--- a/include/atalk/dsi.h
+++ b/include/atalk/dsi.h
@@ -6,19 +6,15 @@
 #ifndef _ATALK_DSI_H 
 #define _ATALK_DSI_H
 
-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <sys/time.h>
+#include <sys/socket.h>
 #include <signal.h>
+#include <arpa/inet.h>
 
 #include <netinet/in.h>
 #include <atalk/afp.h>
 #include <atalk/server_child.h>
-#include <netatalk/endian.h>
-
-#ifdef __OpenBSD__
-#include <sys/socket.h>
-#endif
 
 /* What a DSI packet looks like:
  0                               32
@@ -61,9 +57,8 @@ typedef struct DSI {
   dsi_proto protocol;
   struct dsi_block header;
   struct sockaddr_storage server, client;
-  
   struct itimerval timer;
-
+  int      tickle;        /* tickle count */
   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 */
@@ -76,10 +71,7 @@ typedef struct DSI {
   size_t statuslen;
   size_t datalen, cmdlen;
   off_t  read_count, write_count;
-//  int asleep; /* client won't reply AFP 0x7a ? */
-    uint32_t flags;             /* DSI flags like DSI_SLEEPING, DSI_DISCONNECTED */
-  /* noreply = send reply? */
-  char noreply;
+  uint32_t flags;             /* DSI flags like DSI_SLEEPING, DSI_DISCONNECTED */
   const char *program; 
   int socket, serversock;
 
@@ -155,6 +147,9 @@ typedef struct DSI {
 #define DSI_SLEEPING         (1 << 2) /* we're sleeping after FPZzz */
 #define DSI_DISCONNECTED     (1 << 3) /* we're in diconnected state after a socket error */
 #define DSI_DIE              (1 << 4) /* SIGUSR1, going down in 5 minutes */
+#define DSI_NOREPLY          (1 << 5) /* in dsi_write we generate our own replies */
+#define DSI_RECONSOCKET      (1 << 6) /* we have a new socket from primary reconnect */
+#define DSI_RECONINPROG      (1 << 7) /* used in the new session in reconnect */
 
 /* basic initialization: dsi_init.c */
 extern DSI *dsi_init (const dsi_proto /*protocol*/,