Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel

[citadel.git] / citadel / citserver.h

diff --git a/citadel/citserver.h b/citadel/citserver.h
index b89e4e0f859d86515ec2bf393eb21abe73832cde..4224fcdcb3d56934b5a309575aeda98d6060d54a 100644 (file)
--- a/citadel/citserver.h
+++ b/citadel/citserver.h
@@ -12,14 +12,17 @@
 
 #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;
+       OneRoomNetCfg *OneRNCfg;
         char name[ROOMNAMELEN];
         char lcname[ROOMNAMELEN];
        long namelen;
+       long lastsent;
        long key;
        long QRNum;
 };
@@ -42,10 +45,11 @@ void do_async_loop(void);
 void begin_session(struct CitContext *con);
 void citproto_begin_session(void);
 void citproto_begin_admin_session(void);
-void GenerateRoomDisplay(char *real_room,
-                        CitContext *viewed,
-                        CitContext *viewer);
+
+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;