US_NOPROMPT | US_DISAPPEAR | US_PAGINATOR | \
US_FLOORS | US_COLOR | US_PROMPTCTL )
+
+#define MAJORCODE(a) (((int)(a / 100) ) * 100)
+
+#define LISTING_FOLLOWS 100
+#define CIT_OK 200
+#define MORE_DATA 300
+#define SEND_LISTING 400
+#define ERROR 500
+#define BINARY_FOLLOWS 600
+#define SEND_BINARY 700
+#define START_CHAT_MODE 800
+#define ASYNC_MSG 900
+
+#define MINORCODE(a) (a % 100)
+#define ASYNC_GEXP 02
+#define INTERNAL_ERROR 10
+#define TOO_BIG 11
+#define ILLEGAL_VALUE 12
+#define NOT_LOGGED_IN 20
+#define CMD_NOT_SUPPORTED 30
+#define SERVER_SHUTTING_DOWN 31
+#define PASSWORD_REQUIRED 40
+#define ALREADY_LOGGED_IN 41
+#define USERNAME_REQUIRED 42
+#define HIGHER_ACCESS_REQUIRED 50
+#define MAX_SESSIONS_EXCEEDED 51
+#define RESOURCE_BUSY 52
+#define RESOURCE_NOT_OPEN 53
+#define NOT_HERE 60
+#define INVALID_FLOOR_OPERATION 61
+#define NO_SUCH_USER 70
+#define FILE_NOT_FOUND 71
+#define ROOM_NOT_FOUND 72
+#define NO_SUCH_SYSTEM 73
+#define ALREADY_EXISTS 74
+#define MESSAGE_NOT_FOUND 75
/*
* NLI is the string that shows up in a who's online listing for sessions
* that are active, but for which no user has yet authenticated.
} addrbookent;
+#define AJAX (1<<0)
+#define ANONYMOUS (1<<1)
+#define NEED_URL (1<<2)
+#define XHTTP_COMMANDS (1<<3)
+#define BOGUS (1<<4)
+#define URLNAMESPACE (1<<4)
+#define LOGCHATTY (1<<5)
+#define COOKIEUNNEEDED (1<<6)
+#define ISSTATIC (1<<7)
+#define FORCE_SESSIONCLOSE (1<<8)
+
+
+typedef void (*WebcitHandlerFunc)(void);
+typedef struct _WebcitHandler{
+ WebcitHandlerFunc F;
+ long Flags;
+ StrBuf *Name;
+} WebcitHandler;
+void WebcitAddUrlHandler(const char * UrlString, long UrlSLen, WebcitHandlerFunc F, long Flags);
+
typedef struct _headereval {
ExamineMsgHeaderFunc evaluator;
int Type;
eNone
};
+enum {
+ eGET,
+ ePOST,
+ eOPTIONS,
+ ePROPFIND,
+ ePUT,
+ eDELETE,
+ eHEAD,
+ eMOVE,
+ eCOPY,
+ eNONE
+};
+const char *ReqStrs[eNONE];
+
+#define NO_AUTH 0
+#define AUTH_COOKIE 1
+#define AUTH_BASIC 2
+
+typedef struct _ParsedHttpHdrs {
+ int http_sock; /**< HTTP server socket */
+ const char *Pos;
+ StrBuf *ReadBuf;
+
+ long eReqType; /**< eGET, ePOST.... */
+ const WebcitHandler *Handler;
+
+ int DontNeedAuth;
+ int got_auth;
+ long ContentLength;
+ time_t if_modified_since;
+ int gzip_ok; /**< Nonzero if Accept-encoding: gzip */
+
+ StrBuf *c_username;
+ StrBuf *c_password;
+ StrBuf *c_roomname;
+ StrBuf *RawCookie;
+ int desired_session;
+
+ StrBuf *ContentType;
+
+ StrBuf *RawLine;/* TODO: freeme */
+ StrBuf *ReqLine;
+ StrBuf *http_host; /**< HTTP Host: header */
+ StrBuf *browser_host;
+ StrBuf *user_agent;
+
+ StrBuf *this_page; /**< URL of current page */
+ StrBuf *PlainArgs; /*TODO: freeme*/
+ HashList *urlstrings; /**< variables passed to webcit in a URL */
+ HashList *HTTPHeaders; /**< the headers the client sent us */
+ int nWildfireHeaders; /**< how many wildfire headers did we already send? */
+} ParsedHttpHdrs;
+
+
/*
* One of these is kept for each active Citadel session.
* HTTP transactions are bound to one at a time.
int nonce; /**< session nonce (to prevent session riding) */
/* Session local Members */
- int http_sock; /**< HTTP server socket */
int serv_sock; /**< Client socket to Citadel server */
- StrBuf *ReadBuf;
+ StrBuf *ReadBuf; /**< here we keep our stuff while reading linebuffered from the server. */
+ StrBuf *MigrateReadLineBuf; /**< here we buffer legacy server read stuff */
+ const char *ReadPos; /**< whats our read position in ReadBuf? */
int chat_sock; /**< Client socket to Citadel server - for chat */
time_t lastreq; /**< Timestamp of most recent HTTP */
time_t last_pager_check; /**< last time we polled for instant msgs */
ServInfo *serv_info; /**< Iformation about the citserver we're connected to */
+ int is_ajax; /** < are we doing an ajax request? */
+
/* Request local Members */
StrBuf *CLineBuf; /**< linebuffering client stuff */
- StrBuf *UrlFragment1; /**< first urlfragment, if NEED_URL is specified by the handler*/
- StrBuf *UrlFragment2; /**< second urlfragment, if NEED_URL is specified by the handler*/
- StrBuf *UrlFragment3; /**< third urlfragment, if NEED_URL is specified by the handler*/
- StrBuf *UrlFragment4; /**< fourth urlfragment, if NEED_URL is specified by the handler*/
+ ParsedHttpHdrs *Hdr;
StrBuf *WBuf; /**< Our output buffer */
StrBuf *HBuf; /**< Our HeaderBuffer */
- StrBuf *this_page; /**< URL of current page */
- HashList *urlstrings; /**< variables passed to webcit in a URL */
- HashList *vars; /**< HTTP variable substitutions for this page */
- StrBuf *http_host; /**< HTTP Host: header */
- int is_ajax; /** < are we doing an ajax request? */
- int gzip_ok; /**< Nonzero if Accept-encoding: gzip */
- int nWildfireHeaders; /**< how many wildfire headers did we already send? */
+ HashList *vars; /**< HTTP variable substitutions for this page */
StrBuf *trailing_javascript; /**< extra javascript to be appended to page */
char ImportantMessage[SIZ]; /**< ??? todo */
+ StrBuf *ImportantMsg;
/* accounting */
StrBuf *wc_username; /**< login name of current user */
int need_vali; /**< New users require validation. */
/* Preferences */
- char cs_inet_email[256]; /**< User's preferred Internet addr. */
+ StrBuf *cs_inet_email; /**< User's preferred Internet addr. */
char reply_to[512]; /**< reply-to address */
HashList *hash_prefs; /**< WebCit preferences for this user */
StrBuf *DefaultCharset; /**< Charset the user preferes */
};
+
+typedef void (*Header_Evaluator)(StrBuf *Line, ParsedHttpHdrs *hdr);
+
+typedef struct _HttpHeader {
+ Header_Evaluator H;
+ StrBuf *Val;
+ int HaveEvaluator;
+} OneHttpHeader;
+
+void RegisterHeaderHandler(const char *Name, long Len, Header_Evaluator F);
+
+
/* values for WC->current_iconbar */
enum {
current_iconbar_menu, /* view the icon menue */
extern int is_https;
extern int setup_wizard;
extern char wizard_filename[];
-extern time_t if_modified_since;
extern int follow_xff;
-extern HashList *HandlerHash;
-extern HashList *PreferenceHooks;
-extern HashList *ZoneHash;
-extern HashList *SortHash;
void InitialiseSemaphores(void);
void begin_critical_section(int which_one);
void display_aide_menu(void);
void display_advanced_menu(void);
void slrp_highest(void);
-ServInfo *get_serv_info(StrBuf *, char *);
+ServInfo *get_serv_info(StrBuf *, StrBuf *);
+int GetConnected(void);
void DeleteServInfo(ServInfo **FreeMe);
int uds_connectsock(char *);
int tcp_connectsock(char *, char *);
int serv_getln(char *strbuf, int bufsize);
int StrBuf_ServGetln(StrBuf *buf);
-int StrBuf_ServGetlnBuffered(StrBuf *buf);
int GetServerStatus(StrBuf *Line, long* FullState);
void serv_puts(const char *string);
void who(void);
void output_custom_content_header(const char *ctype);
void wprintf(const char *format,...)__attribute__((__format__(__printf__,1,2)));
void hprintf(const char *format,...)__attribute__((__format__(__printf__,1,2)));
-void output_static(char *what);
+void output_static(const char* What);
void print_menu_box(char* Title, char *Class, int nLines, ...);
long stresc(char *target, long tSize, char *strbuf, int nbsp, int nolinebreaks);
void msgescputs1(char *strbuf);
void dump_vars(void);
void embed_main_menu(void);
-void serv_read(char *buf, int bytes);
void SetAccessCommand(long Oper);
void do_addrbook_view(addrbookent *addrbook, int num_ab);
void fetch_ab_name(message_summary *Msg, char **namebuf);
-void display_vcard(StrBuf *Target, const char *vcard_source, char alpha, int full, char **storename, long msgnum);
+void display_vcard(StrBuf *Target, StrBuf *vcard_source, char alpha, int full, char **storename, long msgnum);
void jsonMessageList(void);
void new_summary_view(void);
void getseen(void);
void confirm_delete_msg(void);
void display_success(char *);
void authorization_required(const char *message);
+int ReEstablish_Session(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 serv_write(const char *buf, int nbytes);
void serv_putbuf(const StrBuf *string);
void serv_printf(const char *format,...)__attribute__((__format__(__printf__,1,2)));
-void load_floorlist(void);
+void load_floorlist(StrBuf *Buf);
void shutdown_sessions(void);
void do_housekeeping(void);
void smart_goto(const StrBuf *);
void worker_entry(void);
-void session_loop(HashList *HTTPHeaders, StrBuf *ReqLine, StrBuf *ReqType, StrBuf *ReadBuf);
+void session_loop(void);
size_t wc_strftime(char *s, size_t max, const char *format, const struct tm *tm);
-void fmt_time(char *buf, time_t thetime);
+void fmt_time(char *buf, size_t siz, time_t thetime);
void httpdate(char *buf, time_t thetime);
time_t httpdate_to_timestamp(StrBuf *buf);
void end_webcit_session(void);
char *memreadlinelen(char *start, char *buf, int maxlen, int *retlen);
long extract_token(char *dest, const char *source, int parmnum, char separator, int maxlen);
void remove_token(char *source, int parmnum, char separator);
-char *load_mimepart(long msgnum, char *partnum);
+StrBuf *load_mimepart(long msgnum, char *partnum);
void MimeLoadData(wc_mime_attachment *Mime);
int pattern2(char *search, char *patn);
-void do_edit_vcard(long, char *, char *, const char *);
-void striplt(char *);
-void stripltlen(char *, int *);
-void select_user_to_edit(char *message, char *preselect);
+void do_edit_vcard(long msgnum, char *partnum,
+ message_summary *VCMsg,
+ wc_mime_attachment *VCAtt,
+ char *return_to,
+ const char *force_room);
+
+void select_user_to_edit(const char *preselect);
void delete_user(char *);
void do_change_view(int);
void folders(void);
void display_addressbook(long msgnum, char alpha);
void offer_start_page(StrBuf *Target, WCTemplputParams *TP);
-void convenience_page(char *titlebarcolor, char *titlebarmsg, char *messagetext);
+void convenience_page(const char *titlebarcolor, const char *titlebarmsg, const char *messagetext);
void output_html(const char *, int, int, StrBuf *, StrBuf *);
void do_listsub(void);
ssize_t write(int fd, const void *buf, size_t count);
void partstat_as_string(char *buf, icalproperty *attendee);
icalcomponent *ical_encapsulate_subcomponent(icalcomponent *subcomp);
void check_attendee_availability(icalcomponent *supplied_vevent);
-void do_freebusy(const char *req);
int ical_ctdl_is_overlap(
struct icaltimetype t1start,
struct icaltimetype t1end,
extern char *months[];
extern char *days[];
-int read_server_binary(StrBuf *Ret, size_t total_len);
+int read_server_binary(StrBuf *Ret, size_t total_len, StrBuf *Buf);
int StrBuf_ServGetBLOB(StrBuf *buf, long BlobSize);
+int StrBuf_ServGetBLOBBuffered(StrBuf *buf, long BlobSize);
int read_server_text(StrBuf *Buf, long *nLines);
-int goto_config_room(void);
-long locate_user_vcard_in_this_room(void);
+int goto_config_room(StrBuf *Buf);
+long locate_user_vcard_in_this_room(message_summary **VCMsg,
+ wc_mime_attachment **VCAtt);
void sleeeeeeeeeep(int);
void http_transmit_thing(const char *content_type, int is_static);
long unescape_input(char *buf);
void do_selected_iconbar(void);
void spawn_another_worker_thread(void);
-void display_rss(const StrBuf *roomname, StrBuf *request_method);
void StrEndTab(StrBuf *Target, int tabnum, int num_tabs);
void StrBeginTab(StrBuf *Target, int tabnum, int num_tabs);
void StrTabbedDialog(StrBuf *Target, int num_tabs, StrBuf *tabnames[]);
#define DATEFMT_BRIEF 1
#define DATEFMT_RAWDATE 2
#define DATEFMT_LOCALEDATE 3
-void webcit_fmt_date(char *buf, time_t thetime, int Format);
+void webcit_fmt_date(char *buf, size_t siz, time_t thetime, int Format);
int fetch_http(char *url, char *target_buf, int maxbytes);
void free_attachments(wcsession *sess);
void summary(void);
void http_datestring(char *buf, size_t n, time_t xtime);
-
-typedef void (*WebcitHandlerFunc)(void);
-typedef struct _WebcitHandler{
- WebcitHandlerFunc F;
- long Flags;
-} WebcitHandler;
-void WebcitAddUrlHandler(const char * UrlString, long UrlSLen, WebcitHandlerFunc F, long Flags);
-
-#define AJAX (1<<0)
-#define ANONYMOUS (1<<1)
-#define NEED_URL (1<<2)
-
+typedef void (*IcalCallbackFunc)(icalcomponent *, long, char*, int, struct calview *);
/* These should be empty, but we have them for testing */
#define DEFAULT_HTTPAUTH_USER ""