Happy new year

[pazpar2-moved-to-github.git] / src / http.h

diff --git a/src/http.h b/src/http.h
index be86bb2..1067e85 100644 (file)
--- a/src/http.h
+++ b/src/http.h
@@ -1,7 +1,5 @@
-/* $Id: http.h,v 1.7 2007-04-10 08:48:56 adam Exp $
-   Copyright (c) 2006-2007, Index Data.
-
-This file is part of Pazpar2.
+/* This file is part of Pazpar2.
+   Copyright (C) Index Data
 
 Pazpar2 is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free
@@ -14,23 +12,24 @@ FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
 for more details.
 
 You should have received a copy of the GNU General Public License
-along with Pazpar2; see the file LICENSE.  If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
- */
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+*/
 
 #ifndef HTTP_H
 #define HTTP_H
 
+#include <yaz/wrbuf.h>
+#include <yaz/timing.h>
+
+#include "eventl.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_buf;
+typedef struct http_channel_observer_s *http_channel_observer_t;
+
+typedef struct http_server *http_server_t;
+typedef struct http_sessions *http_sessions_t;
 
 struct http_channel
 {
@@ -44,12 +43,18 @@ struct http_channel
         Http_Idle,
         Http_Busy      // Don't process new HTTP requests while we're busy
     } state;
+    int keep_alive;
     NMEM nmem;
     WRBUF wrbuf;
+    yaz_timing_t yt;
     struct http_request *request;
     struct http_response *response;
     struct http_channel *next; // for freelist
-    char *addr; /* forwarded address */
+    char addr[256]; // forwarded address
+    http_channel_observer_t observers;
+    struct conf_server *server;
+    http_server_t http_server;
+    http_sessions_t http_sessions;
 };
 
 struct http_proxy //  attached to iochan for proxy connection
@@ -81,6 +86,8 @@ struct http_request
     char method[20];
     char *path;
     char *search;
+    char *content_buf;
+    int content_len;
     struct http_header *headers;
     struct http_argument *arguments;
 };
@@ -92,27 +99,52 @@ struct http_response
     struct http_channel *channel;
     struct http_header *headers;
     char *payload;
+    char *content_type;
 };
 
-void http_set_proxyaddr(char *url, char *baseurl);
-void http_init(const char *addr);
-void http_addheader(struct http_response *r, 
+void http_mutex_init(struct conf_server *server);
+void http_server_destroy(http_server_t hs);
+
+void http_set_proxyaddr(const char *url, struct conf_server *ser);
+int http_init(struct conf_server *ser, const char *record_fname);
+void http_close_server(struct conf_server *ser);
+void http_addheader(struct http_response *r,
                     const char *name, const char *value);
-struct http_header * http_header_append(struct http_channel *ch, 
-                                        struct http_header * hp, 
-                                        const char *name, 
+const char *http_lookup_header(struct http_header *header,
+                               const char *name);
+struct http_header * http_header_append(struct http_channel *ch,
+                                        struct http_header * hp,
+                                        const char *name,
                                         const char *value);
-char *http_argbyname(struct http_request *r, char *name);
-char *http_headerbyname(struct http_header *r, char *name);
+const char *http_argbyname(struct http_request *r, const char *name);
+const char *http_headerbyname(struct http_header *r, const char *name);
 struct http_response *http_create_response(struct http_channel *c);
 void http_send_response(struct http_channel *c);
 void urlencode(const char *i, char *o);
 
+typedef void (*http_channel_destroy_t)(void *data, struct http_channel *c,
+                                       void *data2);
+
+http_channel_observer_t http_add_observer(struct http_channel *c, void *data,
+                                          http_channel_destroy_t);
+void http_observer_set_data2(http_channel_observer_t obs, void *data2);
+
+void http_remove_observer(http_channel_observer_t obs);
+struct http_channel *http_channel_observer_chan(http_channel_observer_t obs);
+
+void http_command(struct http_channel *c);
+
+http_sessions_t http_sessions_create(void);
+void http_sessions_destroy(http_sessions_t hs);
+
+#endif
+
 /*
  * Local variables:
  * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
  * indent-tabs-mode: nil
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab
  */
-#endif
+