StrBuf_ServGetln(Buf);
/** Tell the server what kind of richtext we prefer */
- serv_puts("MSGP text/calendar|text/vnote|text/html|text/plain");
+ serv_puts("MSGP text/calendar|text/vnote|text/html|text/plain");//// TODO: register me...
StrBuf_ServGetln(Buf);
/*
wcsession *WCC = WC;
if (WCC->ReadBuf == NULL)
- WCC->ReadBuf = NewStrBuf();
+ WCC->ReadBuf = NewStrBufPlain(NULL, SIZ * 4);
if (is_uds) /* unix domain socket */
WCC->serv_sock = uds_connectsock(serv_sock_name);
else /* tcp socket */
* unless we are following X-Forwarded-For: headers
* and such a header has already turned up something.
*/
- if ( (!follow_xff) || (StrLength(WCC->Hdr->browser_host) == 0) ) {
- if (WCC->Hdr->browser_host == NULL) {
- WCC->Hdr->browser_host = NewStrBuf();
+ if ( (!follow_xff) || (StrLength(WCC->Hdr->HR.browser_host) == 0) ) {
+ if (WCC->Hdr->HR.browser_host == NULL) {
+ WCC->Hdr->HR.browser_host = NewStrBuf();
Put(WCC->Hdr->HTTPHeaders, HKEY("FreeMeWithTheOtherHeaders"),
- WCC->Hdr->browser_host, HFreeStrBuf);
+ WCC->Hdr->HR.browser_host, HFreeStrBuf);
}
- locate_host(WCC->Hdr->browser_host, WCC->Hdr->http_sock);
+ locate_host(WCC->Hdr->HR.browser_host, WCC->Hdr->http_sock);
}
if (WCC->serv_info == NULL)
- WCC->serv_info = get_serv_info(WCC->Hdr->browser_host, WCC->Hdr->user_agent);
+ WCC->serv_info = get_serv_info(WCC->Hdr->HR.browser_host, WCC->Hdr->HR.user_agent);
if (WCC->serv_info == NULL){
begin_burst();
wprintf(_("Received unexpected answer from Citadel "
return 1;
}
}
- if (WCC->ReadBuf == NULL)
- WCC->ReadBuf = NewStrBuf();
- if (is_uds)/* unix domain socket */
- WCC->serv_sock = uds_connectsock(serv_sock_name);
- else /* tcp socket */
- WCC->serv_sock = tcp_connectsock(ctdlhost, ctdlport);
-
- if (WCC->serv_sock < 0) {
- do_logout();
- FreeStrBuf(&WCC->ReadBuf);
- return 1;
- }
- else {
- long Status;
- StrBuf *Buf;
-
- Buf = NewStrBuf();
- WCC->connected = 1;
- StrBuf_ServGetln(Buf);
- GetServerStatus(Buf,&Status);
- /* get the server greeting */
-
- /* Are there too many users already logged in? */
- if (Status == 571) {
- wprintf(_("This server is already serving its maximum number of users and cannot accept any additional logins at this time. Please try again later or contact your system administrator."));
- end_burst();
- end_webcit_session();
- FreeStrBuf(&Buf);
- return 1;
- }
-
- /*
- * From what host is our user connecting? Go with
- * the host at the other end of the HTTP socket,
- * unless we are following X-Forwarded-For: headers
- * and such a header has already turned up something.
- */
- if ( (!follow_xff) || (StrLength(WCC->Hdr->browser_host) == 0) ) {
- if (WCC->Hdr->browser_host == NULL) {
- WCC->Hdr->browser_host = NewStrBuf();
- Put(WCC->Hdr->HTTPHeaders, HKEY("FreeMeWithTheOtherHeaders"),
- WCC->Hdr->browser_host, HFreeStrBuf);
- }
- locate_host(WCC->Hdr->browser_host, WCC->Hdr->http_sock);
- }
- if (WCC->serv_info == NULL)
- WCC->serv_info = get_serv_info(WCC->Hdr->browser_host, WCC->Hdr->user_agent);
- if (WCC->serv_info == NULL){
- begin_burst();
- wprintf(_("Received unexpected answer from Citadel "
- "server; bailing out."));
- hprintf("HTTP/1.1 200 OK\r\n");
- hprintf("Content-type: text/plain; charset=utf-8\r\n");
- end_burst();
- end_webcit_session();
- FreeStrBuf(&Buf);
- return 1;
- }
- if (WCC->serv_info->serv_rev_level < MINIMUM_CIT_VERSION) {
- begin_burst();
- wprintf(_("You are connected to a Citadel "
- "server running Citadel %d.%02d. \n"
- "In order to run this version of WebCit "
- "you must also have Citadel %d.%02d or"
- " newer.\n\n\n"),
- WCC->serv_info->serv_rev_level / 100,
- WCC->serv_info->serv_rev_level % 100,
- MINIMUM_CIT_VERSION / 100,
- MINIMUM_CIT_VERSION % 100
- );
- hprintf("HTTP/1.1 200 OK\r\n");
- hprintf("Content-type: text/plain; charset=utf-8\r\n");
- end_burst();
- end_webcit_session();
- FreeStrBuf(&Buf);
- return 1;
- }
- FreeStrBuf(&Buf);
- }
return 0;
}
{
const char *ptr, *pte;
const char *BufPtr = NULL;
- StrBuf *Line = NewStrBuf();
- StrBuf *Line1 = NewStrBuf();
- StrBuf *Line2 = NewStrBuf();
+ StrBuf *Line = NewStrBufPlain(NULL, SIZ);
+ StrBuf *Line1 = NewStrBufPlain(NULL, SIZ);
+ StrBuf *Line2 = NewStrBufPlain(NULL, SIZ);
int bn = 0;
int bq = 0;
int i, n, done = 0;