X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fserver.h;h=91b144f0df25a39f6f979fc953bbaf6a37c6026c;hb=fdd5004e632b955274b9fdeb9a63223cba7536a8;hp=d9bcb207e4da1242574930b0b5076e5a98d135f6;hpb=a46e719c5c6252c1342acb5f2d5ac96f8778759a;p=citadel.git diff --git a/citadel/server.h b/citadel/server.h index d9bcb207e..91b144f0d 100644 --- a/citadel/server.h +++ b/citadel/server.h @@ -1,7 +1,7 @@ /* * Main declarations file for the Citadel server * - * Copyright (c) 1987-2015 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,21 +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_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) @@ -104,7 +104,6 @@ enum { KILLME_MALLOC_FAILED, KILLME_QUOTA, KILLME_READ_FAILED, - KILLME_ILLEGAL_MANAGESIEVE_COMMAND, KILLME_SPAMMER, KILLME_XML_PARSER }; @@ -114,23 +113,9 @@ enum { #define CS_CHAT 2 /* chat mode */ #define CS_POSTING 4 /* Posting */ - -/* - * This is the control record for the message base... - */ -struct CitControl { - long MMhighest; /* highest message number in file */ - unsigned MMflags; /* Global system flags */ - long MMnextuser; /* highest user number on system */ - long MMnextroom; /* highest room number on system */ - int MM_hosted_upgrade_level; /* Server-hosted upgrade level */ - int MM_fulltext_wordbreaker; /* ID of wordbreaker in use */ - long MMfulltext; /* highest message number indexed */ - int MMdbversion; /* Version of Berkeley DB used on previous server run */ -}; - extern int ScheduledShutdown; -extern struct CitControl CitControl; +extern uid_t ctdluid; +extern int sanity_diag_mode; struct ExpressMessage { struct ExpressMessage *next; @@ -159,10 +144,8 @@ enum { S_SUPPMSGMAIN, S_CONFIG, S_HOUSEKEEPING, - S_NTTLIST, S_DIRECTORY, S_NETCONFIGS, - S_PUBLIC_CLIENTS, S_FLOORCACHE, S_ATBF, S_JOURNAL_QUEUE, @@ -180,14 +163,6 @@ enum { }; -/* - * Upload types - */ -#define UPL_FILE 0 -#define UPL_NET 1 -#define UPL_IMAGE 2 - - /* * message transfer formats */ @@ -223,8 +198,8 @@ enum { CDB_FULLTEXT, /* full text search index */ CDB_EUIDINDEX, /* locate msgs by EUID */ CDB_USERSBYNUMBER, /* index of users by number */ - CDB_OPENID, /* associates OpenIDs with users */ - CDB_CONFIG, /* global system configuration */ + CDB_EXTAUTH, /* associates OpenIDs with users */ + CDB_CONFIG, /* system configuration database */ MAXCDB /* total number of CDB's defined */ }; @@ -293,15 +268,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. @@ -329,33 +305,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', @@ -365,6 +327,6 @@ typedef enum _MsgField { eSuppressIdx = '1', eExtnotify = '2', eVltMsgNum = '3' -}eMsgField; +} eMsgField; #endif /* SERVER_H */