#include "roomops.h"
#include "preferences.h"
-#include "tcp_sockets.h"
+#include "sockets.h"
#include "utils.h"
#ifdef HAVE_OPENSSL
/* Work around RedHat's b0rken OpenSSL includes */
#undef memcpy
#endif
-#define SLEEPING 180 /* TCP connection timeout */
-#define WEBCIT_TIMEOUT 900 /* WebCit session timeout */
-#define PORT_NUM 80 /* port number to listen on */
+#define SLEEPING 180 /* TCP connection timeout */
+#define WEBCIT_TIMEOUT 900 /* WebCit session timeout */
+#define PORT_NUM 80 /* port number to listen on */
#define DEVELOPER_ID 0
#define CLIENT_ID 4
-#define CLIENT_VERSION 937 /* This version of WebCit */
-#define MINIMUM_CIT_VERSION 931 /* Minimum required version of Citadel server */
-#define LIBCITADEL_MIN 931 /* Minimum required version of libcitadel */
-#define DEFAULT_HOST "localhost" /* Default Citadel server */
-#define DEFAULT_PORT "504"
-#define TARGET "webcit01" /* Window target for inline URL's */
-#define HOUSEKEEPING 15 /* Housekeeping frequency */
+#define CLIENT_VERSION 952 /* This version of WebCit */
+#define MINIMUM_CIT_VERSION 931 /* Minimum required version of Citadel server */
+#define LIBCITADEL_MIN 931 /* Minimum required version of libcitadel */
+#define DEFAULT_CTDLDIR "/usr/local/citadel" /* Default Citadel server directory */
+#define TARGET "webcit01" /* Window target for inline URL's */
+#define HOUSEKEEPING 15 /* Housekeeping frequency */
#define MAX_WORKER_THREADS 250
-#define LISTEN_QUEUE_LENGTH 100 /* listen() backlog queue */
+#define LISTEN_QUEUE_LENGTH 100 /* listen() backlog queue */
#define USERCONFIGROOM "My Citadel Config"
#define DEFAULT_MAXMSGS 20
#ifdef HAVE_OPENSSL
#define THREADSSL ((SSL *)pthread_getspecific(ThreadSSL))
extern pthread_key_t ThreadSSL;
-extern char ctdl_key_dir[PATH_MAX];
-extern char file_crpt_file_key[PATH_MAX];
-extern char file_crpt_file_csr[PATH_MAX];
-extern char file_crpt_file_cer[PATH_MAX];
void init_ssl(void);
void endtls(void);
extern int is_https;
extern int follow_xff;
extern char *server_cookie;
-extern char *ctdlhost, *ctdlport;
extern char *axdefs[];
extern int num_threads_existing;
extern int num_threads_executing;
-extern int setup_wizard;
-extern char wizard_filename[];
void InitialiseSemaphores(void);
void begin_critical_section(int which_one);
HashList *GetValidDomainNames(StrBuf *Target, WCTemplputParams *TP);
void output_error_pic(const char *ErrMsg1, const char *ErrMsg2);
void jsonMessageListHdr(void);
+extern char *ctdl_dir; /* Directory where Citadel Server is running */