Wait longer (30 seconds instead of 10) to connect to Citadel server when running...

[citadel.git] / citadel / serv_extensions.h

diff --git a/citadel/serv_extensions.h b/citadel/serv_extensions.h
index 59dcfec3a3b93d11d3e064b1351eb3b99a016d17..95f9640335fbc69291385968ee1c75cde731d8a9 100644 (file)
--- a/citadel/serv_extensions.h
+++ b/citadel/serv_extensions.h
@@ -16,7 +16,42 @@
  */
 
 typedef void (*CtdlDbgFunction) (const int);
- 
+
+extern int DebugModules;
+#define MDBGLOG(LEVEL) if ((LEVEL != LOG_DEBUG) || (DebugModules != 0))
+
+#define MOD_syslog(LEVEL, FORMAT, ...)                                 \
+       MDBGLOG(LEVEL) syslog(LEVEL,                                    \
+                             "%s Modules: " FORMAT, IOSTR, __VA_ARGS__)
+
+#define MODM_syslog(LEVEL, FORMAT)                             \
+       MDBGLOG(LEVEL) syslog(LEVEL,                            \
+                             "%s Modules: " FORMAT, IOSTR);
+
+
+extern int EnableMarkers;
+#define MARKLOG(LEVEL) if ((LEVEL != LOG_DEBUG) || (EnableMarkers != 0))
+
+#define MARK_syslog(LEVEL, FORMAT, ...)                                        \
+       MARKLOG(LEVEL) syslog(LEVEL,                                    \
+                             "%s: " FORMAT, IOSTR, __VA_ARGS__)
+
+#define MARKM_syslog(LEVEL, FORMAT)                            \
+       MARKLOG(LEVEL) syslog(LEVEL,                            \
+                              "%s: " FORMAT, IOSTR);
+
+
+extern int EnableCtlProto;
+#define CTDLLOG(LEVEL) if ((LEVEL != LOG_DEBUG) || (EnableCtlProto != 0))
+
+#define CTDL_syslog(LEVEL, FORMAT, ...)                                        \
+       CTDLLOG(LEVEL) syslog(LEVEL,                                    \
+                             "%s CC[%d]: " FORMAT, IOSTR, CCCID, __VA_ARGS__)
+
+#define CTDLM_syslog(LEVEL, FORMAT)                            \
+       CTDLLOG(LEVEL) syslog(LEVEL,                            \
+                             "%s CC[%d]: " FORMAT, IOSTR, CCCID);
+
 
 
 /*
@@ -44,6 +79,13 @@ struct CleanupFunctionHook {
 extern CleanupFunctionHook *CleanupHookTable;
 
 
+typedef struct __LogDebugEntry {
+       CtdlDbgFunction F;
+       const char *Name;
+       long Len;
+       const int *LogP;
+} LogDebugEntry;
+extern HashList *LogDebugEntryTable;
 void initialize_server_extensions(void);
 int DLoader_Exec_Cmd(char *cmdbuf);
 char *Dynamic_Module_Init(void);
@@ -51,6 +93,9 @@ char *Dynamic_Module_Init(void);
 void CtdlDestroySessionHooks(void);
 void PerformSessionHooks(int EventType);
 
+int CheckTDAPVeto (int DBType, StrBuf *ErrMsg);
+void CtdlDestroyTDAPVetoHooks(void);
+
 void CtdlDestroyUserHooks(void);
 void PerformUserHooks(struct ctdluser *usbuf, int EventType);
 
@@ -60,7 +105,7 @@ void CtdlDestroyXmsgHooks(void);
 
 
 void CtdlDestroyMessageHook(void);
-int PerformMessageHooks(struct CtdlMessage *, int EventType);
+int PerformMessageHooks(struct CtdlMessage *, recptypes *recps, int EventType);
 
 
 void CtdlDestroyNetprocHooks(void);
@@ -89,4 +134,6 @@ void CtdlRegisterDebugFlagHook(const char *Name, long len, CtdlDbgFunction F, co
 void CtdlSetDebugLogFacilities(const char **Str, long n);
 void CtdlDestroyDebugTable(void);
 
+void netcfg_keyname(char *keybuf, long roomnum);
+
 #endif /* SERV_EXTENSIONS_H */