X-Git-Url: https://code.citadel.org/?p=citadel.git;a=blobdiff_plain;f=citadel%2Fserver.h;h=e5e64539c0a7f6ca1012414b61ebc522c7c05c75;hp=01d09c693ef3c6d030632655d8879a04a436b871;hb=5ac2920028e92a453c686c799327d7a66b3e7b49;hpb=1fee2a05df6383f00214b7681a0be120f6fc7e1f

diff --git a/citadel/server.h b/citadel/server.h
index 01d09c693..e5e64539c 100644
--- a/citadel/server.h
+++ b/citadel/server.h
@@ -1,7 +1,7 @@
 /* 
  * Main declarations file for the Citadel server
  *
- * Copyright (c) 1987-2017 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.
@@ -54,7 +54,6 @@ typedef struct __recptypes {
 	char *errormsg;
 	char *recp_local;
 	char *recp_internet;
-	char *recp_ignet;
 	char *recp_room;
 	char *recp_orgroom;
 	char *display_recp;
@@ -65,23 +64,22 @@ typedef struct __recptypes {
 
 #define RECPTYPES_MAGIC 0xfeeb
 
-
-#define CTDLEXIT_SHUTDOWN	0	/* Normal shutdown; do NOT auto-restart */
+#define CTDLEXIT_SHUTDOWN	0	// Normal shutdown; do NOT auto-restart
 
 /*
  * Exit codes 101 through 109 are used for conditions in which
  * we deliberately do NOT want the service to automatically
  * restart.
  */
-#define CTDLEXIT_CONFIG		101	/* Could not read citadel.config */
-#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 */
-#define CTDLEXIT_UNUSER		108	/* Could not determine uid to run as */
-#define CTDLEXIT_CRYPTO		109	/* Problem initializing SSL or TLS */
+#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
+#define CTDLEXIT_UNUSER		108	// Could not determine uid to run as
+#define CTDLEXIT_CRYPTO		109	// Problem initializing SSL or TLS
 
 /*
  * Reasons why a session would be terminated (set CC->kill_me to these values)
@@ -116,9 +114,9 @@ enum {
 #define CS_CHAT		2	/* chat mode */
 #define CS_POSTING	4	/* Posting */
 
-
 extern int ScheduledShutdown;
 extern uid_t ctdluid;
+extern int sanity_diag_mode;
 
 struct ExpressMessage {
 	struct ExpressMessage *next;
@@ -149,7 +147,6 @@ enum {
 	S_HOUSEKEEPING,
 	S_DIRECTORY,
 	S_NETCONFIGS,
-	S_PUBLIC_CLIENTS,
 	S_FLOORCACHE,
 	S_ATBF,
 	S_JOURNAL_QUEUE,
@@ -167,14 +164,6 @@ enum {
 };
 
 
-/*
- * Upload types
- */
-#define UPL_FILE	0
-#define UPL_NET		1
-#define UPL_IMAGE	2
-
-
 /*
  * message transfer formats
  */
@@ -280,15 +269,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 mimetype[64];              /* if we were able to guess the mimetype for the data */ 
 };
 
+
 /* 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.
@@ -316,33 +306,19 @@ struct UseTable {
 	time_t ut_timestamp;
 };
 
-
-
-/* Preferred field order							*/
-/*               **********			Important fields		*/
-/*                         ***************	Semi-important fields		*/
-/*                                        **	internal only                   */
-/*                                          *	Message text (MUST be last)	*/
-///#define FORDER	"IPTAFONHRDBCEWJGKLQSVXZYU12M"
-
 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 +328,6 @@ typedef enum _MsgField {
 	eSuppressIdx  = '1',
 	eExtnotify    = '2',
 	eVltMsgNum    = '3'
-}eMsgField;
+} eMsgField;
 
 #endif /* SERVER_H */