]> code.citadel.org Git - citadel.git/blobdiff - webcit/serv_func.c
* Rewrote the HTTP engine and application coupling to run in a worker thread
[citadel.git] / webcit / serv_func.c
index fd23284f4d7722308d2b50239b3fa592caf9c550..174172a8f53e60cd4a65b156d007c9fa8ceeb35e 100644 (file)
@@ -1,21 +1,41 @@
 /* $Id$ */
 
+
+
 #include <ctype.h>
 #include <stdlib.h>
-#include <string.h>
-#ifdef HAVE_UNISTD_H
 #include <unistd.h>
-#endif
 #include <stdio.h>
+#include <fcntl.h>
+#include <signal.h>
+#include <sys/types.h>
+#include <sys/wait.h>
+#include <sys/socket.h>
+#include <sys/time.h>
+#include <limits.h>
+#include <netinet/in.h>
+#include <netdb.h>
+#include <string.h>
+#include <pwd.h>
+#include <errno.h>
+#include <stdarg.h>
+#include <pthread.h>
+#include <signal.h>
 #include "webcit.h"
-#include "child.h"
+
+
+
+
+
+
 
 struct serv_info serv_info;
 
 /*
- * get info about the server we've connected to
+ * get info about the server we've WC->connected to
  */
-void get_serv_info(void) {
+void get_serv_info(char *browser_host, char *user_agent)
+{
        char buf[256];
        int a;
 
@@ -23,40 +43,50 @@ void get_serv_info(void) {
                DEVELOPER_ID,
                CLIENT_ID,
                CLIENT_VERSION,
-               SERVER,
-               ""              /* FIX find out where the user is */
-               );
+               user_agent,
+               browser_host
+       );
        serv_gets(buf);
 
        serv_puts("INFO");
        serv_gets(buf);
-       if (buf[0]!='1') return;
+       if (buf[0] != '1')
+               return;
 
        a = 0;
-       while(serv_gets(buf), strcmp(buf,"000")) {
-           switch(a) {
-               case 0:         serv_info.serv_pid = atoi(buf);
-                               break;
-               case 1:         strcpy(serv_info.serv_nodename,buf);
-                               break;
-               case 2:         strcpy(serv_info.serv_humannode,buf);
-                               break;
-               case 3:         strcpy(serv_info.serv_fqdn,buf);
-                               break;
-               case 4:         strcpy(serv_info.serv_software,buf);
-                               break;
-               case 5:         serv_info.serv_rev_level = atoi(buf);
-                               break;
-               case 6:         strcpy(serv_info.serv_bbs_city,buf);
-                               break;
-               case 7:         strcpy(serv_info.serv_sysadm,buf);
-                               break;
-               case 9:         strcpy(serv_info.serv_moreprompt,buf);
-                               break;
+       while (serv_gets(buf), strcmp(buf, "000")) {
+               switch (a) {
+               case 0:
+                       serv_info.serv_pid = atoi(buf);
+                       break;
+               case 1:
+                       strcpy(serv_info.serv_nodename, buf);
+                       break;
+               case 2:
+                       strcpy(serv_info.serv_humannode, buf);
+                       break;
+               case 3:
+                       strcpy(serv_info.serv_fqdn, buf);
+                       break;
+               case 4:
+                       strcpy(serv_info.serv_software, buf);
+                       break;
+               case 5:
+                       serv_info.serv_rev_level = atoi(buf);
+                       break;
+               case 6:
+                       strcpy(serv_info.serv_bbs_city, buf);
+                       break;
+               case 7:
+                       strcpy(serv_info.serv_sysadm, buf);
+                       break;
+               case 9:
+                       strcpy(serv_info.serv_moreprompt, buf);
+                       break;
                }
-           ++a;
-           }
+               ++a;
        }
+}
 
 
 
@@ -65,51 +95,52 @@ void get_serv_info(void) {
  * If fp is non-null, it is considered to be the file handle to read the
  * text from.  Otherwise, text is read from the server.
  */
-void fmout(FILE *fp)
+void fmout(FILE * fp)
 {
 
        int intext = 0;
        int bq = 0;
        char buf[256];
 
-       while(1) {
-               if (fp==NULL) serv_gets(buf);
-               if (fp!=NULL) {
-                       if (fgets(buf,256,fp)==NULL) strcpy(buf,"000");
-                       buf[strlen(buf)-1] = 0;
-                       }
-               if (!strcmp(buf,"000")) {
-                       if (bq==1) wprintf("</I>");
+       while (1) {
+               if (fp == NULL)
+                       serv_gets(buf);
+               if (fp != NULL) {
+                       if (fgets(buf, 256, fp) == NULL)
+                               strcpy(buf, "000");
+                       buf[strlen(buf) - 1] = 0;
+               }
+               if (!strcmp(buf, "000")) {
+                       if (bq == 1)
+                               wprintf("</I>");
                        wprintf("<P>\n");
                        return;
-                       }
-               if ( (intext==1) && (isspace(buf[0])) ) {
+               }
+               if ((intext == 1) && (isspace(buf[0]))) {
                        wprintf("<BR>");
-                       }
+               }
                intext = 1;
 
                /* Quoted text should be displayed in italics and in a
                 * different colour.  This code understands both Citadel/UX
                 * style " >" quotes and FordBoard-style " :-)" quotes.
                 */
-               if ((bq==0)&&
-                  ((!strncmp(buf," >",2))||(!strncmp(buf," :-)",4)))) {
+               if ((bq == 0) &&
+                   ((!strncmp(buf, " >", 2)) || (!strncmp(buf, " :-)", 4)))) {
                        wprintf("<FONT COLOR=\"000044\"><I>");
                        bq = 1;
-                       }
-               else if ((bq==1)&&
-                    (strncmp(buf," >",2))&&(strncmp(buf," :-)",4))) {
+               } else if ((bq == 1) &&
+                 (strncmp(buf, " >", 2)) && (strncmp(buf, " :-)", 4))) {
                        wprintf("</FONT></I>");
                        bq = 0;
-                       }
-
+               }
                /* Activate embedded URL's */
                url(buf);
 
                escputs(buf);
                wprintf("\n");
-               }
        }
+}
 
 
 
@@ -119,38 +150,38 @@ void fmout(FILE *fp)
 /*
  * transmit message text (in memory) to the server
  */
-void text_to_server(char *ptr) {
+void text_to_server(char *ptr)
+{
        char buf[256];
-       int ch,a,pos;
+       int ch, a, pos;
 
        pos = 0;
-       
-       strcpy(buf,"");
-       while (ptr[pos]!=0) {
+
+       strcpy(buf, "");
+       while (ptr[pos] != 0) {
                ch = ptr[pos++];
-               if (ch==10) {
-                       while (isspace(buf[strlen(buf)-1]))
-                               buf[strlen(buf)-1]=0;
+               if (ch == 10) {
+                       while (isspace(buf[strlen(buf) - 1]))
+                               buf[strlen(buf) - 1] = 0;
                        serv_puts(buf);
-                       strcpy(buf,"");
-                       }
-               else {
+                       strcpy(buf, "");
+               } else {
                        a = strlen(buf);
-                       buf[a+1] = 0;
+                       buf[a + 1] = 0;
                        buf[a] = ch;
-                       if ((ch==32)&&(strlen(buf)>200)) {
-                               buf[a]=0;
+                       if ((ch == 32) && (strlen(buf) > 200)) {
+                               buf[a] = 0;
                                serv_puts(buf);
-                               strcpy(buf,"");
-                               }
-                       if (strlen(buf)>250) {
+                               strcpy(buf, "");
+                       }
+                       if (strlen(buf) > 250) {
                                serv_puts(buf);
-                               strcpy(buf,"");
-                               }
+                               strcpy(buf, "");
                        }
                }
-       serv_puts(buf);
        }
+       serv_puts(buf);
+}
 
 
 
@@ -161,20 +192,17 @@ void text_to_server(char *ptr) {
  * translate server message output to text
  * (used for editing room info files and such)
  */
-void server_to_text() {
-       char buf[256]; 
+void server_to_text()
+{
+       char buf[256];
 
        int count = 0;
 
-       while (serv_gets(buf), strcmp(buf, "000") ) {
-               if ( (buf[0] == 32) && (count > 0) ) {
+       while (serv_gets(buf), strcmp(buf, "000")) {
+               if ((buf[0] == 32) && (count > 0)) {
                        wprintf("\n");
-                       }
+               }
                wprintf("%s", buf);
                ++count;
-               }
        }
-
-
-
-
+}