From 48537c783a8d9769e005719f1268f83b1598e09e Mon Sep 17 00:00:00 2001 From: Art Cancro Date: Wed, 19 Dec 2018 18:12:03 -0500 Subject: [PATCH] version 924 --- citadel/citadel.h | 6 +-- citadel/debian/changelog | 6 +++ libcitadel/debian/changelog | 6 +++ libcitadel/lib/libcitadel.h | 20 +++------ textclient/debian/changelog | 6 +++ textclient/textclient.h | 2 +- webcit/debian/changelog | 6 +++ webcit/webcit.h | 90 ++++--------------------------------- 8 files changed, 40 insertions(+), 102 deletions(-) diff --git a/citadel/citadel.h b/citadel/citadel.h index b7d421bca..f005d589d 100644 --- a/citadel/citadel.h +++ b/citadel/citadel.h @@ -35,13 +35,11 @@ extern "C" { */ #define CITADEL PACKAGE_STRING -#define REV_LEVEL 923 // This version +#define REV_LEVEL 924 // This version #define REV_MIN 591 // Oldest compatible database #define EXPORT_REV_MIN 760 // Oldest compatible export files #define LIBCITADEL_MIN 922 // Minimum required version of libcitadel - -#define SERVER_TYPE 0 // zero for stock Citadel; other developers please - // obtain SERVER_TYPE codes for your implementations +#define SERVER_TYPE 0 // zero for stock Citadel; other developers please obtain SERVER_TYPE codes for your implementations #ifdef LIBCITADEL_VERSION_NUMBER #if LIBCITADEL_VERSION_NUMBER < LIBCITADEL_MIN diff --git a/citadel/debian/changelog b/citadel/debian/changelog index a192d46f9..430a9c8ee 100644 --- a/citadel/debian/changelog +++ b/citadel/debian/changelog @@ -1,3 +1,9 @@ +citadel (924-1) stable; urgency=low + + * new release + + -- Wilfried Goesgens Wed, 19 Dec 2018 16:57:49 -0500 + citadel (917-1) stable; urgency=low * new release diff --git a/libcitadel/debian/changelog b/libcitadel/debian/changelog index 34abd45d0..9da98bc34 100644 --- a/libcitadel/debian/changelog +++ b/libcitadel/debian/changelog @@ -1,3 +1,9 @@ +libcitadel (924-1) stable; urgency=low + + * new release + + -- Wilfried Goesgens Wed, 19 Dec 2018 16:57:49 -0500 + libcitadel (917-1) stable; urgency=low * new release diff --git a/libcitadel/lib/libcitadel.h b/libcitadel/lib/libcitadel.h index 29f897d26..b035a4744 100644 --- a/libcitadel/lib/libcitadel.h +++ b/libcitadel/lib/libcitadel.h @@ -12,12 +12,10 @@ * GNU General Public License for more details. */ - /* protect against double includes */ #ifndef LIBCITADEL_H #define LIBCITADEL_H - /* * since we reference time_t... */ @@ -28,7 +26,7 @@ #include #include -#define LIBCITADEL_VERSION_NUMBER 922 +#define LIBCITADEL_VERSION_NUMBER 924 /* * Here's a bunch of stupid magic to make the MIME parser portable. @@ -37,7 +35,6 @@ #define SIZ 4096 #endif - typedef enum AXLevel { AxDeleted = 0, AxNewU = 1, @@ -152,9 +149,8 @@ void mime_parser(char *content_start, char *content_end, void *userdata, int dont_decode); - - char *fixed_partnum(char *); + void mime_decode(char *partnum, char *part_start, size_t length, char *content_type, char *charset, char *encoding, @@ -166,11 +162,13 @@ void mime_decode(char *partnum, MimeParserCallBackType PostMultiPartCallBack, void *userdata, int dont_decode); + int mime_decode_now (char *part_start, size_t length, char *encoding, char **decoded, size_t *bytes_decoded); + void the_mime_parser(char *partnum, char *content_start, char *content_end, MimeParserCallBackType CallBack, @@ -196,7 +194,6 @@ void SwapBuffers(StrBuf *A, StrBuf *B); long StrBufShrinkToFit(StrBuf *Buf, int Force); void ReAdjustEmptyBuf(StrBuf *Buf, long ThreshHold, long NewSize); void NewStrBufDupAppendFlush(StrBuf **CreateRelpaceMe, StrBuf *CopyFlushMe, const char *NoMe, int KeepOriginal); - int StrBufPlain(StrBuf *Buf, const char* ptr, int nChars); StrBuf* _NewConstStrBuf(const char* StringConstant, size_t SizeOfStrConstant); #define NewConstStrBuf(a) _NewConstStrBuf(a, sizeof(a)) @@ -205,14 +202,12 @@ char *SmashStrBuf (StrBuf **SmashMe); void HFreeStrBuf (void *VFreeMe); int FlushStrBuf(StrBuf *buf); int FLUSHStrBuf(StrBuf *buf); /* expensive but doesn't leave content behind for others to find in case of errors */ - const char *ChrPtr(const StrBuf *Str); int StrLength(const StrBuf *Str); #define SKEY(a) ChrPtr(a), StrLength(a) void StrBufAsciify(StrBuf *Buf, const char repl); long StrBufPeek(StrBuf *Buf, const char* ptr, long nThChar, char PeekValue); long StrBufPook(StrBuf *Buf, const char* ptr, long nThChar, long nChars, char PookValue); - int StrBufTCP_read_line(StrBuf *buf, int *fd, int append, const char **Error); int StrBufReadBLOB(StrBuf *Buf, int *fd, int append, long nBytes, const char **Error); #define NNN_TERM 1 @@ -610,12 +605,7 @@ void JsonObjectAppend(JsonValue *Array, JsonValue *Val); void SerializeJson(StrBuf *Target, JsonValue *Val, int FreeVal); - -/* - * Citadels Wildfire implementation, see - * http://www.firephp.org/Wiki/Reference/Protocol - * and http://wildfirehq.org/ for details - */ +/* the following declarations are leftover from the defunct wildfire implementation. can we remove them? */ typedef void (*AddHeaderFunc)(const char *HdrName, const char *HdrValue); typedef enum _WF_MessageType { diff --git a/textclient/debian/changelog b/textclient/debian/changelog index 38b455c16..959f35a9c 100644 --- a/textclient/debian/changelog +++ b/textclient/debian/changelog @@ -1,3 +1,9 @@ +textclient (924-1) stable; urgency=low + + * new release + + -- Wilfried Goesgens Wed, 19 Dec 2018 16:57:49 -0500 + textclient (917-1) stable; urgency=low * new release diff --git a/textclient/textclient.h b/textclient/textclient.h index 2fa619ee7..0dfb14c76 100644 --- a/textclient/textclient.h +++ b/textclient/textclient.h @@ -13,7 +13,7 @@ #define UDS "_UDS_" #define DEFAULT_HOST "localhost" #define DEFAULT_PORT "504" -#define CLIENT_VERSION 920 +#define CLIENT_VERSION 924 #define CLIENT_TYPE 0 /* commands we can send to the stty_ctdl() routine */ diff --git a/webcit/debian/changelog b/webcit/debian/changelog index f8fe2ef3e..52c85c58b 100644 --- a/webcit/debian/changelog +++ b/webcit/debian/changelog @@ -1,3 +1,9 @@ +webcit (924-1) stable; urgency=low + + * new release + + -- Wilfried Goesgens Wed, 19 Dec 2018 16:57:49 -0500 + webcit (917-1) stable; urgency=low * new release diff --git a/webcit/webcit.h b/webcit/webcit.h index e6e10d07e..921034603 100644 --- a/webcit/webcit.h +++ b/webcit/webcit.h @@ -127,9 +127,9 @@ extern char *ssl_cipher_list; #define PORT_NUM 2000 /* port number to listen on */ #define DEVELOPER_ID 0 #define CLIENT_ID 4 -#define CLIENT_VERSION 921 /* This version of WebCit */ -#define MINIMUM_CIT_VERSION 920 /* Minimum required version of Citadel server */ -#define LIBCITADEL_MIN 921 /* Minimum required version of libcitadel */ +#define CLIENT_VERSION 924 /* 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 */ @@ -140,16 +140,12 @@ extern char *ssl_cipher_list; #define USERCONFIGROOM "My Citadel Config" #define DEFAULT_MAXMSGS 20 - #ifdef LIBCITADEL_VERSION_NUMBER #if LIBCITADEL_VERSION_NUMBER < LIBCITADEL_MIN #error libcitadel is too old. Please upgrade it before continuing. #endif #endif - - - #define SRV_STATUS_MSG(ServerLineBuf) (ChrPtr(ServerLineBuf) + 4), (StrLength(ServerLineBuf) - 4) #define MAJORCODE(a) (((int)(a / 100) ) * 100) @@ -300,7 +296,6 @@ typedef struct _WebcitHandler{ StrBuf *DisplayName; } WebcitHandler; - void WebcitAddUrlHandler(const char * UrlString, long UrlSLen, const char *DisplayName, long dslen, WebcitHandlerFunc F, long Flags); typedef struct _headereval { @@ -308,13 +303,11 @@ typedef struct _headereval { int Type; } headereval; - struct attach_link { char partnum[32]; char html[1024]; }; - enum { eUp, eDown, @@ -340,8 +333,6 @@ extern const char *ReqStrs[eNONE]; #define AUTH_COOKIE 1 #define AUTH_BASIC 2 - - typedef struct _HdrRefs { long eReqType; /* HTTP method */ int desired_session; @@ -393,7 +384,6 @@ typedef struct _ParsedHttpHdrs { HdrRefs HR; } ParsedHttpHdrs; - /* * One of these is kept for each active Citadel session. * HTTP transactions are bound to one at a time. @@ -577,99 +567,50 @@ void wcc_printf(const char *FILE, const char *FUNCTION, long LINE, const char *f #else void wc_printf(const char *format,...)__attribute__((__format__(__printf__,1,2))); #endif - void hprintf(const char *format,...)__attribute__((__format__(__printf__,1,2))); - void CheckAuthBasic(ParsedHttpHdrs *hdr); void GetAuthBasic(ParsedHttpHdrs *hdr); - void sleeeeeeeeeep(int); - size_t wc_strftime(char *s, size_t max, const char *format, const struct tm *tm); 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); - - - - -void cookie_to_stuff(StrBuf *cookie, - int *session, - StrBuf *user, - StrBuf *pass, - StrBuf *room, - StrBuf *language -); +void cookie_to_stuff(StrBuf *cookie, int *session, StrBuf *user, StrBuf *pass, StrBuf *room, StrBuf *language); void locate_host(StrBuf *TBuf, int); void become_logged_in(const StrBuf *user, const StrBuf *pass, StrBuf *serv_response); - void display_login(void); void display_openids(void); void display_default_landing_page(void); void do_welcome(void); - void display_reg(int during_login); void display_main_menu(void); void display_aide_menu(void); - void RegisterEmbeddableMimeType(const char *MimeType, long MTLen, int Priority); void CreateMimeStr(void); - - void pop_destination(void); - void FmOut(StrBuf *Target, const char *align, const StrBuf *Source); void wDumpContent(int); - - void PutRequestLocalMem(void *Data, DeleteHashDataFunc DeleteIt); - -void output_headers( int do_httpheaders, - int do_htmlhead, - int do_room_banner, - int unset_cookies, - int suppress_check, - int cache); +void output_headers(int do_httpheaders, int do_htmlhead, int do_room_banner, int unset_cookies, int suppress_check, int cache); void cdataout(char *rawdata); - - void url(char *buf, size_t bufsize); void UrlizeText(StrBuf* Target, StrBuf *Source, StrBuf *WrkBuf); - void display_success(const char *successmessage); - void shutdown_sessions(void); - - - StrBuf *load_mimepart(long msgnum, char *partnum); void MimeLoadData(wc_mime_attachment *Mime); -void do_edit_vcard(long msgnum, char *partnum, - message_summary *VCMsg, - wc_mime_attachment *VCAtt, - const char *return_to, - const char *force_room); - +void do_edit_vcard(long msgnum, char *partnum, message_summary *VCMsg, wc_mime_attachment *VCAtt, const char *return_to, const char *force_room); void select_user_to_edit(const char *preselect); - void convenience_page(const char *titlebarcolor, const char *titlebarmsg, const char *messagetext); void output_html(const char *, int, int, StrBuf *, StrBuf *); - ssize_t write(int fd, const void *buf, size_t count); void cal_process_attachment(wc_mime_attachment *Mime); - void begin_ajax_response(void); void end_ajax_response(void); - extern char *months[]; extern char *days[]; -long locate_user_vcard_in_this_room(message_summary **VCMsg, - wc_mime_attachment **VCAtt); +long locate_user_vcard_in_this_room(message_summary **VCMsg, wc_mime_attachment **VCAtt); void http_transmit_thing(const char *content_type, int is_static); void http_transmit_headers(const char *content_type, int is_static, long is_chunked, int is_gzip); long unescape_input(char *buf); @@ -680,42 +621,30 @@ void StrTabbedDialog(StrBuf *Target, int num_tabs, StrBuf *tabnames[]); void tabbed_dialog(int num_tabs, const char *tabnames[]); void begin_tab(int tabnum, int num_tabs); void end_tab(int tabnum, int num_tabs); - int get_time_format_cached (void); void display_wiki_pagelist(void); void str_wiki_index(StrBuf *); - HashList *GetRoomListHashLKRA(StrBuf *Target, WCTemplputParams *TP); - -/* actual supported locales */ -void TmplGettext(StrBuf *Target, WCTemplputParams *TP); - +void TmplGettext(StrBuf *Target, WCTemplputParams *TP); /* actual supported locales */ void set_selected_language(const char *); void go_selected_language(void); const char *get_selected_language(void); - void utf8ify_rfc822_string(char **buf); - 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); - /* These should be empty, but we have them for testing */ #define DEFAULT_HTTPAUTH_USER "" #define DEFAULT_HTTPAUTH_PASS "" - /* Exit codes 101 through 109 are initialization failures so we don't want to * just keep respawning indefinitely. */ #define WC_EXIT_BIND 101 /* Can't bind to the port */ #define WC_EXIT_SSL 102 /* Can't initialize SSL */ - #define WC_TIMEFORMAT_NONE 0 #define WC_TIMEFORMAT_AMPM 1 #define WC_TIMEFORMAT_24 2 @@ -724,8 +653,5 @@ extern int time_to_die; /* Nonzero if server is shutting down */ extern int DisableGzip; void display_summary_page(void); - HashList *GetValidDomainNames(StrBuf *Target, WCTemplputParams *TP); void output_error_pic(const char *ErrMsg1, const char *ErrMsg2); - - -- 2.30.2