X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fserver.h;h=8ad1b595b382874485d864b4784fa478b0875d3d;hb=f338fe3df988f4c9384e817237526325a31b6971;hp=c248691a63b0579d691910d7667863f6fb729398;hpb=ccacd0ad653e55eafa876ae48e2af402fadd9e71;p=citadel.git

diff --git a/citadel/server.h b/citadel/server.h
index c248691a6..8ad1b595b 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.
@@ -104,7 +104,6 @@ enum {
 	KILLME_MALLOC_FAILED,
 	KILLME_QUOTA,
 	KILLME_READ_FAILED,
-	KILLME_ILLEGAL_MANAGESIEVE_COMMAND,
 	KILLME_SPAMMER,
 	KILLME_XML_PARSER
 };
@@ -147,7 +146,6 @@ enum {
 	S_HOUSEKEEPING,
 	S_DIRECTORY,
 	S_NETCONFIGS,
-	S_PUBLIC_CLIENTS,
 	S_FLOORCACHE,
 	S_ATBF,
 	S_JOURNAL_QUEUE,
@@ -165,14 +163,6 @@ enum {
 };
 
 
-/*
- * Upload types
- */
-#define UPL_FILE	0
-#define UPL_NET		1
-#define UPL_IMAGE	2
-
-
 /*
  * message transfer formats
  */
@@ -243,7 +233,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 */
@@ -278,6 +267,7 @@ 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 */
@@ -314,24 +304,23 @@ struct UseTable {
 	time_t ut_timestamp;
 };
 
+
+/*
+ * 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',