Avoid mix decl and code

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

diff --git a/src/http.c b/src/http.c
index a12fb4e..aec3593 100644 (file)
--- a/src/http.c
+++ b/src/http.c
@@ -63,7 +63,8 @@ typedef int socklen_t;
 #include <yaz/nmem.h>
 #include <yaz/mutex.h>
 
-#include "pazpar2.h"
+#include "ppmutex.h"
+#include "session.h"
 #include "http.h"
 
 #define MAX_HTTP_HEADER 4096
@@ -87,7 +88,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);
 
@@ -797,9 +798,10 @@ static int http_proxy(struct http_request *rq)
         p->first_response = 1;
         c->proxy = p;
         // We will add EVENT_OUTPUT below
-        p->iochan = iochan_create(sock, proxy_io, EVENT_INPUT);
+        p->iochan = iochan_create(sock, proxy_io, EVENT_INPUT, "http_proxy");
         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 +849,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
     {
@@ -876,13 +878,13 @@ static void http_error(struct http_channel *hc, int no, const char *msg)
 static void http_io(IOCHAN i, int event)
 {
     struct http_channel *hc = iochan_getdata(i);
-
-    switch (event)
+    while (event)
     {
-        int res, reqlen;
-        struct http_buf *htbuf;
-
-        case EVENT_INPUT:
+        if (event == EVENT_INPUT)
+        {
+            int res, reqlen;
+            struct http_buf *htbuf;
+            
             htbuf = http_buf_create(hc->http_server);
             res = recv(iochan_getfd(i), htbuf->buf, HTTP_BUF_SIZE -1, 0);
             if (res == -1 && errno == EAGAIN)
@@ -893,7 +895,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';
@@ -931,16 +933,20 @@ static void http_io(IOCHAN i, int event)
                     http_command(hc);
                 }
             }
-            break;
-        case EVENT_OUTPUT:
+        }
+        else if (event == EVENT_OUTPUT)
+        {
+            event = 0;
             if (hc->oqueue)
             {
                 struct http_buf *wb = hc->oqueue;
-                res = send(iochan_getfd(hc->iochan), wb->buf + wb->offset, wb->len, 0);
+                int res;
+                res = send(iochan_getfd(hc->iochan),
+                           wb->buf + wb->offset, wb->len, 0);
                 if (res <= 0)
                 {
                     yaz_log(YLOG_WARN|YLOG_ERRNO, "write");
-                    http_destroy(i);
+                    http_channel_destroy(i);
                     return;
                 }
                 if (res == wb->len)
@@ -953,27 +959,30 @@ static void http_io(IOCHAN i, int event)
                     wb->len -= res;
                     wb->offset += res;
                 }
-                if (!hc->oqueue) {
+                if (!hc->oqueue)
+                {
                     if (!hc->keep_alive)
                     {
-                        http_destroy(i);
+                        http_channel_destroy(i);
                         return;
                     }
                     else
                     {
                         iochan_clearflag(i, EVENT_OUTPUT);
                         if (hc->iqueue)
-                            iochan_setevent(hc->iochan, EVENT_INPUT);
+                            event = EVENT_INPUT;
                     }
                 }
             }
-
             if (!hc->oqueue && hc->proxy && !hc->proxy->iochan) 
-                http_destroy(i); // Server closed; we're done
-            break;
-        default:
+                http_channel_destroy(i); // Server closed; we're done
+        }
+        else
+        {
             yaz_log(YLOG_WARN, "Unexpected event on connection");
-            http_destroy(i);
+            http_channel_destroy(i);
+            event = 0;
+        }
     }
 }
 
@@ -1008,7 +1017,7 @@ static void proxy_io(IOCHAN pi, int event)
                 }
                 else
                 {
-                    http_destroy(hc->iochan);
+                    http_channel_destroy(hc->iochan);
                     return;
                 }
             }
@@ -1033,7 +1042,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 +1063,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 +1071,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 +1138,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;
@@ -1168,14 +1178,13 @@ static void http_accept(IOCHAN i, int event)
     enable_nonblock(s);
 
     yaz_log(YLOG_DEBUG, "New command connection");
-    c = iochan_create(s, http_io, EVENT_INPUT | EVENT_EXCEPT);
+    c = iochan_create(s, http_io, EVENT_INPUT | EVENT_EXCEPT, "http_session_socket");
     
     ch = http_channel_create(server->http_server, inet_ntoa(addr.sin_addr),
                              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 +1197,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 +1249,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);
+    c = iochan_create(l, http_accept, EVENT_INPUT | EVENT_EXCEPT, "http_server");
     iochan_setdata(c, server);
-    pazpar2_add_channel(c);
+
+    iochan_add(server->iochan_man, c);
     return 0;
 }
 
@@ -1373,15 +1381,10 @@ void http_server_destroy(http_server_t hs)
     {
         int r;
 
-        if (hs->mutex)
-        {
-            yaz_mutex_enter(hs->mutex);
-            r = --(hs->ref_count);
-            yaz_mutex_leave(hs->mutex);
-        }
-        else
-            r = --(hs->ref_count);
-        
+        yaz_mutex_enter(hs->mutex); /* OK: hs->mutex may be NULL */
+        r = --(hs->ref_count);
+        yaz_mutex_leave(hs->mutex);
+
         if (r == 0)
         {
             struct http_buf *b = hs->http_buf_freelist;
@@ -1395,6 +1398,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;
             }
@@ -1419,7 +1424,7 @@ void http_mutex_init(struct conf_server *server)
     assert(server);
 
     assert(server->http_server->mutex == 0);
-    yaz_mutex_create(&server->http_server->mutex);
+    pazpar2_mutex_create(&server->http_server->mutex, "http_server");
     server->http_server->http_sessions = http_sessions_create();
 }