* shuffled the docs around

[citadel.git] / citadel / citadel.h

diff --git a/citadel/citadel.h b/citadel/citadel.h
index 7c8530945597fc97eba14886add5e617bf4e9635..72819f61ee3cd479b8c8e13cab449398bc9a9149 100644 (file)
--- a/citadel/citadel.h
+++ b/citadel/citadel.h
@@ -8,8 +8,8 @@
 #include "sysdep.h"
 #include "sysconfig.h"
 #include "ipcdef.h"
-#define CITADEL        "Citadel/UX 5.60"
-#define REV_LEVEL 560
+#define CITADEL        "Citadel/UX 5.70"
+#define REV_LEVEL 570
 #define SERVER_TYPE 0  /* zero for stock Citadel/UX; other developers please
                           obtain SERVER_TYPE codes for your implementations */
 
@@ -78,6 +78,8 @@ struct config {
        long c_maxmsglen;               /* Maximum message length           */
        int c_min_workers;              /* Lower limit on number of threads */
        int c_max_workers;              /* Upper limit on number of threads */
+       int c_pop3_port;                /* POP3 listener port (usually 110) */
+       int c_smtp_port;                /* SMTP listener port (usually 25)  */
 };
 
 #define NODENAME               config.c_nodename
@@ -178,14 +180,7 @@ struct quickroom {
 
 /****************************************************************************/
 
-struct recentmsg {
-       char RMnodename[10];
-       long RMnum;                     /* Number or time of message        */
-       };
-
-
-/****************************************************************************
- *
+/*
  * Floor record.  The floor number is implicit in its location in the file.
  */
 struct floor {
@@ -238,35 +233,10 @@ struct floor {
 #define GF_SKIP                1               /* <;S>kip floor mode */
 #define GF_ZAP         2               /* <;Z>ap floor mode */
 
-
-#define BASEROOM       "Lobby"
-#define MAILROOM       "Mail"
-#define AIDEROOM       "Aide"
-#define CONFIGROOM     "My Citadel Config"
-
-#define SPOOLMIME      "application/x-citadel-delivery-list"
-
 /*
- * This structure is used to hold all of the fields of a message
- * during conversion, processing, or whatever.
+ * MIME types used in Citadel for configuration stuff
  */
-struct minfo {
-       char A[512];
-       char B[512];
-       char C[512];
-       char D[512];
-       char E[512];
-       char G[512];
-       char H[512];
-       long I;
-       char N[512];
-       char O[512];
-       char P[512];
-       char R[512];
-       char S[512];
-       long T;
-       char U[512];
-       char Z[512];
-       char nexthop[512];
-       };
+#define SPOOLMIME      "application/x-citadel-delivery-list"
+#define        INTERNETCFG     "application/x-citadel-internet-config"
 
+#define TRACE  lprintf(9, "Checkpoint: %s, %d\n", __FILE__, __LINE__)