- /*
+/*
* $Id$
*/
StrBuf *Buf;
Buf = NewStrBuf();
- /** Tell the server what kind of richtext we prefer */
+
+ /* Tell the server what kind of richtext we prefer */
serv_putbuf(EmbeddableMimeStrs);
StrBuf_ServGetln(Buf);
/*
* get info about the server we've connected to
*
- * browser_host the citadell we want to connect to
+ * browser_host the citadel we want to connect to
* user_agent which browser uses our client?
*/
ServInfo *get_serv_info(StrBuf *browser_host, StrBuf *user_agent)
int a;
Buf = NewStrBuf();
- /** Tell the server what kind of client is connecting */
+
+ /* Tell the server what kind of client is connecting */
serv_printf("IDEN %d|%d|%d|%s|%s",
DEVELOPER_ID,
CLIENT_ID,
ChrPtr(browser_host)
);
StrBuf_ServGetln(Buf);
+ if (GetServerStatus(Buf, NULL) != 2) {
+ lprintf(0, "get_serv_info(IDEN): unexpected answer [%s]\n",
+ ChrPtr(Buf));
+ FreeStrBuf(&Buf);
+ return NULL;
+ }
/*
* Tell the server that when we save a calendar event, we
*/
serv_puts("ICAL sgi|1");
StrBuf_ServGetln(Buf);
+ if (GetServerStatus(Buf, NULL) != 2) {
+ lprintf(0, "get_serv_info(ICAL sgi|1): unexpected answer [%s]\n",
+ ChrPtr(Buf));
+ FreeStrBuf(&Buf);
+ return NULL;
+ }
- /** Now ask the server to tell us a little bit about itself... */
+ /* Now ask the server to tell us a little bit about itself... */
serv_puts("INFO");
StrBuf_ServGetln(Buf);
if (GetServerStatus(Buf, NULL) != 1) {
+ lprintf(0, "get_serv_info(INFO sgi|1): unexpected answer [%s]\n",
+ ChrPtr(Buf));
FreeStrBuf(&Buf);
return NULL;
}
memset(info, 0, sizeof(ServInfo));
a = 0;
while (StrBuf_ServGetln(Buf), (strcmp(ChrPtr(Buf), "000")!= 0)) {
-/* lprintf (1, "a: %d [%s]", a, ChrPtr(Buf));*/
switch (a) {
case 0:
info->serv_pid = StrToi(Buf);
if (is_uds) /* unix domain socket */
WCC->serv_sock = uds_connectsock(serv_sock_name);
else /* tcp socket */
- WCC->serv_sock = tcp_connectsock(ctdlhost, ctdlport);
+ WCC->serv_sock = tcp_connectsock(ctdlhost, atoi(ctdlport));
if (WCC->serv_sock < 0) {
do_logout();
}
else {
long Status;
+ int short_status;
Buf = NewStrBuf();
WCC->connected = 1;
StrBuf_ServGetln(Buf); /* get the server greeting */
- GetServerStatus(Buf, &Status);
+ short_status = GetServerStatus(Buf, &Status);
FreeStrBuf(&Buf);
- /* 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."));
+
+ /* Server isn't ready for us? */
+ if (short_status != 2) {
+ if (Status == 571) {
+ wc_printf(_("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."));
+ }
+ else {
+ wc_printf("%ld %s\n",
+ Status,
+ _("Received unexpected answer from Citadel server; bailing out.")
+ );
+ }
end_burst();
end_webcit_session();
return 1;
}
+ /* 2010jun03: every now and then the connection to Citadel dies before this point. why? */
+
/*
* From what host is our user connecting? Go with
* the host at the other end of the HTTP socket,
}
locate_host(WCC->Hdr->HR.browser_host, WCC->Hdr->http_sock);
}
- if (WCC->serv_info == NULL)
+ if (WCC->serv_info == NULL) {
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 "
- "server; bailing out."));
+ wc_printf(_("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();
}
if (WCC->serv_info->serv_rev_level < MINIMUM_CIT_VERSION) {
begin_burst();
- wprintf(_("You are connected to a Citadel "
+ wc_printf(_("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"
return 0;
}
-/**
+/*
* Read Citadel variformat text and spit it out as HTML.
* align html align string
*/
while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
if ((intext == 1) && (isspace(buf[0]))) {
- wprintf("<br />");
+ wc_printf("<br />");
}
intext = 1;
- /**
+ /*
* Quoted text should be displayed in italics and in a
* different colour. This code understands Citadel-style
* " >" quotes and will convert to <BLOCKQUOTE> tags.
if ((bq == 1) && (!strncmp(buf, " >", 2))) {
strcpy(buf, &buf[2]);
}
- /** Activate embedded URL's */
+ /* Activate embedded URL's */
url(buf, sizeof(buf));
escputs(buf);
StrBufAppendBufPlain(Target, HKEY("\n"), 0);
}
if (bq == 1) {
- wprintf("</I>");
+ wc_printf("</I>");
}
- wprintf("</div><br />\n");
+ wc_printf("</div><br />\n");
}
void FmOut(StrBuf *Target, char *align, StrBuf *Source)
i++;
}
- /**
+ /*
* Quoted text should be displayed in italics and in a
* different colour. This code understands Citadel-style
* " >" quotes and will convert to <BLOCKQUOTE> tags.
if (StrLength(Line) == 0)
continue;
- /** Activate embedded URL's */
+
+ /* Activate embedded URL's */
UrlizeText(Line1, Line, Line2);
StrEscAppend(Target, Line1, NULL, 0, 0);
while ((BufPtr != StrBufNOTNULL) &&
(BufPtr != NULL));
- for (i = 0; i < bn; i++)
+ for (i = 0; i < bn; i++) {
StrBufAppendBufPlain(Target, HKEY("</blockquote>"), 0);
+ }
StrBufAppendBufPlain(Target, HKEY("</div><br>\n"), 0);
FreeStrBuf(&Line);
FreeStrBuf(&Line1);
}
-
-
-/**
- * Read Citadel variformat text and spit it out as HTML in a form
+/*
+ * Read Citadel variformat text and spit it out as HTML in a form
* suitable for embedding in another message (forward/quote).
* (NO LINEBREAKS ALLOWED HERE!)
*/
while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
if ((intext == 1) && (isspace(buf[0]))) {
- wprintf("<br />");
+ wc_printf("<br />");
}
intext = 1;
- /**
+ /*
* Quoted text should be displayed in italics and in a
* different colour. This code understands Citadel-style
* " >" quotes and will convert to <BLOCKQUOTE> tags.
*/
if ((bq == 0) && (!strncmp(buf, " >", 2))) {
- wprintf("<BLOCKQUOTE>");
+ w
c_printf("<BLOCKQUOTE>");
bq = 1;
} else if ((bq == 1) && (strncmp(buf, " >", 2))) {
- wprintf("</BLOCKQUOTE>");
+ wc_printf("</BLOCKQUOTE>");
bq = 0;
}
if ((bq == 1) && (!strncmp(buf, " >", 2))) {
msgescputs(buf);
}
if (bq == 1) {
- wprintf("</I>");
+ wc_printf("</I>");
}
}
-/**
+/*
* Transmit message text (in memory) to the server.
- *
- * ptr Pointer to the message being transmitted
*/
void text_to_server(char *ptr)
{
}
-/**
- * Transmit message text (in memory) to the server,
- * converting to Quoted-Printable encoding as we go.
- *
- * ptr Pointer to the message being transmitted
+/*
+ * Transmit message text (in memory) to the server, converting to Quoted-Printable encoding as we go.
*/
void text_to_server_qp(char *ptr)
{
-/**
- * translate server message output to text
- * (used for editing room info files and such)
+/*
+ * translate server message output to text (used for editing room info files and such)
*/
void server_to_text()
{
while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
if ((buf[0] == 32) && (count > 0)) {
- wprintf("\n");
+ wc_printf("\n");
}
- wprintf("%s", buf);
+ wc_printf("%s", buf);
++count;
}
}
-/**
- * Read binary data from server into memory using a series of
- * server READ commands.
- * \return the read content as StrBuf
- */
-int read_server_binary(StrBuf *Ret, size_t total_len, StrBuf *Buf)
-{
- char buf[SIZ];
- size_t bytes = 0;
- size_t thisblock = 0;
-
- if (Ret == NULL)
- return -1;
-
- while (bytes < total_len) {
- thisblock = 4095;
- if ((total_len - bytes) < thisblock) {
- thisblock = total_len - bytes;
- if (thisblock == 0) {
- FlushStrBuf(Ret);
- FreeStrBuf(&Buf);
- return -1;
- }
- }
- serv_printf("READ %d|%d", (int)bytes, (int)thisblock);
- if (StrBuf_ServGetln(Buf) > 0)
- {
- if (GetServerStatus(Buf, NULL) == 6)
- {
- StrBufCutLeft(Buf, 4);
- thisblock = StrTol(Buf);
- if (!WC->connected) {
- FlushStrBuf(Ret);
- FreeStrBuf(&Buf);
- return -1;
- }
- StrBuf_ServGetBLOBBuffered(Ret, thisblock);
- bytes += thisblock;
- }
- else {
- FreeStrBuf(&Buf);
- lprintf(3, "Error: %s\n", &buf[4]);
- return -1;
- }
- }
- }
- return StrLength(Ret);
-}
-
-/**
- * Read text from server, appending to a string buffer until the
+/*
+ * Read text from server, appending to a string buffer until the
* usual 000 terminator is found. Caller is responsible for freeing
* the returned pointer.
*/
}
-
-
-
-
int GetServerStatus(StrBuf *Line, long* FullState)
{
if (FullState != NULL)
return 0;
return WCC->serv_info->serv_newuser_disabled != 0;
}
+
int conditional_serv_supports_openid(StrBuf *Target, WCTemplputParams *TP)
{
wcsession *WCC = WC;
return 0;
return WCC->serv_info->serv_supports_openid != 0;
}
+
int conditional_serv_fulltext_enabled(StrBuf *Target, WCTemplputParams *TP)
{
wcsession *WCC = WC;
return WCC->serv_info->serv_fulltext_enabled != 0;
}
-
-
void tmplput_serv_bbs_city(StrBuf *Target, WCTemplputParams *TP)
{
wcsession *WCC = WC;
StrBufAppendTemplate(Target, TP, WC->serv_info->serv_bbs_city, 0);
}
-
void tmplput_mesg(StrBuf *Target, WCTemplputParams *TP)
{
int n = 0;
void RegisterEmbeddableMimeType(const char *MimeType, long MTLen, int Priority)
{
StrBuf *MT;
- printf("%s - %ld\n", MimeType, Priority);
MT = NewStrBufPlain(MimeType, MTLen);
Put(EmbeddableMimes, IKEY(Priority), MT, HFreeStrBuf);
}
it = GetNewHashPos(EmbeddableMimes, 0);
while (GetNextHashPos(EmbeddableMimes, it, &len, &Key, &vMime) &&
(vMime != NULL)) {
- printf("%s - \n", ChrPtr((StrBuf*) vMime));
if (StrLength(EmbeddableMimeStrs) > 0)
StrBufAppendBufPlain(EmbeddableMimeStrs, HKEY("|"), 0);
else
StrBufAppendBufPlain(EmbeddableMimeStrs, HKEY("MSGP "), 0);
StrBufAppendBuf(EmbeddableMimeStrs, (StrBuf*) vMime, 0);
}
- printf("------%ld-------------%s------%s------------\n", len, ChrPtr(EmbeddableMimeStrs), ChrPtr((StrBuf*) vMime));
+ DeleteHashPos(&it);
}
void
RegisterConditional(HKEY("COND:SERV:OPENID"), 2, conditional_serv_supports_openid, CTX_NONE);
RegisterConditional(HKEY("COND:SERV:NEWU"), 2, conditional_serv_newuser_disabled, CTX_NONE);
RegisterConditional(HKEY("COND:SERV:HAVEFULLTEXT"), 2, conditional_serv_fulltext_enabled, CTX_NONE);
- RegisterNamespace("SERV:PID", 0, 0, tmplput_serv_ip, CTX_NONE);
- RegisterNamespace("SERV:NODENAME", 0, 1, tmplput_serv_nodename, CTX_NONE);
- RegisterNamespace("SERV:HUMANNODE", 0, 1, tmplput_serv_humannode, CTX_NONE);
- RegisterNamespace("SERV:FQDN", 0, 1, tmplput_serv_fqdn, CTX_NONE);
- RegisterNamespace("SERV:SOFTWARE", 0, 1, tmplput_serv_software, CTX_NONE);
- RegisterNamespace("SERV:REV_LEVEL", 0, 0, tmplput_serv_rev_level, CTX_NONE);
- RegisterNamespace("SERV:BBS_CITY", 0, 1, tmplput_serv_bbs_city, CTX_NONE);
- RegisterNamespace("SERV:MESG", 1, 2, tmplput_mesg, CTX_NONE);
-/*TODO // RegisterNamespace("SERV:LDAP_SUPP", 0, 0, tmplput_serv_ldap_enabled, 0); */
+ RegisterNamespace("SERV:PID", 0, 0, tmplput_serv_ip, NULL, CTX_NONE);
+ RegisterNamespace("SERV:NODENAME", 0, 1, tmplput_serv_nodename, NULL, CTX_NONE);
+ RegisterNamespace("SERV:HUMANNODE", 0, 1, tmplput_serv_humannode, NULL, CTX_NONE);
+ RegisterNamespace("SERV:FQDN", 0, 1, tmplput_serv_fqdn, NULL, CTX_NONE);
+ RegisterNamespace("SERV:SOFTWARE", 0, 1, tmplput_serv_software, NULL, CTX_NONE);
+ RegisterNamespace("SERV:REV_LEVEL", 0, 0, tmplput_serv_rev_level, NULL, CTX_NONE);
+ RegisterNamespace("SERV:BBS_CITY", 0, 1, tmplput_serv_bbs_city, NULL, CTX_NONE);
+ RegisterNamespace("SERV:MESG", 1, 2, tmplput_mesg, NULL, CTX_NONE);
}
{
DeleteServInfo(&sess->serv_info);
}
-/*@}*/
projects / citadel.git / blobdiff