Merge master

[netatalk.git] / etc / afpd / status.h

diff --git a/etc/afpd/status.h b/etc/afpd/status.h
index 3a51a57ddc825a58053bbf8074600a11313d37e9..6bae26fa6c8bc7b98c2bcb50c5252684a050c64a 100644 (file)
--- a/etc/afpd/status.h
+++ b/etc/afpd/status.h
@@ -1,14 +1,9 @@
-/*
- * $Id: status.h,v 1.3 2001-06-20 18:33:04 rufustfirefly Exp $
- */
-
 #ifndef AFPD_STATUS_H
 #define AFPD_STATUS_H 1
 
-#include <sys/cdefs.h>
 #include <atalk/dsi.h>
-#include <atalk/asp.h>
-#include "globals.h"
+#include <atalk/globals.h>
+
 #include "afp_config.h"
 
 /* we use these to prevent whacky alignment problems */
@@ -17,8 +12,20 @@
 #define AFPSTATUS_UAMSOFF     4
 #define AFPSTATUS_ICONOFF     6
 #define AFPSTATUS_FLAGOFF     8
+/* AFPSTATUS_PRELEN is the number of bytes for status data prior to 
+ * the ServerName field.
+ *
+ * This is two bytes of offset space for the MachineType, AFPVersionCount,
+ * UAMCount, VolumeIconAndMask, and the 16-bit "Fixed" status flags.
+ */
 #define AFPSTATUS_PRELEN     10
-#define AFPSTATUS_POSTLEN     4
+/* AFPSTATUS_POSTLEN is the number of bytes for offset records
+ * after the ServerName field.
+ *
+ * Right now, this is 2 bytes each for ServerSignature, networkAddressCount,
+ * DirectoryNameCount, and UTF-8 ServerName
+ */
+#define AFPSTATUS_POSTLEN     8
 #define AFPSTATUS_LEN        (AFPSTATUS_PRELEN + AFPSTATUS_POSTLEN)
 
 
@@ -27,10 +34,12 @@
 #define PASSWD_NOSAVE  (1 << 1)
 #define PASSWD_ALL     (PASSWD_SET | PASSWD_NOSAVE)
 
-extern void status_versions __P((char * /*status*/));
-extern void status_uams __P((char * /*status*/, const char * /*authlist*/));
-extern const void status_init __P((AFPConfig *, AFPConfig *,
-                                  const struct afp_options *));
-extern int      afp_getsrvrinfo __P((AFPObj *, char *, int, char *, int *));
+extern void status_versions (char * /*status*/, const DSI *);
+extern void status_uams (char * /*status*/, const char * /*authlist*/);
+extern void status_init (AFPConfig *, const struct afp_options *);
+extern void set_signature(struct afp_options *);
+
+/* FP functions */
+int afp_getsrvrinfo (AFPObj *obj, char *ibuf, size_t ibuflen, char *rbuf,  size_t *rbuflen);
 
 #endif