#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
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
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 */
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;
}
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();
}