* inetconf.c: added. Not finished yet.

[citadel.git] / webcit / webcit.h

diff --git a/webcit/webcit.h b/webcit/webcit.h
index afb3c9d7b406bfe2c203642de0b2556166e869ca..b3e99e71ef722da4962fb38d6dcf4f2441380d10 100644 (file)
--- a/webcit/webcit.h
+++ b/webcit/webcit.h
@@ -33,11 +33,11 @@
 #define SLEEPING               180             /* TCP connection timeout */
 #define WEBCIT_TIMEOUT         900             /* WebCit session timeout */
 #define PORT_NUM               2000            /* port number to listen on */
-#define SERVER                 "WebCit v5.06"  /* who's in da house */
+#define SERVER                 "WebCit v5.22"  /* who's in da house */
 #define DEVELOPER_ID           0
 #define CLIENT_ID              4
-#define CLIENT_VERSION         506             /* This version of WebCit */
-#define MINIMUM_CIT_VERSION    611             /* min required Citadel vers */
+#define CLIENT_VERSION         522             /* This version of WebCit */
+#define MINIMUM_CIT_VERSION    623             /* min required Citadel vers */
 #define DEFAULT_HOST           "localhost"     /* Default Citadel server */
 #define DEFAULT_PORT           "504"
 #define LB                     (1)             /* Internal escape chars */
@@ -50,6 +50,7 @@
 #define LISTEN_QUEUE_LENGTH    100             /* listen() backlog queue */
 
 #define USERCONFIGROOM         "My Citadel Config"
+#define DEFAULT_MAXMSGS                20
 
 
 /*
@@ -192,6 +193,7 @@ struct wcsession {
        unsigned room_flags;
        int wc_view;
        int wc_default_view;
+       int wc_floor;
        char ugname[128];
        long uglsn;
        int upload_length;
@@ -227,17 +229,21 @@ struct wcsession {
        int outside_frameset_allowed;   /* nonzero if current req is allowed
                                         * outside of the main frameset */
        char last_chat_user[SIZ];
-#ifdef HAVE_OPENSSL
-       SSL *ssl;
-#endif
 };
 
 #define extract(dest,source,parmnum)   extract_token(dest,source,parmnum,'|')
 #define num_parms(source)              num_tokens(source, '|')
 
+/* Per-session data */
 #define WC ((struct wcsession *)pthread_getspecific(MyConKey))
 extern pthread_key_t MyConKey;
 
+/* Per-thread SSL context */
+#ifdef HAVE_OPENSSL
+#define THREADSSL ((SSL *)pthread_getspecific(ThreadSSL))
+extern pthread_key_t ThreadSSL;
+#endif
+
 struct serv_info serv_info;
 extern char floorlist[128][SIZ];
 extern char *axdefs[];
@@ -280,10 +286,12 @@ void jsescputs(char *);
 void output_headers(int);
 void wprintf(const char *format,...);
 void output_static(char *what);
-void stresc(char *target, char *strbuf, int nbsp);
+void stresc(char *target, char *strbuf, int nbsp, int nolinebreaks);
 void escputs(char *strbuf);
 void url(char *buf);
-void escputs1(char *strbuf, int nbsp);
+void escputs1(char *strbuf, int nbsp, int nolinebreaks);
+void msgesc(char *target, char *strbuf);
+void msgescputs(char *strbuf);
 long extract_long(char *source, long int parmnum);
 int extract_int(char *source, int parmnum);
 void stripout(char *str, char leftboundary, char rightboundary);
@@ -413,6 +421,9 @@ int load_msg_ptrs(char *servcmd);
 void CtdlEncodeBase64(char *dest, const char *source, size_t sourcelen);
 int CtdlDecodeBase64(char *dest, const char *source, size_t length);
 void free_attachments(struct wcsession *sess);
+void set_room_policy(void);
+void display_inetconf(void);
+void save_inetconf(void);
 
 
 #ifdef WEBCIT_WITH_CALENDAR_SERVICE
@@ -456,7 +467,17 @@ void spawn_another_worker_thread(void);
 void init_ssl(void);
 void endtls(void);
 void ssl_lock(int mode, int n, const char *file, int line);
-int starttls(void);
+int starttls(int sock);
 extern SSL_CTX *ssl_ctx;  
+int client_read_ssl(char *buf, int bytes, int timeout);
+void client_write_ssl(char *buf, int nbytes);
 #endif
 
+
+
+/* Views (from citadel.h) */
+#define        VIEW_BBS                0       /* Traditional Citadel BBS view */
+#define VIEW_MAILBOX           1       /* Mailbox summary */
+#define VIEW_ADDRESSBOOK       2       /* Address book view */
+#define VIEW_CALENDAR          3       /* Calendar view */
+#define VIEW_TASKS             4       /* Tasks view */