X-Git-Url: http://lists.indexdata.com/cgi-bin?a=blobdiff_plain;f=src%2Fhttp.c;h=c383cba6e0ba338811970eb33d18bc661e3ff37e;hb=cac958d5914b46a2248479f9ece1f8e1f8b2515a;hp=a12fb4e884794dc3eacccfe47892dcd667c0494d;hpb=c453b003094541adc6fc155bc9a7aecf788245bc;p=pazpar2-moved-to-github.git

diff --git a/src/http.c b/src/http.c
index a12fb4e..c383cba 100644
--- a/src/http.c
+++ b/src/http.c
@@ -63,7 +63,7 @@ typedef int socklen_t;
 #include <yaz/nmem.h>
 #include <yaz/mutex.h>
 
-#include "pazpar2.h"
+#include "session.h"
 #include "http.h"
 
 #define MAX_HTTP_HEADER 4096
@@ -87,7 +87,7 @@ static void proxy_io(IOCHAN i, int event);
 static struct http_channel *http_channel_create(http_server_t http_server,
                                                 const char *addr,
                                                 struct conf_server *server);
-static void http_destroy(IOCHAN i);
+static void http_channel_destroy(IOCHAN i);
 static http_server_t http_server_create(void);
 static void http_server_incref(http_server_t hs);
 
@@ -799,7 +799,8 @@ static int http_proxy(struct http_request *rq)
         // We will add EVENT_OUTPUT below
         p->iochan = iochan_create(sock, proxy_io, EVENT_INPUT);
         iochan_setdata(p->iochan, p);
-        pazpar2_add_channel(p->iochan);
+
+        iochan_add(ser->iochan_man, p->iochan);
     }
 
     // Do _not_ modify Host: header, just checking it's existence
@@ -847,7 +848,7 @@ void http_send_response(struct http_channel *ch)
     if (!hb)
     {
         yaz_log(YLOG_WARN, "Failed to serialize HTTP response");
-        http_destroy(ch->iochan);
+        http_channel_destroy(ch->iochan);
     }
     else
     {
@@ -893,7 +894,7 @@ static void http_io(IOCHAN i, int event)
             if (res <= 0)
             {
                 http_buf_destroy(hc->http_server, htbuf);
-                http_destroy(i);
+                http_channel_destroy(i);
                 return;
             }
             htbuf->buf[res] = '\0';
@@ -940,7 +941,7 @@ static void http_io(IOCHAN i, int event)
                 if (res <= 0)
                 {
                     yaz_log(YLOG_WARN|YLOG_ERRNO, "write");
-                    http_destroy(i);
+                    http_channel_destroy(i);
                     return;
                 }
                 if (res == wb->len)
@@ -956,7 +957,7 @@ static void http_io(IOCHAN i, int event)
                 if (!hc->oqueue) {
                     if (!hc->keep_alive)
                     {
-                        http_destroy(i);
+                        http_channel_destroy(i);
                         return;
                     }
                     else
@@ -969,11 +970,11 @@ static void http_io(IOCHAN i, int event)
             }
 
             if (!hc->oqueue && hc->proxy && !hc->proxy->iochan) 
-                http_destroy(i); // Server closed; we're done
+                http_channel_destroy(i); // Server closed; we're done
             break;
         default:
             yaz_log(YLOG_WARN, "Unexpected event on connection");
-            http_destroy(i);
+            http_channel_destroy(i);
     }
 }
 
@@ -1008,7 +1009,7 @@ static void proxy_io(IOCHAN pi, int event)
                 }
                 else
                 {
-                    http_destroy(hc->iochan);
+                    http_channel_destroy(hc->iochan);
                     return;
                 }
             }
@@ -1033,7 +1034,7 @@ static void proxy_io(IOCHAN pi, int event)
             if (res <= 0)
             {
                 yaz_log(YLOG_WARN|YLOG_ERRNO, "write");
-                http_destroy(hc->iochan);
+                http_channel_destroy(hc->iochan);
                 return;
             }
             if (res == htbuf->len)
@@ -1054,7 +1055,7 @@ static void proxy_io(IOCHAN pi, int event)
             break;
         default:
             yaz_log(YLOG_WARN, "Unexpected event on connection");
-            http_destroy(hc->iochan);
+            http_channel_destroy(hc->iochan);
     }
 }
 
@@ -1062,7 +1063,7 @@ static void http_fire_observers(struct http_channel *c);
 static void http_destroy_observers(struct http_channel *c);
 
 // Cleanup channel
-static void http_destroy(IOCHAN i)
+static void http_channel_destroy(IOCHAN i)
 {
     struct http_channel *s = iochan_getdata(i);
     http_server_t http_server;
@@ -1129,6 +1130,7 @@ static struct http_channel *http_channel_create(http_server_t hs,
     http_server_incref(hs);
     r->http_server = hs;
     r->http_sessions = hs->http_sessions;
+    assert(r->http_sessions);
     r->server = server;
     r->proxy = 0;
     r->iochan = 0;
@@ -1174,8 +1176,7 @@ static void http_accept(IOCHAN i, int event)
                              server);
     ch->iochan = c;
     iochan_setdata(c, ch);
-
-    pazpar2_add_channel(c);
+    iochan_add(server->iochan_man, c);
 }
 
 /* Create a http-channel listener, syntax [host:]port */
@@ -1188,7 +1189,6 @@ int http_init(const char *addr, struct conf_server *server)
     int one = 1;
     const char *pp;
     short port;
-    http_server_t http_server;
 
     yaz_log(YLOG_LOG, "HTTP listener %s", addr);
 
@@ -1241,14 +1241,14 @@ int http_init(const char *addr, struct conf_server *server)
         return 1;
     }
 
-    http_server = http_server_create();
-    server->http_server = http_server;
+    server->http_server = http_server_create();
 
-    http_server->listener_socket = l;
+    server->http_server->listener_socket = l;
 
     c = iochan_create(l, http_accept, EVENT_INPUT | EVENT_EXCEPT);
     iochan_setdata(c, server);
-    pazpar2_add_channel(c);
+
+    iochan_add(server->iochan_man, c);
     return 0;
 }
 
@@ -1381,7 +1381,7 @@ void http_server_destroy(http_server_t hs)
         }
         else
             r = --(hs->ref_count);
-        
+
         if (r == 0)
         {
             struct http_buf *b = hs->http_buf_freelist;
@@ -1395,6 +1395,8 @@ void http_server_destroy(http_server_t hs)
             while (c)
             {
                 struct http_channel *c_next = c->next;
+                nmem_destroy(c->nmem);
+                wrbuf_destroy(c->wrbuf);
                 xfree(c);
                 c = c_next;
             }