Release version 997 generated by do-release.sh

[citadel.git] / webcit / webcit.h

diff --git a/webcit/webcit.h b/webcit/webcit.h
index 7059b12140def9e2289a9f75a90588f41cff01bf..ce54a18e81583f4f00f939ff30652ba54e8c465b 100644 (file)
--- a/webcit/webcit.h
+++ b/webcit/webcit.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1987-2020 by the citadel.org team
+ * Copyright (c) 1987-2021 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.
@@ -87,7 +87,7 @@ typedef struct wcsession wcsession;
 #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 */
@@ -122,20 +122,19 @@ extern char *ssl_cipher_list;
 #undef memcpy
 #endif
 
-#define SLEEPING               180             /* TCP connection timeout */
-#define WEBCIT_TIMEOUT         900             /* WebCit session timeout */
-#define PORT_NUM               2000            /* 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         926             /* This version of WebCit */
-#define MINIMUM_CIT_VERSION    924             /* Minimum required version of Citadel server */
-#define        LIBCITADEL_MIN          924             /* 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 997             /* 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
@@ -156,7 +155,7 @@ extern char *ssl_cipher_list;
 #define ERROR          500
 #define BINARY_FOLLOWS         600
 #define SEND_BINARY    700
-#define START_CHAT_MODE        800
+#define SEND_THEN_RECV 800
 #define ASYNC_MSG      900
 
 #define MINORCODE(a) (a % 100)
@@ -528,10 +527,6 @@ extern pthread_key_t MyConKey;
 #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);
@@ -544,12 +539,9 @@ int client_write_ssl(const StrBuf *Buf);
 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);
@@ -629,11 +621,12 @@ void TmplGettext(StrBuf *Target, WCTemplputParams *TP); /* actual supported loca
 void set_selected_language(const char *);
 void go_selected_language(void);
 const char *get_selected_language(void);
-void utf8ify_rfc822_string(char **buf);
+// void utf8ify_rfc822_string(char **buf); this is in libcitadel now
 void begin_burst(void);
 long end_burst(void);
 void AppendImportantMessage(const char *pch, long len);
 void http_datestring(char *buf, size_t n, time_t xtime);
+void display_enter(void);
 
 /* These should be empty, but we have them for testing */
 #define DEFAULT_HTTPAUTH_USER  ""
@@ -655,3 +648,5 @@ extern int DisableGzip;
 void display_summary_page(void);
 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 */