X-Git-Url: http://lists.indexdata.dk/cgi-bin?a=blobdiff_plain;f=http.h;h=d5b1d074cd5988c8f38a7194bbcc56178f407a32;hb=ebe50d5e6528e59c30b839f2e9e99825d98b133d;hp=bb15ac7ff5a0cfc3c0d1b9ba035d1aec7b144210;hpb=3dbff6d94b35be949f03bcd922129458747bcda2;p=pazpar2-moved-to-github.git

diff --git a/http.h b/http.h
index bb15ac7..d5b1d07 100644
--- a/http.h
+++ b/http.h
@@ -1,17 +1,40 @@
 #ifndef HTTP_H
 #define HTTP_H
 
+// Generic I/O buffer
+struct http_buf
+{
+#define HTTP_BUF_SIZE 4096
+    char buf[4096];
+    int offset;
+    int len;
+    struct http_buf *next;
+};
+
 struct http_channel
 {
     IOCHAN iochan;
-#define IBUF_SIZE 10240
-    char ibuf[IBUF_SIZE];
+    struct http_buf *iqueue;
+    struct http_buf *oqueue;
     char version[10];
-    int read;
-    char *obuf;
-    int writ;
+    struct http_proxy *proxy;
+    enum
+    {
+        Http_Idle,
+        Http_Busy      // Don't process new HTTP requests while we're busy
+    } state;
     NMEM nmem;
     WRBUF wrbuf;
+    struct http_request *request;
+    struct http_response *response;
+    struct http_channel *next; // for freelist
+};
+
+struct http_proxy //  attached to iochan for proxy connection
+{
+    IOCHAN iochan;
+    struct http_channel *channel;
+    struct http_buf *oqueue;
 };
 
 struct http_header
@@ -32,11 +55,7 @@ struct http_request
 {
     struct http_channel *channel;
     char http_version[20];
-    enum
-    {
-        Method_GET,
-        Method_other
-    } method;
+    char method[20];
     char *path;
     struct http_header *headers;
     struct http_argument *arguments;
@@ -51,10 +70,19 @@ struct http_response
     char *payload;
 };
 
+void http_set_proxyaddr(char *url);
 void http_init(int port);
 void http_addheader(struct http_response *r, const char *name, const char *value);
-char *argbyname(struct http_request *r, char *name);
-char *headerbyname(struct http_request *r, char *name);
+char *http_argbyname(struct http_request *r, char *name);
+char *http_headerbyname(struct http_request *r, char *name);
 struct http_response *http_create_response(struct http_channel *c);
+void http_send_response(struct http_channel *c);
 
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
 #endif