#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>
/* What a DSI packet looks like:
0 32
#define DSI_CMDSIZ 8192
#define DSI_DATASIZ 8192
+
/* child and parent processes might interpret a couple of these
* differently. */
typedef struct DSI {
dsi_proto protocol;
struct dsi_block header;
- struct sockaddr_in server, client;
-
- sigset_t sigblockset, oldset;
- int sigblocked;
- struct itimerval timer, savetimer;
-
+ 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 */
+ int down_request; /* pending SIGUSR1 down in 5 mn */
+
u_int32_t attn_quantum, datasize, server_quantum;
u_int16_t serverID, clientID;
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;
+ off_t read_count, write_count;
+ uint32_t flags; /* DSI flags like DSI_SLEEPING, DSI_DISCONNECTED */
const char *program;
int socket, serversock;
char srvloc_url[512];
#endif
- /* buffer for OSX deadlock */
- int noblocking;
+#ifdef USE_ZEROCONF
+ char *bonjourname; /* server name as UTF8 maxlen MAXINSTANCENAMELEN */
+ int zeroconf_registered;
+#endif
+
+ /* DSI readahead buffer used for buffered reads in dsi_peek */
+ size_t dsireadbuf; /* size of the DSI readahead buffer used in dsi_peek() */
char *buffer;
char *start;
char *eof;
char *end;
- int maxsize;
-
} DSI;
/* DSI flags */
/* DSI session options */
#define DSIOPT_SERVQUANT 0x00 /* server request quantum */
#define DSIOPT_ATTNQUANT 0x01 /* attention quantum */
+#define DSIOPT_REPLCSIZE 0x02 /* AFP replaycache size supported by the server (that's us) */
/* DSI Commands */
#define DSIFUNC_CLOSE 1 /* DSICloseSession */
/* default port number */
#define DSI_AFPOVERTCP_PORT 548
+/* DSI session State flags */
+#define DSI_DATA (1 << 0) /* we have received a DSI command */
+#define DSI_RUNNING (1 << 1) /* we have received a AFP command */
+#define DSI_SLEEPING (1 << 2) /* we're sleeping after FPZzz */
+#define DSI_EXTSLEEP (1 << 3) /* we're sleeping after FPZzz */
+#define DSI_DISCONNECTED (1 << 4) /* we're in diconnected state after a socket error */
+#define DSI_DIE (1 << 5) /* SIGUSR1, going down in 5 minutes */
+#define DSI_NOREPLY (1 << 6) /* in dsi_write we generate our own replies */
+#define DSI_RECONSOCKET (1 << 7) /* we have a new socket from primary reconnect */
+#define DSI_RECONINPROG (1 << 8) /* used in the new session in reconnect */
+#define DSI_AFP_LOGGED_OUT (1 << 9) /* client called afp_logout, quit on next EOF from socket */
+
/* basic initialization: dsi_init.c */
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);
/* in dsi_getsess.c */
-extern DSI *dsi_getsession (DSI *, server_child *, const int);
+extern afp_child_t *dsi_getsession (DSI *, server_child *, const int);
extern void dsi_kill (int);
extern int dsi_tickle (DSI *);
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);