X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fsysdep_decls.h;h=d301ffb142b5823a9ae6b689b6fe7c155fe9e7be;hb=ef347e598ab670b87e178af7fc6b00795494303a;hp=008031e4a3b094e7e33b1997a99e8bbbefeab711;hpb=a337b58c154994e7644dd6b5e1928f06ee9d766e;p=citadel.git

diff --git a/citadel/sysdep_decls.h b/citadel/sysdep_decls.h
index 008031e4a..d301ffb14 100644
--- a/citadel/sysdep_decls.h
+++ b/citadel/sysdep_decls.h
@@ -1,96 +1,77 @@
-/* $Id$ */
 
+#ifndef SYSDEP_DECLS_H
+#define SYSDEP_DECLS_H
 
-/*
- * Uncomment this #define if you are a Citadel developer tracking
- * down memory leaks in the server.  Do NOT do this on a production
- * system because it definitely incurs a lot of additional overhead.
- */
-/* #define DEBUG_MEMORY_LEAKS */
-
+#include <stdarg.h>
+#include "sysdep.h"
 
+#ifdef HAVE_PTHREAD_H
 #include <pthread.h>
-#include "sysdep.h"
+#endif
+
+#ifdef HAVE_DB_H
+#include <db.h>
+#elif defined(HAVE_DB4_DB_H)
+#include <db4/db.h>
+#else
+#error Neither <db.h> nor <db4/db.h> was found by configure. Install db4-devel.
+#endif
+
+
+#if DB_VERSION_MAJOR < 4 || DB_VERSION_MINOR < 1
+#error Citadel requires Berkeley DB v4.1 or newer.  Please upgrade.
+#endif
+
 #include "server.h"
+#include "database.h"
+
+#if SIZEOF_SIZE_T == SIZEOF_INT 
+#define SIZE_T_FMT "%d"
+#else
+#define SIZE_T_FMT "%ld"
+#endif
 
-/* Logging levels - correspond to syslog(3) */
-enum LogLevel {
-	/* When about to exit the server for an unrecoverable error */
-	 CTDL_EMERG,	/* system is unusable */
-	/* Manual intervention is required to avoid an abnormal exit */
-	 CTDL_ALERT,	/* action must be taken immediately */
-	/* The server can continue to run with degraded functionality */
-	 CTDL_CRIT,	/* critical conditions */
-	/* An error occurs but the server continues to run normally */
-	 CTDL_ERR,	/* error conditions */
-	/* An abnormal condition was detected; server will continue normally */
-	 CTDL_WARNING,	/* warning conditions */
-	/* Normal messages (login/out, activity, etc.) */
-	 CTDL_NOTICE,	/* normal but significant condition */
-	/* Unimportant progress messages, etc. */
-	 CTDL_INFO,	/* informational */
-	/* Debugging messages */
-	 CTDL_DEBUG,	/* debug-level messages */
-};
+void cputbuf(const StrBuf *Buf);
 
 #ifdef __GNUC__
-void lprintf (enum LogLevel loglevel, const char *format, ...) __attribute__((__format__(__printf__,2,3)));
 void cprintf (const char *format, ...) __attribute__((__format__(__printf__,1,2)));
 #else
-void lprintf (enum LogLevel loglevel, const char *format, ...);
 void cprintf (const char *format, ...);
 #endif
 
 void init_sysdep (void);
-void begin_critical_section (int which_one);
-void end_critical_section (int which_one);
-int ig_tcp_server (int port_number, int queue_len);
-int ig_uds_server(char *sockpath, int queue_len);
-INLINE struct CitContext *MyContext (void);
-struct CitContext *CreateNewContext (void);
-void InitMyContext (struct CitContext *con);
+int ctdl_tcp_server(char *ip_addr, int port_number, int queue_len, char *errormessage);
+int ctdl_uds_server(char *sockpath, int queue_len, char *errormessage);
 void buffer_output(void);
 void unbuffer_output(void);
-void client_write (char *buf, int nbytes);
+void flush_output(void);
+int client_write (const char *buf, int nbytes);
 int client_read_to (char *buf, int bytes, int timeout);
 int client_read (char *buf, int bytes);
-int client_gets (char *buf);
+int client_getln (char *buf, int maxbytes);
+int CtdlClientGetLine(StrBuf *Target);
+int client_read_blob(StrBuf *Target, int bytes, int timeout);
+void client_set_inbound_buf(long N);
+int client_read_random_blob(StrBuf *Target, int timeout);
+void client_close(void);
 void sysdep_master_cleanup (void);
 void kill_session (int session_to_kill);
-void *sd_context_loop (struct CitContext *con);
 void start_daemon (int do_close_stdio);
+void checkcrash(void);
 void cmd_nset (char *cmdbuf);
 int convert_login (char *NameToConvert);
-void *worker_thread (void *arg);
-void become_session(struct CitContext *which_con);
-void CtdlRedirectOutput(FILE *fp, int sock);
-void InitializeMasterCC(void);
 void init_master_fdset(void);
-void create_worker(void);
+void *worker_thread(void *);
+
+extern volatile int exit_signal;
+extern volatile int shutdown_and_halt;
+extern volatile int running_as_daemon;
+extern volatile int restart_server;
 
-extern int num_sessions;
-extern volatile int time_to_die;
 extern int verbosity;
 extern int rescan[];
-extern pthread_t initial_thread;
 
-extern struct worker_node {
-        pthread_t tid;
-        struct worker_node *next;
-} *worker_list;
 
 extern int SyslogFacility(char *name);
-extern int syslog_facility;
-
-#ifdef DEBUG_MEMORY_LEAKS
-#define malloc(x) tracked_malloc(x, __FILE__, __LINE__)
-#define realloc(x,y) tracked_realloc(x, y, __FILE__, __LINE__)
-#undef strdup
-#define strdup(x) tracked_strdup(x, __FILE__, __LINE__)
-#define free(x) tracked_free(x)
-void *tracked_malloc(size_t size, char *file, int line);
-void *tracked_realloc(void *ptr, size_t size, char *file, int line);
-void tracked_free(void *ptr);
-char *tracked_strdup(const char *s, char *file, int line);
-void dump_heap(void);
-#endif
+
+#endif /* SYSDEP_DECLS_H */