#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
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);
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
if (!hb)
{
yaz_log(YLOG_WARN, "Failed to serialize HTTP response");
- http_destroy(ch->iochan);
+ http_channel_destroy(ch->iochan);
}
else
{
if (res <= 0)
{
http_buf_destroy(hc->http_server, htbuf);
- http_destroy(i);
+ http_channel_destroy(i);
return;
}
htbuf->buf[res] = '\0';
if (res <= 0)
{
yaz_log(YLOG_WARN|YLOG_ERRNO, "write");
- http_destroy(i);
+ http_channel_destroy(i);
return;
}
if (res == wb->len)
if (!hc->oqueue) {
if (!hc->keep_alive)
{
- http_destroy(i);
+ http_channel_destroy(i);
return;
}
else
}
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);
}
}
}
else
{
- http_destroy(hc->iochan);
+ http_channel_destroy(hc->iochan);
return;
}
}
if (res <= 0)
{
yaz_log(YLOG_WARN|YLOG_ERRNO, "write");
- http_destroy(hc->iochan);
+ http_channel_destroy(hc->iochan);
return;
}
if (res == htbuf->len)
break;
default:
yaz_log(YLOG_WARN, "Unexpected event on connection");
- http_destroy(hc->iochan);
+ http_channel_destroy(hc->iochan);
}
}
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;
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;
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 */
int one = 1;
const char *pp;
short port;
- http_server_t http_server;
yaz_log(YLOG_LOG, "HTTP listener %s", addr);
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;
}
}
else
r = --(hs->ref_count);
-
+
if (r == 0)
{
struct http_buf *b = hs->http_buf_freelist;
while (c)
{
struct http_channel *c_next = c->next;
+ nmem_destroy(c->nmem);
+ wrbuf_destroy(c->wrbuf);
xfree(c);
c = c_next;
}
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();
}