X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fserver.h;h=ef7b4aa84e0eb3fadfe8912159039df030b04d8b;hb=fe70bc8314205d9c32da7c73e5bf1c58ee1a67f6;hp=85f6c1cfcec353004632b52ef8bc4361a2d5ef62;hpb=d372b4e08a1b644c76985a89f55e77ab16fe691d;p=citadel.git

diff --git a/citadel/server.h b/citadel/server.h
index 85f6c1cfc..ef7b4aa84 100644
--- a/citadel/server.h
+++ b/citadel/server.h
@@ -1,7 +1,7 @@
 /* 
  * Main declarations file for the Citadel server
  *
- * Copyright (c) 1987-2018 by the citadel.org team
+ * Copyright (c) 1987-2020 by the citadel.org team
  *
  * This program is open source software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License, version 3.
@@ -44,7 +44,7 @@ struct CtdlMessage {
 
 
 /* Data structure returned by validate_recipients() */
-typedef struct __recptypes {
+struct recptypes {
 	int recptypes_magic;
         int num_local;
         int num_internet;
@@ -60,11 +60,10 @@ typedef struct __recptypes {
 	char *bounce_to;
 	char *envelope_from;
 	char *sending_room;
-} recptypes;
+};
 
 #define RECPTYPES_MAGIC 0xfeeb
 
-
 #define CTDLEXIT_SHUTDOWN	0	// Normal shutdown; do NOT auto-restart
 
 /*
@@ -73,9 +72,7 @@ typedef struct __recptypes {
  * restart.
  */
 #define CTDLEXIT_CONFIG		101	// Could not read system configuration
-#define CTDLEXIT_CONTROL	102	// Could not acquire lock
 #define CTDLEXIT_HOME		103	// Citadel home directory not found
-#define CTDLEXIT_OOD		104	// Out Of Date config - rerun setup
 #define CTDLEXIT_DB		105	// Unable to initialize database
 #define CTDLEXIT_LIBCITADEL	106	// Incorrect version of libcitadel
 #define CTDL_EXIT_UNSUP_AUTH	107	// Unsupported auth mode configured
@@ -105,7 +102,6 @@ enum {
 	KILLME_MALLOC_FAILED,
 	KILLME_QUOTA,
 	KILLME_READ_FAILED,
-	KILLME_ILLEGAL_MANAGESIEVE_COMMAND,
 	KILLME_SPAMMER,
 	KILLME_XML_PARSER
 };
@@ -115,7 +111,6 @@ enum {
 #define CS_CHAT		2	/* chat mode */
 #define CS_POSTING	4	/* Posting */
 
-
 extern int ScheduledShutdown;
 extern uid_t ctdluid;
 extern int sanity_diag_mode;
@@ -149,12 +144,9 @@ enum {
 	S_HOUSEKEEPING,
 	S_DIRECTORY,
 	S_NETCONFIGS,
-	S_PUBLIC_CLIENTS,
 	S_FLOORCACHE,
 	S_ATBF,
 	S_JOURNAL_QUEUE,
-	S_RPLIST,
-	S_SIEVELIST,
 	S_CHKPWD,
 	S_LOG,
 	S_NETSPOOL,
@@ -167,14 +159,6 @@ enum {
 };
 
 
-/*
- * Upload types
- */
-#define UPL_FILE	0
-#define UPL_NET		1
-#define UPL_IMAGE	2
-
-
 /*
  * message transfer formats
  */
@@ -245,7 +229,6 @@ struct cdbdata {
 #define EVT_PURGEUSER	100	/* Deleting a user */
 #define EVT_NEWUSER	102	/* Creating a user */
 
-#define EVT_BEFOREREAD	200
 #define EVT_BEFORESAVE	201
 #define EVT_AFTERSAVE	202
 #define EVT_SMTPSCAN	203	/* called before submitting a msg from SMTP */
@@ -280,15 +263,16 @@ typedef struct __visit {
  * These are kept separate from the message itself for one of two reasons:
  * 1. Either their values may change at some point after initial save, or
  * 2. They are merely caches of data which exist somewhere else, for speed.
+ * DO NOT PUT BIG DATA IN HERE ... we need this struct to be tiny for lots of quick r/w
  */
 struct MetaData {
 	long meta_msgnum;		/* Message number in *local* message base */
 	int meta_refcount;		/* Number of rooms pointing to this msg */
 	char meta_content_type[64];	/* Cached MIME content-type */
 	long meta_rfc822_length;	/* Cache of RFC822-translated msg length */
-	char unused_field_1[64];	/* FIXME this isn't used anywhere , why do we have it ?!? */
 };
 
+
 /* Calls to AdjRefCount() are queued and deferred, so the user doesn't
  * have to wait for various disk-intensive operations to complete synchronously.
  * This is the record format.
@@ -317,32 +301,22 @@ struct UseTable {
 };
 
 
-
-/* Preferred field order							*/
-/*               **********			Important fields		*/
-/*                         ***************	Semi-important fields		*/
-/*                                        **	internal only                   */
-/*                                          *	Message text (MUST be last)	*/
-///#define FORDER	"IPTAFONHRDBCEWJGKLQSVXZYU12M"
-
+/*
+ * These one-byte field headers are found in the Citadel message store.
+ */
 typedef enum _MsgField {
 	eAuthor       = 'A',
 	eBig_message  = 'B',
-	eRemoteRoom   = 'C',
-	eDestination  = 'D',
 	eExclusiveID  = 'E',
 	erFc822Addr   = 'F',
-	eHumanNode    = 'H',
 	emessageId    = 'I',
 	eJournal      = 'J',
 	eReplyTo      = 'K',
 	eListID       = 'L',
 	eMesageText   = 'M',
-	eNodeName     = 'N',
 	eOriginalRoom = 'O',
 	eMessagePath  = 'P',
 	eRecipient    = 'R',
-	eSpecialField = 'S',
 	eTimestamp    = 'T',
 	eMsgSubject   = 'U',
 	eenVelopeTo   = 'V',
@@ -352,6 +326,6 @@ typedef enum _MsgField {
 	eSuppressIdx  = '1',
 	eExtnotify    = '2',
 	eVltMsgNum    = '3'
-}eMsgField;
+} eMsgField;
 
 #endif /* SERVER_H */