X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fcitserver.h;h=61f1964b7b4c609b70ba2fc6458c5f5b909d5f0f;hb=e6499f44a49d449e41ba605a0c7476019da432b4;hp=1eb8cd8042a5d129b17b09603b67d5724abd414f;hpb=1421d26887f154439d2cd27075c7e85dc22f644f;p=citadel.git

diff --git a/citadel/citserver.h b/citadel/citserver.h
index 1eb8cd804..61f1964b7 100644
--- a/citadel/citserver.h
+++ b/citadel/citserver.h
@@ -1,53 +1,54 @@
-/* $Id$
+/*
+ * Copyright (c) 1987-2015 by the citadel.org team
  *
- * Copyright (c) 1987-2009 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.
  *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  */
 
 #include "serv_extensions.h"
+#include "context.h"
+#include "ctdl_module.h"
 
 /* Simple linked list structures ... used in a bunch of different places. */
+typedef struct RoomProcList RoomProcList;
 struct RoomProcList {
         struct RoomProcList *next;
         char name[ROOMNAMELEN];
+        char lcname[ROOMNAMELEN];
+	long namelen;
+	long lastsent;
+	long key;
+	long QRNum;
 };
 struct UserProcList {
 	struct UserProcList *next;
 	char user[64];
 };
 
+#define CTDLUSERIP      (IsEmptyStr(CC->cs_addr) ?  CC->cs_clientinfo: CC->cs_addr)
+
 void cit_backtrace(void);
+void cit_oneline_backtrace(void);
 void cit_panic_backtrace(int SigNum);
 void master_startup (void);
-void master_cleanup (int exitcode);
+int master_cleanup (int exitcode);
 void set_wtmpsupp (char *newtext);
 void set_wtmpsupp_to_current_room(void);
 void do_command_loop(void);
 void do_async_loop(void);
 void begin_session(struct CitContext *con);
 void citproto_begin_session(void);
-void GenerateRoomDisplay(char *real_room,
-                        struct CitContext *viewed,
-                        struct CitContext *viewer);
-extern int panic_fd;
-char CtdlCheckExpress(void);
-
-
-
+void citproto_begin_admin_session(void);
 
+void help_subst (char *strbuf, char *source, char *dest);
 
+extern int panic_fd;
+char CtdlCheckExpress(void);
+int CtdlIsPublicClient(void);
 extern time_t server_startup_time;
-
+extern int openid_level_supported;