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. */
dsi_proto protocol;
struct dsi_block header;
struct sockaddr_in server, client;
- sigset_t sigblockset;
- struct itimerval timer, savetimer;
+
+ 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;
- 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? */
* 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 */
+ char *buffer;
+ char *start;
+ char *eof;
+ char *end;
+ int maxsize;
+
} DSI;
/* DSI flags */
/* 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
/* basic initialization: dsi_init.c */
-extern DSI *dsi_init __P((const dsi_proto /*protocol*/,
+extern DSI *dsi_init (const dsi_proto /*protocol*/,
const char * /*program*/,
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));
+ const u_int32_t /* server quantum */);
+extern void dsi_setstatus (DSI *, char *, const size_t);
/* in dsi_getsess.c */
-extern DSI *dsi_getsession __P((DSI *, server_child *, const int));
-extern void dsi_kill __P((int));
+extern DSI *dsi_getsession (DSI *, server_child *, const int);
+extern void dsi_kill (int);
/* DSI Commands: individual files */
-extern void dsi_opensession __P((DSI *));
-extern int dsi_attention __P((DSI *, AFPUserBytes));
-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 ));
-
+extern void dsi_opensession (DSI *);
+extern int dsi_attention (DSI *, AFPUserBytes);
+extern int dsi_cmdreply (DSI *, const int);
+extern int dsi_tickle (DSI *);
+extern void dsi_getstatus (DSI *);
+extern void dsi_close (DSI *);
+extern void dsi_sleep (DSI *, const int );
+
+#define DSI_NOWAIT 1
/* 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_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 *));
+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 __P((DSI *, void *, const size_t));
-extern size_t dsi_write __P((DSI *, void *, const size_t));
-extern void dsi_writeflush __P((DSI *));
+extern size_t dsi_writeinit (DSI *, void *, const size_t);
+extern size_t dsi_write (DSI *, void *, const size_t);
+extern void dsi_writeflush (DSI *);
#define dsi_wrtreply(a,b) dsi_cmdreply(a,b)
/* client reads -- dsi_read.c */
-extern ssize_t dsi_readinit __P((DSI *, void *, const size_t, const size_t,
- const int));
-extern ssize_t dsi_read __P((DSI *, void *, const size_t));
-extern void dsi_readdone __P((DSI *));
+extern ssize_t dsi_readinit (DSI *, void *, const size_t, const size_t,
+ const int);
+extern ssize_t dsi_read (DSI *, void *, const size_t);
+extern void dsi_readdone (DSI *);
/* some useful macros */
#define dsi_serverID(x) ((x)->serverID++)