#include <zlib.h>
#endif
-
#ifdef HAVE_ICAL_H
#ifdef HAVE_LIBICAL
#define WEBCIT_WITH_CALENDAR_SERVICE 1
#include <ical.h>
#endif
+#ifdef HAVE_OPENSSL
+/* Work around RedHat's b0rken OpenSSL includes */
+#define OPENSSL_NO_KRB5
+#include <openssl/ssl.h>
+#include <openssl/err.h>
+#include <openssl/rand.h>
+#endif
+
#define CALENDAR_ROOM_NAME "Calendar"
#define PRODID "-//Citadel//NONSGML Citadel Calendar//EN"
#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 v4.10" /* who's in da house */
+#define SERVER "WebCit v5.24" /* who's in da house */
#define DEVELOPER_ID 0
#define CLIENT_ID 4
-#define CLIENT_VERSION 410 /* This version of WebCit */
-#define MINIMUM_CIT_VERSION 606 /* min required Citadel vers */
+#define CLIENT_VERSION 524 /* This version of WebCit */
+#define MINIMUM_CIT_VERSION 626 /* min required Citadel vers */
#define DEFAULT_HOST "localhost" /* Default Citadel server */
#define DEFAULT_PORT "504"
#define LB (1) /* Internal escape chars */
#define QU (3)
#define TARGET "webcit01" /* Target for inline URL's */
#define HOUSEKEEPING 15 /* Housekeeping frequency */
-#define INITIAL_WORKER_THREADS 5
+#define MIN_WORKER_THREADS 5
+#define MAX_WORKER_THREADS 250
#define LISTEN_QUEUE_LENGTH 100 /* listen() backlog queue */
#define USERCONFIGROOM "My Citadel Config"
+#define DEFAULT_MAXMSGS 20
/*
char serv_sysadm[64];
char serv_moreprompt[SIZ];
int serv_ok_floors;
+ int serv_supports_ldap;
};
*/
struct march {
struct march *next;
- char march_name[32];
+ char march_name[128];
int march_floor;
int march_order;
};
struct roomlisting {
struct roomlisting *lnext;
struct roomlisting *rnext;
- char rlname[64];
+ char rlname[128];
unsigned rlflags;
int rlfloor;
int rlorder;
char *data;
};
-
/*
* One of these is kept for each active Citadel session.
* HTTP transactions are bound to one at a time.
int is_room_aide;
int http_sock;
int serv_sock;
+ int chat_sock;
unsigned room_flags;
int wc_view;
int wc_default_view;
+ int wc_floor;
char ugname[128];
long uglsn;
int upload_length;
char this_page[SIZ]; /* address of current page */
char http_host[SIZ]; /* HTTP Host: header */
char *preferences;
-#ifdef HAVE_ICAL_H
- icalcomponent **disp_cal; /* store calendar items for display */
- long *cal_msgnum; /* store calendar msgids for display */
+#ifdef WEBCIT_WITH_CALENDAR_SERVICE
+ struct disp_cal {
+ icalcomponent *cal; /* cal items for display */
+ long cal_msgnum; /* cal msgids for display */
+ } *disp_cal;
int num_cal;
#endif
struct wc_attachment *first_attachment;
+ char ImportantMessage[SIZ];
+ int outside_frameset_allowed; /* nonzero if current req is allowed
+ * outside of the main frameset */
+ char last_chat_user[SIZ];
};
#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[];
extern char *ctdlhost, *ctdlport;
extern char *server_cookie;
+extern int is_https;
extern struct wcsubst *global_subst;
void serv_gets(char *strbuf);
void serv_puts(char *string);
void whobbs(void);
-void fmout(FILE * fp);
+void fmout(FILE *fp, char *align);
void wDumpContent(int);
void serv_printf(const char *format,...);
char *bstr(char *key);
void urlesc(char *, char *);
void urlescputs(char *);
+void jsesc(char *, char *);
+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);
void post_message(void);
void confirm_delete_msg(void);
void delete_msg(void);
+void do_stuff_to_one_msg(void);
void confirm_move_msg(void);
void move_msg(void);
void userlist(void);
void zapped_list(void);
void display_zap(void);
void zap(void);
-void display_error(char *);
void display_success(char *);
void display_entroom(void);
void entroom(void);
void save_edit(char *description, char *enter_cmd, int regoto);
void display_edit(char *description, char *check_cmd,
char *read_cmd, char *save_cmd, int headers_type);
-void gotoroom(char *gname, int display_name);
+void gotoroom(char *gname);
void confirm_delete_room(void);
void delete_room(void);
void validate(void);
void httpdate(char *buf, time_t thetime);
void end_webcit_session(void);
void page_popup(void);
+void chat_recv(void);
+void chat_send(void);
void http_redirect(char *);
void clear_local_substs(void);
void svprintf(char *keyname, int keytype, const char *format,...);
void submit_vcard(void);
void striplt(char *);
void select_user_to_edit(char *message, char *preselect);
-void display_edituser(char *who);
+void display_edituser(char *who, int is_new);
void create_user(void);
void edituser(void);
+void do_change_view(int);
void change_view(void);
void folders(void);
void do_stuff_to_msgs(void);
void cal_process_attachment(char *part_source, long msgnum, char *cal_partnum);
void display_calendar(long msgnum);
void display_task(long msgnum);
+void display_note(long msgnum);
void do_calendar_view(void);
+void do_tasks_view(void);
void free_calendar_buffer(void);
void calendar_summary_view(void);
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 HAVE_ICAL_H
+#ifdef WEBCIT_WITH_CALENDAR_SERVICE
void display_edit_task(void);
void save_task(void);
void display_edit_event(void);
void partstat_as_string(char *buf, icalproperty *attendee);
icalcomponent *ical_encapsulate_subcomponent(icalcomponent *subcomp);
void check_attendee_availability(icalcomponent *supplied_vevent);
+void do_freebusy(char *req);
#endif
extern char *months[];
int goto_config_room(void);
long locate_user_vcard(char *username, long usernum);
void sleeeeeeeeeep(int);
+void http_transmit_thing(char *thing, size_t length, char *content_type,
+ int is_static);
+void unescape_input(char *buf);
+void do_iconbar(void);
+void display_customize_iconbar(void);
+void commit_iconbar(void);
+int CtdlDecodeQuotedPrintable(char *decoded, char *encoded, int sourcelen);
+void spawn_another_worker_thread(void);
+
+
+
+#ifdef HAVE_OPENSSL
+void init_ssl(void);
+void endtls(void);
+void ssl_lock(int mode, int n, const char *file, int line);
+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 */
+#define VIEW_NOTES 5 /* Notes view */
projects / citadel.git / blobdiff