/* $Id$ */
+#define SIZ 4096 /* generic buffer size */
+
#define TRACE fprintf(stderr, "Checkpoint: %s, %d\n", __FILE__, __LINE__)
#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 v2.12" /* who's in da house */
+#define SERVER "WebCit v3.01" /* who's in da house */
#define DEVELOPER_ID 0
#define CLIENT_ID 4
-#define CLIENT_VERSION 212
+#define CLIENT_VERSION 301
#define DEFAULT_HOST "localhost" /* Default Citadel server */
#define DEFAULT_PORT "504"
#define LB (1) /* Internal escape chars */
#define RB (2)
#define QU (3)
#define TARGET "webcit01" /* Target for inline URL's */
-#define HOUSEKEEPING 60 /* Housekeeping frequency */
+#define HOUSEKEEPING 15 /* Housekeeping frequency */
#define INITIAL_WORKER_THREADS 5
-#define LISTEN_QUEUE_LENGTH 20 /* listen() backlog queue */
+#define LISTEN_QUEUE_LENGTH 100 /* listen() backlog queue */
/* Room flags (from Citadel) */
struct httprequest {
struct httprequest *next;
- char line[256];
+ char line[SIZ];
};
struct urlcontent {
int serv_rev_level;
char serv_bbs_city[64];
char serv_sysadm[64];
- char serv_moreprompt[256];
+ char serv_moreprompt[SIZ];
int serv_ok_floors;
};
+/*
+ * Dynamic content for variable substitution in templates
+ */
+struct wcsubst {
+ struct wcsubst *next;
+ int wcs_type;
+ char wcs_key[32];
+ void *wcs_value;
+ void (*wcs_function)(void);
+};
-
-
+/*
+ * Values for wcs_type
+ */
+enum {
+ WCS_STRING,
+ WCS_FUNCTION,
+ WCS_SERVCMD
+};
+
/*
* One of these is kept for each active Citadel session.
struct wcsession {
struct wcsession *next; /* Linked list */
int wc_session; /* WebCit session ID */
- char wc_username[256];
- char wc_password[256];
- char wc_roomname[256];
+ char wc_username[SIZ];
+ char wc_password[SIZ];
+ char wc_roomname[SIZ];
int connected;
int logged_in;
int axlevel;
int upload_length;
char *upload;
int new_mail;
+ int remember_new_mail;
int need_vali;
pthread_mutex_t SessionMutex; /* mutex for exclusive access */
time_t lastreq; /* Timestamp of most recent HTTP */
char reply_to[512]; /* reply-to address */
long msgarr[1024]; /* for read operations */
int fake_frames;
- char *ExpressMessages;
struct urlcontent *urlstrings;
+ int HaveExpressMessages; /* Nonzero if incoming msgs exist */
+ struct wcsubst *vars;
};
-
+#define extract(dest,source,parmnum) extract_token(dest,source,parmnum,'|')
+#define num_parms(source) num_tokens(source, '|')
#define WC ((struct wcsession *)pthread_getspecific(MyConKey))
extern pthread_key_t MyConKey;
struct serv_info serv_info;
-extern char floorlist[128][256];
+extern char floorlist[128][SIZ];
extern char *axdefs[];
extern char *defaulthost, *defaultport;
+extern char *server_cookie;
+
+extern struct wcsubst *global_subst;
void stuff_to_cookie(char *cookie, int session,
void urlescputs(char *);
void output_headers(int);
void wprintf(const char *format,...);
-void extract(char *dest, char *source, int parmnum);
-int extract_int(char *source, int parmnum);
void output_static(char *what);
+void stresc(char *target, char *strbuf, int nbsp);
void escputs(char *strbuf);
void url(char *buf);
void escputs1(char *strbuf, int nbsp);
long extract_long(char *source, long int parmnum);
+int extract_int(char *source, int parmnum);
void dump_vars(void);
void embed_main_menu(void);
void serv_read(char *buf, int bytes);
void entroom(void);
void display_editroom(void);
void editroom(void);
+void display_whok(void);
void server_to_text(void);
void save_edit(char *description, char *enter_cmd, int regoto);
void display_edit(char *description, char *check_cmd,
void display_changepw(void);
void changepw(void);
void display_edit_node(void);
+void edit_node(void);
void display_netconf(void);
-void display_confirm_unshare(void);
void display_confirm_delete_node(void);
void delete_node(void);
-void unshare(void);
void display_add_node(void);
void add_node(void);
-void display_share(void);
-void share(void);
void terminate_session(void);
void edit_me(void);
void display_siteconfig(void);
void display_menubar(int);
void embed_room_banner(char *);
void smart_goto(char *);
-void ExpressMessageCat(char *);
void worker_entry(void);
void session_loop(struct httprequest *);
-void mime_parser(char *content,
- int ContentLength,
- char *ContentType,
- void (*CallBack)
- (char *cbname,
- char *cbfilename,
- char *cbencoding,
- void *cbcontent, char *cbtype, size_t cblength)
-);
void fmt_date(char *buf, time_t thetime);
void httpdate(char *buf, time_t thetime);
void end_webcit_session(void);
+void page_popup(void);
+void http_redirect(char *);
+void clear_local_substs(void);
+void svprintf(char *keyname, int keytype, const char *format,...);
+void svcallback(char *keyname, void (*fcn_ptr)() );
+void do_template(void *templatename);
+int lingering_close(int fd);
+char *memreadline(char *start, char *buf, int maxlen);
+int num_tokens (char *source, char tok);
+void extract_token(char *dest, char *source, int parmnum, char separator);
+void remove_token(char *source, int parmnum, char separator);
+int decode_base64(char *dest, char *source);